# # ChangeLog for code # # Generated by Trac 1.0.9 # May 9, 2024, 10:34:44 PM Sat, 31 Mar 2018 22:44:36 GMT dreherm [11849] * code/branches/3DPacman_FS18/src/modules/Pacman/PacmanGhost.cc (modified) * code/branches/3DPacman_FS18/src/modules/Pacman/PacmanGhost.h (modified) Ghost Check 5 Sat, 31 Mar 2018 22:40:41 GMT dreherm [11848] * code/branches/3DPacman_FS18/src/modules/Pacman/PacmanGhost.cc (modified) * code/branches/3DPacman_FS18/src/modules/Pacman/PacmanGhost.h (modified) Ghost Check 4 Sat, 31 Mar 2018 22:33:08 GMT dreherm [11847] * code/branches/3DPacman_FS18/src/modules/Pacman/PacmanGhost.cc (modified) * code/branches/3DPacman_FS18/src/modules/Pacman/PacmanGhost.h (modified) Commit and check ghost class 3 Sat, 31 Mar 2018 22:23:34 GMT dreherm [11846] * code/branches/3DPacman_FS18/src/modules/Pacman/PacmanGhost.cc (modified) * code/branches/3DPacman_FS18/src/modules/Pacman/PacmanGhost.h (modified) Commit and check ghost class2 Sat, 31 Mar 2018 22:12:17 GMT dreherm [11845] * code/branches/3DPacman_FS18/src/modules/Pacman/PacmanGhost.cc (modified) * code/branches/3DPacman_FS18/src/modules/Pacman/PacmanGhost.h (modified) Commit and check ghost class Thu, 29 Mar 2018 16:23:28 GMT dreherm [11844] * code/branches/3DPacman_FS18/src/modules/3DPacman (deleted) * code/branches/3DPacman_FS18/src/modules/Pacman/3DPacman.cc (added) * code/branches/3DPacman_FS18/src/modules/Pacman/3DPacman.h (added) * code/branches/3DPacman_FS18/src/modules/Pacman/PacmanPointSphere.cc (added) * code/branches/3DPacman_FS18/src/modules/Pacman/PacmanPointSphere.h (added) Some trash removed Thu, 29 Mar 2018 16:14:30 GMT dreherm [11843] * code/branches/3DPacman_FS18/data/levels/3DPacman.oxw (modified) * code/branches/3DPacman_FS18/src/modules/CMakeLists.txt (modified) * code/branches/3DPacman_FS18/src/modules/Pacman (added) * code/branches/3DPacman_FS18/src/modules/Pacman/CMakeLists.txt (added) * code/branches/3DPacman_FS18/src/modules/Pacman/PacmanGhost.cc (added) * code/branches/3DPacman_FS18/src/modules/Pacman/PacmanGhost.h (added) * code/branches/3DPacman_FS18/src/modules/Pacman/PacmanGhostController.cc (added) * code/branches/3DPacman_FS18/src/modules/Pacman/PacmanGhostController.h (added) First try for moving ghosts Thu, 29 Mar 2018 14:04:35 GMT mdedial [11842] * code/branches/Masterserver_FS18/src/libraries/network/Client.h (modified) * code/branches/Masterserver_FS18/src/libraries/network/ClientConnection.h (modified) * code/branches/Masterserver_FS18/src/libraries/network/ClientConnectionListener.cc (modified) * code/branches/Masterserver_FS18/src/libraries/network/ClientConnectionListener.h (modified) * code/branches/Masterserver_FS18/src/libraries/network/FunctionCallManager.cc (modified) * code/branches/Masterserver_FS18/src/libraries/network/FunctionCallManager.h (modified) * code/branches/Masterserver_FS18/src/libraries/network/GamestateHandler.cc (modified) * code/branches/Masterserver_FS18/src/libraries/network/GamestateHandler.h (modified) * code/branches/Masterserver_FS18/src/libraries/network/GamestateManager.h (modified) * code/branches/Masterserver_FS18/src/libraries/network/MasterServer.cc (modified) * code/branches/Masterserver_FS18/src/libraries/network/packet/Acknowledgement.cc (modified) * code/branches/Masterserver_FS18/src/libraries/network/packet/Acknowledgement.h (modified) * code/branches/Masterserver_FS18/src/libraries/network/packet/Chat.cc (modified) * code/branches/Masterserver_FS18/src/libraries/network/packet/Chat.h (modified) * code/branches/Masterserver_FS18/src/libraries/network/packet/ClassID.cc (modified) * code/branches/Masterserver_FS18/src/libraries/network/packet/DeleteObjects.cc (modified) * code/branches/Masterserver_FS18/src/libraries/network/packet/FunctionCalls.cc (modified) * code/branches/Masterserver_FS18/src/libraries/network/packet/Packet.cc (modified) * code/branches/Masterserver_FS18/src/libraries/network/packet/Packet.h (modified) * code/branches/Masterserver_FS18/src/libraries/network/packet/ServerInformation.cc (modified) Clean up some code, add lots of comments Thu, 29 Mar 2018 14:02:41 GMT andera [11841] * code/branches/RacingBots_FS18/src/libraries/tools/Timer.cc (modified) * code/branches/RacingBots_FS18/src/libraries/tools/Timer.h (modified) * code/branches/RacingBots_FS18/src/modules/gametypes/SpaceRace.cc (modified) * code/branches/RacingBots_FS18/src/modules/gametypes/SpaceRace.h (modified) added countdown Thu, 29 Mar 2018 13:57:54 GMT arismu [11840] * code/branches/RacingBots_FS18/data/levels/presentationHS12.oxw (modified) * code/branches/RacingBots_FS18/data/levels/templates/spaceshipCollateralDamage.oxt (modified) * code/branches/RacingBots_FS18/src/libraries/tools/Timer.cc (modified) * code/branches/RacingBots_FS18/src/modules/gametypes/SpaceRace.cc (modified) * code/branches/RacingBots_FS18/src/modules/gametypes/SpaceRace.h (modified) * code/branches/RacingBots_FS18/src/orxonox/items/Engine.cc (modified) * code/branches/RacingBots_FS18/src/orxonox/worldentities/pawns/SpaceShip.h (modified) Changed velocity bots, steering stabilized Thu, 29 Mar 2018 13:37:15 GMT jacobsr [11839] * code/branches/OrxyRoad_FS18/data/levels/OrxyRoad.oxw (modified) * code/branches/OrxyRoad_FS18/data/overlays/OrxyRoadHUD.oxo (modified) changed internal variables 2nd part2 Thu, 29 Mar 2018 13:30:24 GMT jacobsr [11838] * code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadCenterPoint.cc (modified) * code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadCenterPoint.h (modified) * code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadCube.cc (modified) * code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadCube.h (modified) * code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadHUDinfo.cc (modified) * code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadHUDinfo.h (modified) * code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadPrereqs.h (modified) * code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadRace.h (modified) * code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadRaceShip.cc (modified) * code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadRaceShip.h (modified) changed interal definition to orxyroad namespace Thu, 29 Mar 2018 13:26:21 GMT jacobsr [11837] * code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoad.cc (modified) changed internal variables Thu, 29 Mar 2018 13:13:14 GMT jacobsr [11836] * code/branches/OrxyRoad_FS18/data/levels/templates/OrxyRoadPattern.oxt (added) * code/branches/OrxyRoad_FS18/data/levels/templates/spaceshipOrxyRoad.oxt (added) * code/branches/OrxyRoad_FS18/data/overlays/OrxyRoadHUD.oxo (added) * code/branches/OrxyRoad_FS18/src/modules/orxyroad (added) * code/branches/OrxyRoad_FS18/src/modules/orxyroad/CMakeLists.txt (added) * code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoad.cc (added) * code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadCenterPoint.cc (added) * code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadCenterPoint.h (added) * code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadCube.cc (added) * code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadCube.h (added) * code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadHUDinfo.cc (added) * code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadHUDinfo.h (added) * code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadPrereqs.h (added) * code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadRace.h (added) * code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadRaceShip.cc (added) * code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadRaceShip.h (added) orxyroad v21 Thu, 29 Mar 2018 13:09:46 GMT jacobsr [11835] * code/branches/OrxyRoad_FS18/data/levels/OrxyRoad.oxw (added) orxyroad v1 Thu, 29 Mar 2018 10:15:19 GMT dreherm [11834] * code/branches/3DPacman_FS18/src/modules/3DPacman/PacmanGhost.cc (modified) * code/branches/3DPacman_FS18/src/modules/3DPacman/PacmanGhost.h (modified) * code/branches/3DPacman_FS18/src/modules/3DPacman/PacmanGhostController.cc (modified) Update for ghost controller and ghost class Mon, 26 Mar 2018 11:09:34 GMT dreherm [11833] * code/branches/3DPacman_FS18/data/levels/3DPacman.oxw (modified) portals added Sun, 25 Mar 2018 00:20:03 GMT dreherm [11832] * code/branches/3DPacman_FS18/New_Material (deleted) * code/branches/3DPacman_FS18/src/modules/3DPacman (added) * code/branches/3DPacman_FS18/src/modules/3DPacman/3DPacman.cc (added) * code/branches/3DPacman_FS18/src/modules/3DPacman/3DPacman.h (added) * code/branches/3DPacman_FS18/src/modules/3DPacman/PacmanGhost.cc (added) * code/branches/3DPacman_FS18/src/modules/3DPacman/PacmanGhost.h (added) * code/branches/3DPacman_FS18/src/modules/3DPacman/PacmanGhostController.cc (added) * code/branches/3DPacman_FS18/src/modules/3DPacman/PacmanGhostController.h (added) * code/branches/3DPacman_FS18/src/modules/3DPacman/PacmanPointSphere.cc (added) * code/branches/3DPacman_FS18/src/modules/3DPacman/PacmanPointSphere.h (added) * code/branches/3DPacman_FS18/src/orxonox/controllers/PacmanGhostRedController.cc (deleted) * code/branches/3DPacman_FS18/src/orxonox/controllers/PacmanGhostRedController.h (deleted) * code/branches/3DPacman_FS18/src/orxonox/worldentities/PacmanGhostRed.cc (deleted) * code/branches/3DPacman_FS18/src/orxonox/worldentities/PacmanGhostRed.h (deleted) First files added like controllers and new class Thu, 22 Mar 2018 15:14:44 GMT dreherm [11831] * code/branches/3DPacman_FS18/data/levels/3DPacman.oxw (added) * code/branches/3DPacman_FS18/data/levels/templates/PacmanGelb.oxt (added) * code/branches/3DPacman_FS18/src/orxonox/controllers/PacmanGhostRedController.cc (added) * code/branches/3DPacman_FS18/src/orxonox/controllers/PacmanGhostRedController.h (added) * code/branches/3DPacman_FS18/src/orxonox/worldentities/PacmanGhostRed.cc (added) * code/branches/3DPacman_FS18/src/orxonox/worldentities/PacmanGhostRed.h (added) New modells added to game Thu, 22 Mar 2018 15:14:34 GMT skaeser [11830] * code/branches/TowerDefense_FS18/data/levels/towerDefense.oxw (modified) * code/branches/TowerDefense_FS18/src/modules/towerdefense/TowerDefenseEnemy.cc (modified) changed map Thu, 22 Mar 2018 15:12:23 GMT mdedial [11829] * code/branches/Masterserver_FS18/src/libraries/network/Connection.cc (modified) * code/branches/Masterserver_FS18/src/libraries/network/Connection.h (modified) * code/branches/Masterserver_FS18/src/libraries/network/GamestateManager.cc (modified) * code/branches/Masterserver_FS18/src/libraries/network/GamestateManager.h (modified) * code/branches/Masterserver_FS18/src/libraries/network/Host.cc (modified) * code/branches/Masterserver_FS18/src/libraries/network/Host.h (modified) * code/branches/Masterserver_FS18/src/libraries/network/Server.cc (modified) * code/branches/Masterserver_FS18/src/libraries/network/ServerConnection.cc (modified) * code/branches/Masterserver_FS18/src/libraries/network/ServerConnection.h (modified) WIP 22.03.18: Begin documenting server-side code Thu, 22 Mar 2018 12:51:59 GMT skaeser [11828] * code/branches/TowerDefense_FS18/src/modules/towerdefense/TowerDefense.cc (modified) kredit nicht mehr abgezogen Sun, 18 Mar 2018 12:55:16 GMT landauf [11827] * code/branches/AsteroidMining_HS17 (deleted) * code/branches/Asteroid_HS17 (deleted) * code/branches/CampaignMap_HS17 (deleted) * code/branches/Dialog_HS17 (deleted) * code/branches/FlappyOrx_HS17 (deleted) * code/branches/Presentation_HS17 (deleted) * code/branches/Presentation_HS17_merge (deleted) * code/branches/ProtectBoss_HS17 (deleted) * code/branches/SOBv2_HS17 (deleted) * code/branches/Waypoints_HS17 (deleted) removed merged branches from HS17 Sun, 18 Mar 2018 01:35:41 GMT dreherm [11825] * code/branches/3DPacman_FS18/New_Material (added) * code/branches/3DPacman_FS18/New_Material/PacmanGelb (added) * code/branches/3DPacman_FS18/New_Material/PacmanGelb/PacmanGelb.PNG (added) * code/branches/3DPacman_FS18/New_Material/PacmanGelb/PacmanGelb.blend (added) * code/branches/3DPacman_FS18/New_Material/PacmanGelb/PacmanGelb.pptx (added) * code/branches/3DPacman_FS18/New_Material/PacmanGhosts (added) * code/branches/3DPacman_FS18/New_Material/PacmanGhosts/PacmanGhostBlue (added) * code/branches/3DPacman_FS18/New_Material/PacmanGhosts/PacmanGhostBlue/PacmanGhostBlue.PNG (added) * code/branches/3DPacman_FS18/New_Material/PacmanGhosts/PacmanGhostBlue/PacmanGhostBlue.blend (added) * code/branches/3DPacman_FS18/New_Material/PacmanGhosts/PacmanGhostBlue/PacmanGhostBlue.pptx (added) * code/branches/3DPacman_FS18/New_Material/PacmanGhosts/PacmanGhostOrange (added) * code/branches/3DPacman_FS18/New_Material/PacmanGhosts/PacmanGhostOrange/PacmanGhostOrange.PNG (added) * code/branches/3DPacman_FS18/New_Material/PacmanGhosts/PacmanGhostOrange/PacmanGhostOrange.blend (added) * code/branches/3DPacman_FS18/New_Material/PacmanGhosts/PacmanGhostOrange/PacmanGhostOrange.pptx (added) * code/branches/3DPacman_FS18/New_Material/PacmanGhosts/PacmanGhostOrange/~$PacmanGhostRed.pptx (added) * code/branches/3DPacman_FS18/New_Material/PacmanGhosts/PacmanGhostPink (added) * code/branches/3DPacman_FS18/New_Material/PacmanGhosts/PacmanGhostPink/PacmanGhostPink.PNG (added) * code/branches/3DPacman_FS18/New_Material/PacmanGhosts/PacmanGhostPink/PacmanGhostPink.blend (added) * code/branches/3DPacman_FS18/New_Material/PacmanGhosts/PacmanGhostPink/PacmanGhostPink.pptx (added) * code/branches/3DPacman_FS18/New_Material/PacmanGhosts/PacmanGhostPink/~$PacmanGhostRed.pptx (added) * code/branches/3DPacman_FS18/New_Material/PacmanGhosts/PacmanGhostRed (added) * code/branches/3DPacman_FS18/New_Material/PacmanGhosts/PacmanGhostRed/PacmanGhostRed.PNG (added) * code/branches/3DPacman_FS18/New_Material/PacmanGhosts/PacmanGhostRed/PacmanGhostRed.blend (added) * code/branches/3DPacman_FS18/New_Material/PacmanGhosts/PacmanGhostRed/PacmanGhostRed.pptx (added) * code/branches/3DPacman_FS18/New_Material/PacmanMap (added) * code/branches/3DPacman_FS18/New_Material/PacmanMap/3DPacmanMap.pptx (added) * code/branches/3DPacman_FS18/New_Material/PacmanMap/PacmanMap.PNG (added) * code/branches/3DPacman_FS18/New_Material/PacmanMap/Pacmanmap.blend1 (added) Erste 3D-MOdelle von Map, gelbem Pacman und Geister. Thu, 15 Mar 2018 14:30:09 GMT adamc [11824] * code/branches/ScriptableController_FS18/src/orxonox/controllers/Controller.cc (modified) Test Thu, 15 Mar 2018 13:34:14 GMT patricwi [11823] * code/branches/OrxyRoad_FS18 (copied) Added new branch Thu, 15 Mar 2018 13:26:59 GMT patricwi [11822] * code/branches/ScriptableController_FS18 (copied) Added new branch Thu, 15 Mar 2018 13:22:42 GMT patricwi [11821] * code/branches/Hover_FS18 (copied) Added new branch Thu, 15 Mar 2018 13:22:28 GMT patricwi [11820] * code/branches/SuperOrxoBros_FS18 (copied) Added new branch Thu, 15 Mar 2018 13:22:13 GMT patricwi [11819] * code/branches/3DPacman_FS18 (copied) Added new branch Thu, 15 Mar 2018 13:21:58 GMT patricwi [11818] * code/branches/TowerDefense_FS18 (copied) Added new branch Thu, 15 Mar 2018 13:21:37 GMT patricwi [11817] * code/branches/RacingBots_FS18 (copied) Added new branch Thu, 15 Mar 2018 13:20:51 GMT patricwi [11816] * code/branches/Masterserver_FS18 (copied) Added new branch Thu, 08 Mar 2018 12:44:22 GMT patricwi [11815] * code/branches/tutorial6 (moved) branch moved Sat, 24 Feb 2018 18:40:03 GMT landauf [11814] * code/branches/cegui0.8_ogre1.9/src/libraries/tools/DebugDrawer.cc (modified) fixed material of debug drawer (to visualize collision shapes) Sat, 24 Feb 2018 17:09:45 GMT landauf [11811] * code/branches/cegui0.8_ogre1.9/src/libraries/network/TrafficControl.cc (modified) * code/branches/cegui0.8_ogre1.9/src/orxonox/controllers/AIController.cc (modified) * code/branches/cegui0.8_ogre1.9/src/orxonox/overlays/InGameConsole.cc (modified) fixed some warnings with gcc 7 Sat, 24 Feb 2018 16:51:59 GMT landauf [11810] * code/branches/cegui0.8_ogre1.9/cmake/LibraryConfig.cmake (modified) * code/branches/cegui0.8_ogre1.9/cmake/tools/FindCEGUI.cmake (modified) added path to cegui for ubuntu 17.10 and also making cegui 0.8 the ... Sat, 24 Feb 2018 15:58:39 GMT landauf [11809] * code/branches/cegui0.8_ogre1.9/data/gui/scripts/GUITools.lua (modified) * code/branches/cegui0.8_ogre1.9/src/libraries/core/GUIManager.cc (modified) * code/branches/cegui0.8_ogre1.9/src/libraries/core/GUIManager.h (modified) added work around for a bug in cegui 0.8 (the cegui lua scripts ... Sat, 24 Feb 2018 15:00:22 GMT landauf [11808] * code/branches/cegui0.8_ogre1.9/data/levels/AsteroidFarming.oxw (modified) * code/branches/cegui0.8_ogre1.9/data/levels/newnewnewspacerace.oxw (modified) * code/branches/cegui0.8_ogre1.9/data/levels/pirateAttack.oxw (modified) attach Planets to MovableEntities to make them move (Planets are ... Sat, 24 Feb 2018 13:56:19 GMT landauf [11807] * code/branches/cegui0.8_ogre1.9/data/gui/layouts/InGamePickupHUD.layout (deleted) * code/branches/cegui0.8_ogre1.9/data/gui/layouts/InGameTest.layout (deleted) * code/branches/cegui0.8_ogre1.9/data/gui/scripts/GameplayMenu.lua (modified) * code/branches/cegui0.8_ogre1.9/data/gui/scripts/InGamePickupHUD.lua (deleted) * code/branches/cegui0.8_ogre1.9/data/gui/scripts/TestDialogButttons.lua (deleted) removed unneeded files and migrated GameplayMenu.lua to cegui 0.8 Sat, 24 Feb 2018 02:09:05 GMT landauf [11806] * code/branches/cegui0.8_ogre1.9/data/gui/layouts/Dialog.layout (modified) * code/branches/cegui0.8_ogre1.9/data/gui/layouts/DockingDialog.layout (modified) * code/branches/cegui0.8_ogre1.9/data/gui/layouts/PickupInventory.layout (modified) * code/branches/cegui0.8_ogre1.9/data/gui/layouts/QuestGUI.layout (modified) * code/branches/cegui0.8_ogre1.9/data/gui/layouts/UndockingDialog.layout (modified) * code/branches/cegui0.8_ogre1.9/data/gui/scripts/Dialog.lua (modified) * code/branches/cegui0.8_ogre1.9/data/gui/scripts/DockingDialog.lua (modified) * code/branches/cegui0.8_ogre1.9/data/gui/scripts/InGameMenu.lua (modified) * code/branches/cegui0.8_ogre1.9/data/gui/scripts/PickupInventory.lua (modified) * code/branches/cegui0.8_ogre1.9/data/gui/scripts/QuestGUI.lua (modified) * code/branches/cegui0.8_ogre1.9/data/gui/scripts/UndockingDialog.lua (modified) migrated all ingame menus to cegui 0.8 Sat, 24 Feb 2018 01:50:16 GMT landauf [11805] * code/branches/cegui0.8_ogre1.9/data/gui/layouts/HighscoreMenu.layout (modified) * code/branches/cegui0.8_ogre1.9/data/gui/scripts/CampaignMenu.lua (modified) * code/branches/cegui0.8_ogre1.9/data/gui/scripts/HighscoreMenu.lua (modified) migrated HighscoreMenu.lua and CampaignMenu.lua to cegui 0.8 Sat, 24 Feb 2018 01:21:24 GMT landauf [11804] * code/branches/cegui0.8_ogre1.9/data/gui/layouts/DecisionPopup.layout (modified) * code/branches/cegui0.8_ogre1.9/data/gui/layouts/InfoPopup.layout (modified) fixed another alignment issue Sat, 24 Feb 2018 00:51:31 GMT landauf [11803] * code/branches/cegui0.8_ogre1.9/data/gui/layouts/AudioMenu.layout (modified) * code/branches/cegui0.8_ogre1.9/data/gui/layouts/CampaignMenu.layout (modified) * code/branches/cegui0.8_ogre1.9/data/gui/layouts/ControlsMenu.layout (modified) * code/branches/cegui0.8_ogre1.9/data/gui/layouts/CreditsMenu.layout (modified) * code/branches/cegui0.8_ogre1.9/data/gui/layouts/GameplayMenu.layout (modified) * code/branches/cegui0.8_ogre1.9/data/gui/layouts/GraphicsMenu.layout (modified) * code/branches/cegui0.8_ogre1.9/data/gui/layouts/HostMenu.layout (modified) * code/branches/cegui0.8_ogre1.9/data/gui/layouts/KeyBindMenu.layout (modified) * code/branches/cegui0.8_ogre1.9/data/gui/layouts/MiscConfigMenu.layout (modified) * code/branches/cegui0.8_ogre1.9/data/gui/layouts/MouseControlsMenu.layout (modified) * code/branches/cegui0.8_ogre1.9/data/gui/layouts/MultiplayerMenu.layout (modified) * code/branches/cegui0.8_ogre1.9/data/gui/layouts/MultiplayerOptionsMenu.layout (modified) * code/branches/cegui0.8_ogre1.9/data/gui/layouts/SettingsMenu.layout (modified) * code/branches/cegui0.8_ogre1.9/data/gui/layouts/ShipSelectionMenu.layout (modified) * code/branches/cegui0.8_ogre1.9/data/gui/layouts/SingleplayerConfigMenu.layout (modified) * code/branches/cegui0.8_ogre1.9/data/gui/layouts/SingleplayerMenu.layout (modified) fixed alignment Sat, 24 Feb 2018 00:49:10 GMT landauf [11802] * code/branches/cegui0.8_ogre1.9/data/gui/scripts/NotificationLayer.lua (modified) * code/branches/cegui0.8_ogre1.9/data/levels/AnihilationThreat.oxw (modified) * code/branches/cegui0.8_ogre1.9/data/levels/ArrowLevel.oxw (modified) * code/branches/cegui0.8_ogre1.9/data/levels/ProtectBoss.oxw (modified) * code/branches/cegui0.8_ogre1.9/data/levels/expeditionSector.oxw (modified) * code/branches/cegui0.8_ogre1.9/data/levels/iJohnVane_TriptoArea51.oxw (modified) * code/branches/cegui0.8_ogre1.9/data/levels/iiJohnVane_Area51UnderFire.oxw (modified) * code/branches/cegui0.8_ogre1.9/data/levels/iiiJohnVane_EscapeTheBastards.oxw (modified) * code/branches/cegui0.8_ogre1.9/data/levels/includes/notifications.oxi (modified) * code/branches/cegui0.8_ogre1.9/data/levels/kecks.oxw (modified) * code/branches/cegui0.8_ogre1.9/data/levels/maxim.oxw (modified) * code/branches/cegui0.8_ogre1.9/data/levels/missionOne.oxw (modified) * code/branches/cegui0.8_ogre1.9/data/levels/notifications.oxw (modified) * code/branches/cegui0.8_ogre1.9/data/levels/presentationFS11.oxw (modified) * code/branches/cegui0.8_ogre1.9/data/levels/presentationHS11.oxw (modified) * code/branches/cegui0.8_ogre1.9/data/levels/presentationHS12.oxw (modified) * code/branches/cegui0.8_ogre1.9/data/levels/shuttleAttack.oxw (modified) * code/branches/cegui0.8_ogre1.9/data/levels/shuttleRetaliation.oxw (modified) * code/branches/cegui0.8_ogre1.9/src/modules/notifications/NotificationManager.cc (modified) migrated NotificationLayer.lua to cegui 0.8 Sat, 24 Feb 2018 00:08:11 GMT landauf [11801] * code/branches/cegui0.8_ogre1.9/data/gui/layouts/CreditsMenu.layout (modified) * code/branches/cegui0.8_ogre1.9/data/gui/layouts/GameplayMenu.layout (modified) * code/branches/cegui0.8_ogre1.9/data/gui/layouts/MainMenuBackground.layout (deleted) * code/branches/cegui0.8_ogre1.9/data/gui/layouts/SingleplayerConfigMenu.layout (modified) * code/branches/cegui0.8_ogre1.9/data/gui/scripts/SingleplayerConfigMenu.lua (modified) fixed some config values; removed unused layout; renamed some ... Sat, 24 Feb 2018 00:05:32 GMT landauf [11800] * code/branches/cegui0.8_ogre1.9/data/gui/layouts/AudioMenu.layout (modified) * code/branches/cegui0.8_ogre1.9/data/gui/layouts/GraphicsMenu.layout (modified) * code/branches/cegui0.8_ogre1.9/data/gui/layouts/KeyBindMenu.layout (modified) * code/branches/cegui0.8_ogre1.9/data/gui/layouts/MiscConfigMenu.layout (modified) * code/branches/cegui0.8_ogre1.9/data/gui/layouts/MouseControlsMenu.layout (modified) * code/branches/cegui0.8_ogre1.9/data/gui/layouts/SettingsMenu.layout (modified) * code/branches/cegui0.8_ogre1.9/data/gui/scripts/AudioMenu.lua (modified) * code/branches/cegui0.8_ogre1.9/data/gui/scripts/ControlsMenu.lua (modified) * code/branches/cegui0.8_ogre1.9/data/gui/scripts/DecisionPopup.lua (modified) * code/branches/cegui0.8_ogre1.9/data/gui/scripts/GraphicsMenu.lua (modified) * code/branches/cegui0.8_ogre1.9/data/gui/scripts/InfoPopup.lua (modified) * code/branches/cegui0.8_ogre1.9/data/gui/scripts/KeyBindMenu.lua (modified) * code/branches/cegui0.8_ogre1.9/data/gui/scripts/MiscConfigMenu.lua (modified) * code/branches/cegui0.8_ogre1.9/data/gui/scripts/MouseControlsMenu.lua (modified) * code/branches/cegui0.8_ogre1.9/data/gui/scripts/SettingsMenu.lua (modified) updated Settings.lua and all sub-menus to cegui 0.8 Thu, 22 Feb 2018 23:20:35 GMT landauf [11799] * code/branches/cegui0.8_ogre1.9/data/gui/layouts/HostMenu.layout (modified) * code/branches/cegui0.8_ogre1.9/data/gui/scripts/GUITools.lua (modified) * code/branches/cegui0.8_ogre1.9/data/gui/scripts/HostMenu.lua (modified) * code/branches/cegui0.8_ogre1.9/data/gui/scripts/MultiplayerMenu.lua (modified) * code/branches/cegui0.8_ogre1.9/data/gui/scripts/ShipSelectionMenu.lua (modified) * code/branches/cegui0.8_ogre1.9/data/gui/scripts/SingleplayerConfigMenu.lua (modified) updated HostMenu.lua, MultiplayerMenu.lua, ShipSelectionMenu.lua, ... Thu, 22 Feb 2018 11:20:34 GMT landauf [11798] * code/branches/cegui0.8_ogre1.9/cmake/tools/FindCEGUI.cmake (modified) added (again) more include paths to make it work with ubuntu Thu, 22 Feb 2018 00:03:44 GMT landauf [11797] * code/branches/cegui0.8_ogre1.9/data/gui/scripts/CreditsMenu.lua (modified) * code/branches/cegui0.8_ogre1.9/data/gui/scripts/GUITools.lua (modified) * code/branches/cegui0.8_ogre1.9/data/gui/scripts/SingleplayerMenu.lua (modified) updated CreditsMenu.lua and SingleplayerMenu.lua to cegui 0.8 Tue, 20 Feb 2018 23:31:17 GMT landauf [11796] * code/branches/cegui0.8_ogre1.9/src/modules/overlays/hud/HUDPickupSystem.cc (modified) * code/branches/cegui0.8_ogre1.9/src/modules/overlays/hud/StoryModeHUD.cc (modified) fixed build Tue, 20 Feb 2018 23:03:52 GMT landauf [11795] * code/branches/cegui0.8_ogre1.9 (modified) * code/branches/cegui0.8_ogre1.9/cmake/tools/FindCEGUI.cmake (modified) * code/branches/cegui0.8_ogre1.9/cmake/tools/FindOGRE.cmake (modified) * code/branches/cegui0.8_ogre1.9/data/gui/configs/CEGUIConfig.xsd (modified) * code/branches/cegui0.8_ogre1.9/data/gui/layouts/ChatBox-inputonly.layout (modified) * code/branches/cegui0.8_ogre1.9/data/gui/layouts/ChatBox.layout (modified) * code/branches/cegui0.8_ogre1.9/data/gui/layouts/GUILayout.xsd (modified) * code/branches/cegui0.8_ogre1.9/data/gui/schemes/GUIScheme.xsd (modified) * code/branches/cegui0.8_ogre1.9/data/gui/scripts/AudioMenu.lua (modified) * code/branches/cegui0.8_ogre1.9/data/gui/scripts/DockingDialog.lua (modified) * code/branches/cegui0.8_ogre1.9/data/gui/scripts/GUISheet.lua (modified) * code/branches/cegui0.8_ogre1.9/data/gui/scripts/GameplayMenu.lua (modified) * code/branches/cegui0.8_ogre1.9/data/gui/scripts/GraphicsMenu.lua (modified) * code/branches/cegui0.8_ogre1.9/data/gui/scripts/HostMenu.lua (modified) * code/branches/cegui0.8_ogre1.9/data/gui/scripts/InitialiseGUI.lua (modified) * code/branches/cegui0.8_ogre1.9/data/gui/scripts/MainMenu.lua (modified) * code/branches/cegui0.8_ogre1.9/data/gui/scripts/MultiplayerMenu.lua (modified) * code/branches/cegui0.8_ogre1.9/data/gui/scripts/PickupInventory.lua (modified) * code/branches/cegui0.8_ogre1.9/data/gui/scripts/QuestGUI.lua (modified) * code/branches/cegui0.8_ogre1.9/data/gui/scripts/SheetManager.lua (modified) * code/branches/cegui0.8_ogre1.9/data/gui/scripts/ShipSelectionMenu.lua (modified) * code/branches/cegui0.8_ogre1.9/data/gui/scripts/SingleplayerMenu.lua (modified) * code/branches/cegui0.8_ogre1.9/data/gui/scripts/UndockingDialog.lua (modified) * code/branches/cegui0.8_ogre1.9/data/levels/asteroidField.oxw (modified) * code/branches/cegui0.8_ogre1.9/data/levels/dockingToASpaceStation.oxw (modified) * code/branches/cegui0.8_ogre1.9/data/levels/dynamicMatch.oxw (modified) * code/branches/cegui0.8_ogre1.9/data/levels/earth.oxw (modified) * code/branches/cegui0.8_ogre1.9/data/levels/expeditionSector.oxw (modified) * code/branches/cegui0.8_ogre1.9/data/levels/iiJohnVane_Area51UnderFire.oxw (modified) * code/branches/cegui0.8_ogre1.9/data/levels/iiiJohnVane_EscapeTheBastards.oxw (modified) * code/branches/cegui0.8_ogre1.9/data/levels/kecks.oxw (modified) * code/branches/cegui0.8_ogre1.9/data/levels/levelTry.oxw (modified) * code/branches/cegui0.8_ogre1.9/data/levels/missionOne.oxw (modified) * code/branches/cegui0.8_ogre1.9/data/levels/planets.oxw (modified) * code/branches/cegui0.8_ogre1.9/data/levels/presentation09.oxw (modified) * code/branches/cegui0.8_ogre1.9/data/levels/presentationFS11.oxw (modified) * code/branches/cegui0.8_ogre1.9/data/levels/presentationHS09.oxw (modified) * code/branches/cegui0.8_ogre1.9/data/levels/presentationHS12.oxw (modified) * code/branches/cegui0.8_ogre1.9/data/levels/shadertest.oxw (modified) * code/branches/cegui0.8_ogre1.9/data/levels/shuttleAttack.oxw (modified) * code/branches/cegui0.8_ogre1.9/data/levels/shuttleRetaliation.oxw (modified) * code/branches/cegui0.8_ogre1.9/data/levels/testSwallow.oxw (modified) * code/branches/cegui0.8_ogre1.9/src/libraries/core/CMakeLists.txt (modified) * code/branches/cegui0.8_ogre1.9/src/libraries/core/GUIManager.cc (modified) * code/branches/cegui0.8_ogre1.9/src/libraries/core/GraphicsManager.cc (modified) * code/branches/cegui0.8_ogre1.9/src/libraries/core/GraphicsManager.h (modified) * code/branches/cegui0.8_ogre1.9/src/libraries/util/DisplayStringConversions.h (modified) * code/branches/cegui0.8_ogre1.9/src/libraries/util/OgreForwardRefs.h (modified) * code/branches/cegui0.8_ogre1.9/src/modules/designtools/ScreenshotManager.cc (modified) * code/branches/cegui0.8_ogre1.9/src/modules/hover/FlagHUD.cc (modified) * code/branches/cegui0.8_ogre1.9/src/modules/objects/Planet.cc (modified) * code/branches/cegui0.8_ogre1.9/src/modules/objects/Planet.h (modified) * code/branches/cegui0.8_ogre1.9/src/modules/overlays/FadeoutText.cc (modified) * code/branches/cegui0.8_ogre1.9/src/modules/overlays/OverlayText.cc (modified) * code/branches/cegui0.8_ogre1.9/src/modules/overlays/hud/ChatOverlay.cc (modified) * code/branches/cegui0.8_ogre1.9/src/modules/overlays/hud/ChatOverlay.h (modified) * code/branches/cegui0.8_ogre1.9/src/modules/overlays/hud/HUDBar.cc (modified) * code/branches/cegui0.8_ogre1.9/src/modules/overlays/hud/HUDBar.h (modified) * code/branches/cegui0.8_ogre1.9/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/branches/cegui0.8_ogre1.9/src/modules/overlays/hud/HUDRadar.cc (modified) * code/branches/cegui0.8_ogre1.9/src/modules/overlays/hud/HUDWeapon.cc (modified) * code/branches/cegui0.8_ogre1.9/src/modules/overlays/hud/HUDWeapon.h (modified) * code/branches/cegui0.8_ogre1.9/src/modules/overlays/hud/HUDWeaponMode.cc (modified) * code/branches/cegui0.8_ogre1.9/src/modules/overlays/hud/HUDWeaponMode.h (modified) * code/branches/cegui0.8_ogre1.9/src/modules/overlays/stats/Stats.cc (modified) * code/branches/cegui0.8_ogre1.9/src/orxonox/CMakeLists.txt (modified) * code/branches/cegui0.8_ogre1.9/src/orxonox/RenderQueueListener.cc (modified) * code/branches/cegui0.8_ogre1.9/src/orxonox/Scene.cc (modified) * code/branches/cegui0.8_ogre1.9/src/orxonox/chat/ChatInputHandler.cc (modified) * code/branches/cegui0.8_ogre1.9/src/orxonox/controllers/NewHumanController.cc (modified) * code/branches/cegui0.8_ogre1.9/src/orxonox/graphics/AnimatedModel.cc (modified) * code/branches/cegui0.8_ogre1.9/src/orxonox/graphics/Camera.cc (modified) * code/branches/cegui0.8_ogre1.9/src/orxonox/graphics/Model.cc (modified) * code/branches/cegui0.8_ogre1.9/src/orxonox/graphics/Model.h (modified) * code/branches/cegui0.8_ogre1.9/src/orxonox/overlays/InGameConsole.cc (modified) * code/branches/cegui0.8_ogre1.9/src/orxonox/overlays/OrxonoxOverlay.cc (modified) * code/branches/cegui0.8_ogre1.9/src/orxonox/worldentities/WorldEntity.cc (modified) merged ogre1.9 (including cegui0.8) into new branch Tue, 20 Feb 2018 22:42:02 GMT landauf [11793] * code/branches/cegui0.8_ogre1.9/data/gui/layouts/AudioMenu.layout (modified) * code/branches/cegui0.8_ogre1.9/data/gui/layouts/CampaignMenu.layout (modified) * code/branches/cegui0.8_ogre1.9/data/gui/layouts/ChatBox-inputonly.layout (modified) * code/branches/cegui0.8_ogre1.9/data/gui/layouts/ChatBox.layout (modified) * code/branches/cegui0.8_ogre1.9/data/gui/layouts/ControlsMenu.layout (modified) * code/branches/cegui0.8_ogre1.9/data/gui/layouts/CreditsMenu.layout (modified) * code/branches/cegui0.8_ogre1.9/data/gui/layouts/DecisionPopup.layout (modified) * code/branches/cegui0.8_ogre1.9/data/gui/layouts/Dialog.layout (modified) * code/branches/cegui0.8_ogre1.9/data/gui/layouts/DockingDialog.layout (modified) * code/branches/cegui0.8_ogre1.9/data/gui/layouts/GameplayMenu.layout (modified) * code/branches/cegui0.8_ogre1.9/data/gui/layouts/GraphicsMenu.layout (modified) * code/branches/cegui0.8_ogre1.9/data/gui/layouts/HighscoreMenu.layout (modified) * code/branches/cegui0.8_ogre1.9/data/gui/layouts/HostMenu.layout (modified) * code/branches/cegui0.8_ogre1.9/data/gui/layouts/InGameMenu.layout (modified) * code/branches/cegui0.8_ogre1.9/data/gui/layouts/InGamePickupHUD.layout (modified) * code/branches/cegui0.8_ogre1.9/data/gui/layouts/InGameTest.layout (modified) * code/branches/cegui0.8_ogre1.9/data/gui/layouts/InfoPopup.layout (modified) * code/branches/cegui0.8_ogre1.9/data/gui/layouts/KeyBindMenu.layout (modified) * code/branches/cegui0.8_ogre1.9/data/gui/layouts/MainMenu.layout (modified) * code/branches/cegui0.8_ogre1.9/data/gui/layouts/MainMenuBackground.layout (modified) * code/branches/cegui0.8_ogre1.9/data/gui/layouts/MiscConfigMenu.layout (modified) * code/branches/cegui0.8_ogre1.9/data/gui/layouts/MouseControlsMenu.layout (modified) * code/branches/cegui0.8_ogre1.9/data/gui/layouts/MultiplayerMenu.layout (modified) * code/branches/cegui0.8_ogre1.9/data/gui/layouts/MultiplayerOptionsMenu.layout (modified) * code/branches/cegui0.8_ogre1.9/data/gui/layouts/NotificationLayer.layout (modified) * code/branches/cegui0.8_ogre1.9/data/gui/layouts/PickupInventory.layout (modified) * code/branches/cegui0.8_ogre1.9/data/gui/layouts/QuestGUI.layout (modified) * code/branches/cegui0.8_ogre1.9/data/gui/layouts/SettingsMenu.layout (modified) * code/branches/cegui0.8_ogre1.9/data/gui/layouts/ShipSelectionMenu.layout (modified) * code/branches/cegui0.8_ogre1.9/data/gui/layouts/SingleplayerConfigMenu.layout (modified) * code/branches/cegui0.8_ogre1.9/data/gui/layouts/SingleplayerMenu.layout (modified) * code/branches/cegui0.8_ogre1.9/data/gui/layouts/UndockingDialog.layout (modified) * code/branches/cegui0.8_ogre1.9/data/gui/schemes/OrxonoxGUIScheme.scheme (modified) * code/branches/cegui0.8_ogre1.9/data/gui/schemes/OrxonoxHUDWidgets.scheme (modified) * code/branches/cegui0.8_ogre1.9/data/gui/schemes/OrxonoxLook.scheme (modified) * code/branches/cegui0.8_ogre1.9/data/gui/schemes/OrxonoxMenuWidgets.scheme (modified) * code/branches/cegui0.8_ogre1.9/data/gui/schemes/SleekSpaceHUDWidgets.scheme (modified) * code/branches/cegui0.8_ogre1.9/data/gui/schemes/SleekSpaceLook.scheme (modified) * code/branches/cegui0.8_ogre1.9/data/gui/schemes/SleekSpaceMenuWidgets.scheme (modified) * code/branches/cegui0.8_ogre1.9/data/gui/schemes/TaharezGreenHUDWidgets.scheme (modified) * code/branches/cegui0.8_ogre1.9/data/gui/schemes/TaharezGreenLook.scheme (modified) * code/branches/cegui0.8_ogre1.9/data/gui/schemes/TaharezGreenMenuWidgets.scheme (modified) * code/branches/cegui0.8_ogre1.9/data/gui/schemes/TaharezHUDWidgets.scheme (modified) * code/branches/cegui0.8_ogre1.9/data/gui/schemes/TaharezLook.scheme (modified) * code/branches/cegui0.8_ogre1.9/data/gui/schemes/TaharezMenuWidgets.scheme (modified) * code/branches/cegui0.8_ogre1.9/data/gui/schemes/VanillaHUDWidgets.scheme (modified) * code/branches/cegui0.8_ogre1.9/data/gui/schemes/VanillaLook.scheme (modified) * code/branches/cegui0.8_ogre1.9/data/gui/schemes/VanillaMenuWidgets.scheme (modified) * code/branches/cegui0.8_ogre1.9/data/gui/schemes/WindowsHUDWidgets.scheme (modified) * code/branches/cegui0.8_ogre1.9/data/gui/schemes/WindowsLook.scheme (modified) * code/branches/cegui0.8_ogre1.9/data/gui/schemes/WindowsMenuWidgets.scheme (modified) auto-migrated all cegui files to version 0.8 with ceed ... Tue, 20 Feb 2018 22:37:34 GMT landauf [11791] * code/branches/cegui0.8_ogre1.9/data/gui/layouts/InGamePickupHUD.layout (modified) removed umlaute Tue, 20 Feb 2018 20:23:01 GMT landauf [11787] * code/branches/cegui0.8_ogre1.9 (copied) created new branch to merge cegui0.8 and ogre1.9 with the recent ... Tue, 20 Feb 2018 20:18:58 GMT landauf [11784] * code/trunk/src/libraries/network/FunctionCallManager.cc (modified) this looks like a bug (detected by cppcheck -> ... Mon, 19 Feb 2018 23:14:40 GMT landauf [11783] * code/trunk (modified) * code/trunk/data/gui/layouts/Dialog.layout (copied) * code/trunk/data/gui/layouts/Dialogue.layout (deleted) * code/trunk/data/gui/layouts/HighscoreMenu.layout (modified) * code/trunk/data/gui/scripts/Dialog.lua (copied) * code/trunk/data/gui/scripts/Dialogue.lua (deleted) * code/trunk/data/gui/scripts/HighscoreMenu.lua (modified) * code/trunk/data/gui/scripts/TestDialogButttons.lua (modified) * code/trunk/data/levels/ArrowLevel.oxw (copied) * code/trunk/data/levels/AsteroidFarming.oxw (copied) * code/trunk/data/levels/Asteroids2D.oxw (copied) * code/trunk/data/levels/DialogShowcase.oxw (copied) * code/trunk/data/levels/DialogueShowcase.oxw (deleted) * code/trunk/data/levels/Endurancefinal.oxw (modified) * code/trunk/data/levels/FlappyOrx.oxw (copied) * code/trunk/data/levels/MilleniumFalconTest.oxw (modified) * code/trunk/data/levels/NC_StoryModeLevel.oxw (copied) * code/trunk/data/levels/ProtectBoss.oxw (copied) * code/trunk/data/levels/SOB.oxw (modified) * code/trunk/data/levels/StoryModeMap.oxw (modified) * code/trunk/data/levels/includes/MFalconWeapon.oxi (modified) * code/trunk/data/levels/includes/asteroids2DWeapon.oxi (copied) * code/trunk/data/levels/newnewnewspacerace.oxw (modified) * code/trunk/data/levels/templates/MFalcon.oxt (modified) * code/trunk/data/levels/templates/StoryMode.oxt (modified) * code/trunk/data/levels/templates/StoryModeEscort.oxt (copied) * code/trunk/data/levels/templates/asteroidsAsteroids2D.oxt (copied) * code/trunk/data/levels/templates/endurancetest_template.oxt (modified) * code/trunk/data/levels/templates/enemyFlappyOrx.oxt (copied) * code/trunk/data/levels/templates/fastship.oxt (modified) * code/trunk/data/levels/templates/spaceshipAsteroids2D.oxt (copied) * code/trunk/data/levels/templates/spaceshipFlappyOrx.oxt (copied) * code/trunk/data/overlays/Asteroids2DHUD.oxo (copied) * code/trunk/data/overlays/FlappyOrxHUD.oxo (copied) * code/trunk/data/overlays/HUDTemplates3.oxo (modified) * code/trunk/data/overlays/HUDTemplatesFPS.oxo (modified) * code/trunk/data/overlays/SOBHUD.oxo (modified) * code/trunk/data/overlays/StoryModeHUD.oxo (modified) * code/trunk/data/overlays/StoryModeHUD2.oxo (copied) * code/trunk/data/particle/fire3.particle (modified) * code/trunk/src/libraries/tools/Mesh.cc (modified) * code/trunk/src/libraries/tools/Mesh.h (modified) * code/trunk/src/modules/CMakeLists.txt (modified) * code/trunk/src/modules/asteroidmining (copied) * code/trunk/src/modules/asteroids2D (copied) * code/trunk/src/modules/dialog (copied) * code/trunk/src/modules/dialogue (deleted) * code/trunk/src/modules/dodgerace/DodgeRace.cc (modified) * code/trunk/src/modules/dodgerace/DodgeRace.h (modified) * code/trunk/src/modules/flappyorx (copied) * code/trunk/src/modules/overlays/hud/CMakeLists.txt (modified) * code/trunk/src/modules/overlays/hud/HUDPickupSystem.cc (modified) * code/trunk/src/modules/overlays/hud/HUDPickupSystem.h (modified) * code/trunk/src/modules/overlays/hud/StoryModeHUD.cc (copied) * code/trunk/src/modules/overlays/hud/StoryModeHUD.h (copied) * code/trunk/src/modules/pickup/PickupPrereqs.h (modified) * code/trunk/src/modules/pickup/PickupSpawner.cc (modified) * code/trunk/src/modules/pickup/PickupSpawner.h (modified) * code/trunk/src/modules/superorxobros/CMakeLists.txt (modified) * code/trunk/src/modules/superorxobros/Orxo.cc (deleted) * code/trunk/src/modules/superorxobros/Orxo.h (deleted) * code/trunk/src/modules/superorxobros/SOB.cc (modified) * code/trunk/src/modules/superorxobros/SOB.h (modified) * code/trunk/src/modules/superorxobros/SOBCastlestone.cc (modified) * code/trunk/src/modules/superorxobros/SOBCastlestone.h (modified) * code/trunk/src/modules/superorxobros/SOBCenterpoint.cc (modified) * code/trunk/src/modules/superorxobros/SOBCenterpoint.h (modified) * code/trunk/src/modules/superorxobros/SOBCoin.cc (modified) * code/trunk/src/modules/superorxobros/SOBCoin.h (modified) * code/trunk/src/modules/superorxobros/SOBFigure.cc (modified) * code/trunk/src/modules/superorxobros/SOBFigure.h (modified) * code/trunk/src/modules/superorxobros/SOBFireball.cc (copied) * code/trunk/src/modules/superorxobros/SOBFireball.h (copied) * code/trunk/src/modules/superorxobros/SOBFlagstone.cc (modified) * code/trunk/src/modules/superorxobros/SOBFlagstone.h (modified) * code/trunk/src/modules/superorxobros/SOBGumba.cc (modified) * code/trunk/src/modules/superorxobros/SOBGumba.h (modified) * code/trunk/src/modules/superorxobros/SOBGumbaBoss.cc (copied) * code/trunk/src/modules/superorxobros/SOBGumbaBoss.h (copied) * code/trunk/src/modules/superorxobros/SOBHUDInfo.cc (modified) * code/trunk/src/modules/superorxobros/SOBHUDInfo.h (modified) * code/trunk/src/modules/superorxobros/SOBItem.cc (modified) * code/trunk/src/modules/superorxobros/SOBItem.h (modified) * code/trunk/src/modules/superorxobros/SOBMushroom.cc (modified) * code/trunk/src/modules/superorxobros/SOBMushroom.h (modified) * code/trunk/src/modules/superorxobros/SOBPrereqs.h (modified) * code/trunk/src/modules/superorxobros/SOBQBlock.cc (modified) * code/trunk/src/modules/superorxobros/SOBQBlock.h (modified) * code/trunk/src/modules/weapons/munitions/FlameMunition.cc (modified) * code/trunk/src/modules/weapons/munitions/FlameMunition.h (modified) * code/trunk/src/modules/weapons/projectiles/FlameGunProjectile.cc (modified) * code/trunk/src/modules/weapons/projectiles/FlameGunProjectile.h (modified) * code/trunk/src/modules/weapons/weaponmodes/FlameGun.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/FlameGun.h (modified) * code/trunk/src/orxonox/Highscore.cc (modified) * code/trunk/src/orxonox/Highscore.h (modified) * code/trunk/src/orxonox/OrxonoxPrereqs.h (modified) * code/trunk/src/orxonox/controllers/ArrowController.cc (copied) * code/trunk/src/orxonox/controllers/ArrowController.h (copied) * code/trunk/src/orxonox/controllers/CMakeLists.txt (modified) * code/trunk/src/orxonox/controllers/DroneController.cc (modified) * code/trunk/src/orxonox/controllers/HumanController.h (modified) * code/trunk/src/orxonox/gametypes/StoryMode.cc (modified) * code/trunk/src/orxonox/gametypes/StoryMode.h (modified) * code/trunk/src/orxonox/graphics/Model.cc (modified) * code/trunk/src/orxonox/graphics/Model.h (modified) * code/trunk/src/orxonox/interfaces/RadarViewable.h (modified) * code/trunk/src/orxonox/worldentities/Arrow.cc (copied) * code/trunk/src/orxonox/worldentities/Arrow.h (copied) * code/trunk/src/orxonox/worldentities/CMakeLists.txt (modified) * code/trunk/src/orxonox/worldentities/NameableStaticEntity.cc (copied) * code/trunk/src/orxonox/worldentities/NameableStaticEntity.h (copied) * code/trunk/src/orxonox/worldentities/pawns/CMakeLists.txt (modified) * code/trunk/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/Pawn.h (modified) * code/trunk/src/orxonox/worldentities/pawns/ShootableObstacle.cc (copied) * code/trunk/src/orxonox/worldentities/pawns/ShootableObstacle.h (copied) * code/trunk/src/orxonox/worldentities/pawns/StoryModePawn.cc (copied) * code/trunk/src/orxonox/worldentities/pawns/StoryModePawn.h (copied) merged Presentation_HS17_merge back to trunk Mon, 19 Feb 2018 23:09:09 GMT landauf [11782] * code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DStone.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DStone.h (modified) * code/branches/Presentation_HS17_merge/src/modules/dialog/Answer.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/dialog/Answer.h (modified) * code/branches/Presentation_HS17_merge/src/modules/dialog/AnswerId.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/dialog/AnswerId.h (modified) * code/branches/Presentation_HS17_merge/src/modules/dialog/Dialog.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/dialog/Dialog.h (modified) * code/branches/Presentation_HS17_merge/src/modules/dialog/DialogManager.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/dialog/Question.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/dialog/Question.h (modified) * code/branches/Presentation_HS17_merge/src/orxonox/worldentities/NameableStaticEntity.cc (modified) * code/branches/Presentation_HS17_merge/src/orxonox/worldentities/NameableStaticEntity.h (modified) * code/branches/Presentation_HS17_merge/src/orxonox/worldentities/pawns/ShootableObstacle.h (modified) tabs -> spaces Mon, 19 Feb 2018 22:48:23 GMT landauf [11781] * code/branches/Presentation_HS17_merge/data/gui/layouts/Dialog.layout (modified) * code/branches/Presentation_HS17_merge/data/gui/layouts/HighscoreMenu.layout (modified) * code/branches/Presentation_HS17_merge/data/gui/scripts/Dialog.lua (modified) * code/branches/Presentation_HS17_merge/data/gui/scripts/HighscoreMenu.lua (modified) * code/branches/Presentation_HS17_merge/data/gui/scripts/TestDialogButttons.lua (modified) * code/branches/Presentation_HS17_merge/data/levels/ArrowLevel.oxw (modified) * code/branches/Presentation_HS17_merge/data/levels/AsteroidFarming.oxw (modified) * code/branches/Presentation_HS17_merge/data/levels/Asteroids2D.oxw (modified) * code/branches/Presentation_HS17_merge/data/levels/DialogShowcase.oxw (modified) * code/branches/Presentation_HS17_merge/data/levels/Endurancefinal.oxw (modified) * code/branches/Presentation_HS17_merge/data/levels/FlappyOrx.oxw (modified) * code/branches/Presentation_HS17_merge/data/levels/MilleniumFalconTest.oxw (modified) * code/branches/Presentation_HS17_merge/data/levels/NC_StoryModeLevel.oxw (modified) * code/branches/Presentation_HS17_merge/data/levels/ProtectBoss.oxw (modified) * code/branches/Presentation_HS17_merge/data/levels/SOB.oxw (modified) * code/branches/Presentation_HS17_merge/data/levels/StoryModeMap.oxw (modified) * code/branches/Presentation_HS17_merge/data/levels/includes/MFalconWeapon.oxi (modified) * code/branches/Presentation_HS17_merge/data/levels/includes/asteroids2DWeapon.oxi (modified) * code/branches/Presentation_HS17_merge/data/levels/newnewnewspacerace.oxw (modified) * code/branches/Presentation_HS17_merge/data/levels/templates/MFalcon.oxt (modified) * code/branches/Presentation_HS17_merge/data/levels/templates/StoryMode.oxt (modified) * code/branches/Presentation_HS17_merge/data/levels/templates/StoryModeEscort.oxt (modified) * code/branches/Presentation_HS17_merge/data/levels/templates/asteroidsAsteroids2D.oxt (modified) * code/branches/Presentation_HS17_merge/data/levels/templates/endurancetest_template.oxt (modified) * code/branches/Presentation_HS17_merge/data/levels/templates/enemyFlappyOrx.oxt (modified) * code/branches/Presentation_HS17_merge/data/levels/templates/fastship.oxt (modified) * code/branches/Presentation_HS17_merge/data/levels/templates/spaceshipAsteroids2D.oxt (modified) * code/branches/Presentation_HS17_merge/data/levels/templates/spaceshipFlappyOrx.oxt (modified) * code/branches/Presentation_HS17_merge/data/overlays/Asteroids2DHUD.oxo (modified) * code/branches/Presentation_HS17_merge/data/overlays/FlappyOrxHUD.oxo (modified) * code/branches/Presentation_HS17_merge/data/overlays/SOBHUD.oxo (modified) * code/branches/Presentation_HS17_merge/data/overlays/StoryModeHUD.oxo (modified) * code/branches/Presentation_HS17_merge/data/overlays/StoryModeHUD2.oxo (modified) * code/branches/Presentation_HS17_merge/src/modules/asteroidmining/AsteroidMinable.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/asteroidmining/AsteroidMinable.h (modified) * code/branches/Presentation_HS17_merge/src/modules/asteroidmining/AsteroidMiningPrereqs.h (modified) * code/branches/Presentation_HS17_merge/src/modules/asteroidmining/CMakeLists.txt (modified) * code/branches/Presentation_HS17_merge/src/modules/asteroidmining/SpicedAsteroidBelt.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/asteroidmining/SpicedAsteroidBelt.h (modified) * code/branches/Presentation_HS17_merge/src/modules/asteroidmining/SpicedAsteroidField.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/asteroidmining/SpicedAsteroidField.h (modified) * code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2D.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2D.h (modified) * code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DCenterPoint.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DCenterPoint.h (modified) * code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DHUDinfo.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DHUDinfo.h (modified) * code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DPrereqs.h (modified) * code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DShip.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DShip.h (modified) * code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DStone.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DStone.h (modified) * code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DWeapon.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DWeapon.h (modified) * code/branches/Presentation_HS17_merge/src/modules/asteroids2D/CMakeLists.txt (modified) * code/branches/Presentation_HS17_merge/src/modules/dialog/Answer.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/dialog/Answer.h (modified) * code/branches/Presentation_HS17_merge/src/modules/dialog/AnswerId.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/dialog/AnswerId.h (modified) * code/branches/Presentation_HS17_merge/src/modules/dialog/CMakeLists.txt (modified) * code/branches/Presentation_HS17_merge/src/modules/dialog/Dialog.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/dialog/Dialog.h (modified) * code/branches/Presentation_HS17_merge/src/modules/dialog/DialogManager.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/dialog/DialogManager.h (modified) * code/branches/Presentation_HS17_merge/src/modules/dialog/DialogPrereqs.h (modified) * code/branches/Presentation_HS17_merge/src/modules/dialog/Question.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/dialog/Question.h (modified) * code/branches/Presentation_HS17_merge/src/modules/flappyorx/CMakeLists.txt (modified) * code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrx.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrx.h (modified) * code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrxHUDinfo.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrxHUDinfo.h (modified) * code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrxPrereqs.h (modified) * code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrxShip.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrxShip.h (modified) * code/branches/Presentation_HS17_merge/src/modules/overlays/hud/HUDPickupSystem.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/overlays/hud/HUDPickupSystem.h (modified) * code/branches/Presentation_HS17_merge/src/modules/overlays/hud/StoryModeHUD.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/overlays/hud/StoryModeHUD.h (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/CMakeLists.txt (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOB.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOB.h (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBCastlestone.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBCastlestone.h (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBCenterpoint.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBCenterpoint.h (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBCoin.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBCoin.h (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFigure.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFigure.h (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFireball.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFireball.h (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFlagstone.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFlagstone.h (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBGumba.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBGumba.h (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBGumbaBoss.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBGumbaBoss.h (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBHUDInfo.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBHUDInfo.h (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBItem.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBItem.h (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBMushroom.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBMushroom.h (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBPrereqs.h (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBQBlock.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBQBlock.h (modified) * code/branches/Presentation_HS17_merge/src/modules/weapons/munitions/FlameMunition.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/weapons/munitions/FlameMunition.h (modified) * code/branches/Presentation_HS17_merge/src/modules/weapons/projectiles/FlameGunProjectile.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/weapons/projectiles/FlameGunProjectile.h (modified) * code/branches/Presentation_HS17_merge/src/modules/weapons/weaponmodes/FlameGun.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/weapons/weaponmodes/FlameGun.h (modified) * code/branches/Presentation_HS17_merge/src/orxonox/Highscore.cc (modified) * code/branches/Presentation_HS17_merge/src/orxonox/Highscore.h (modified) * code/branches/Presentation_HS17_merge/src/orxonox/controllers/ArrowController.cc (modified) * code/branches/Presentation_HS17_merge/src/orxonox/controllers/ArrowController.h (modified) * code/branches/Presentation_HS17_merge/src/orxonox/gametypes/StoryMode.cc (modified) * code/branches/Presentation_HS17_merge/src/orxonox/gametypes/StoryMode.h (modified) * code/branches/Presentation_HS17_merge/src/orxonox/worldentities/Arrow.cc (modified) * code/branches/Presentation_HS17_merge/src/orxonox/worldentities/Arrow.h (modified) * code/branches/Presentation_HS17_merge/src/orxonox/worldentities/NameableStaticEntity.cc (modified) * code/branches/Presentation_HS17_merge/src/orxonox/worldentities/NameableStaticEntity.h (modified) * code/branches/Presentation_HS17_merge/src/orxonox/worldentities/pawns/ShootableObstacle.cc (modified) * code/branches/Presentation_HS17_merge/src/orxonox/worldentities/pawns/ShootableObstacle.h (modified) * code/branches/Presentation_HS17_merge/src/orxonox/worldentities/pawns/StoryModePawn.cc (modified) * code/branches/Presentation_HS17_merge/src/orxonox/worldentities/pawns/StoryModePawn.h (modified) eol-style native (no changes in code) Mon, 19 Feb 2018 21:51:15 GMT landauf [11780] * code/branches/Presentation_HS17_merge/data/levels/ArrowLevel.oxw (modified) [Waypoints_HS17] use uppercase mesh-name to avoid errors Mon, 19 Feb 2018 21:33:09 GMT landauf [11778] * code/branches/Presentation_HS17_merge/data/levels/ArrowLevel.oxw (modified) [Waypoints_HS17] fixed run-time warning when loading level Mon, 19 Feb 2018 21:32:12 GMT landauf [11777] * code/branches/Presentation_HS17_merge/data/levels/ArrowLevel.oxw (modified) * code/branches/Presentation_HS17_merge/src/orxonox/controllers/ArrowController.cc (modified) * code/branches/Presentation_HS17_merge/src/orxonox/controllers/ArrowController.h (modified) * code/branches/Presentation_HS17_merge/src/orxonox/worldentities/Arrow.cc (modified) * code/branches/Presentation_HS17_merge/src/orxonox/worldentities/Arrow.h (modified) [Waypoints_HS17] removed lots of copy-paste- and otherwise ... Sun, 18 Feb 2018 23:34:42 GMT landauf [11776] * code/branches/Presentation_HS17_merge/data/levels/emptyLevel.oxw (modified) * code/branches/Presentation_HS17_merge/data/levels/tutorial.oxw (modified) * code/branches/Presentation_HS17_merge/data/overlays/HUDTemplate_test.oxo (deleted) * code/branches/Presentation_HS17_merge/src/modules/overlays/hud/CMakeLists.txt (modified) * code/branches/Presentation_HS17_merge/src/modules/overlays/hud/HUDWaypoints.cc (deleted) * code/branches/Presentation_HS17_merge/src/modules/overlays/hud/HUDWaypoints.h (deleted) * code/branches/Presentation_HS17_merge/src/modules/questsystem/Quest.cc (modified) * code/branches/Presentation_HS17_merge/src/orxonox/controllers/AutonomousDroneController.cc (deleted) * code/branches/Presentation_HS17_merge/src/orxonox/controllers/AutonomousDroneController.h (deleted) * code/branches/Presentation_HS17_merge/src/orxonox/controllers/CMakeLists.txt (modified) * code/branches/Presentation_HS17_merge/src/orxonox/controllers/WaypointArrow.cc (deleted) * code/branches/Presentation_HS17_merge/src/orxonox/controllers/WaypointArrow.h (deleted) * code/branches/Presentation_HS17_merge/src/orxonox/graphics/Model.cc (modified) * code/branches/Presentation_HS17_merge/src/orxonox/worldentities/AutonomousDrone.cc (deleted) * code/branches/Presentation_HS17_merge/src/orxonox/worldentities/AutonomousDrone.h (deleted) * code/branches/Presentation_HS17_merge/src/orxonox/worldentities/CMakeLists.txt (modified) [Waypoints_HS17] removed/reverted a huge number of unwanted changes Sun, 18 Feb 2018 22:09:54 GMT landauf [11775] * code/branches/Presentation_HS17_merge/src/modules/overlays/hud/HUDWaypoints.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/overlays/hud/HUDWaypoints.h (modified) [Waypoints_HS17] fixed build Sun, 18 Feb 2018 17:42:50 GMT landauf [11774] * code/branches/Presentation_HS17_merge (modified) * code/branches/Presentation_HS17_merge/data/levels/ArrowLevel.oxw (copied) * code/branches/Presentation_HS17_merge/data/levels/emptyLevel.oxw (modified) * code/branches/Presentation_HS17_merge/data/levels/tutorial.oxw (modified) * code/branches/Presentation_HS17_merge/data/overlays/HUDTemplate_test.oxo (copied) * code/branches/Presentation_HS17_merge/src/modules/overlays/hud/CMakeLists.txt (modified) * code/branches/Presentation_HS17_merge/src/modules/overlays/hud/HUDWaypoints.cc (copied) * code/branches/Presentation_HS17_merge/src/modules/overlays/hud/HUDWaypoints.h (copied) * code/branches/Presentation_HS17_merge/src/modules/questsystem/Quest.cc (modified) * code/branches/Presentation_HS17_merge/src/orxonox/controllers/ArrowController.cc (copied) * code/branches/Presentation_HS17_merge/src/orxonox/controllers/ArrowController.h (copied) * code/branches/Presentation_HS17_merge/src/orxonox/controllers/AutonomousDroneController.cc (copied) * code/branches/Presentation_HS17_merge/src/orxonox/controllers/AutonomousDroneController.h (copied) * code/branches/Presentation_HS17_merge/src/orxonox/controllers/CMakeLists.txt (modified) * code/branches/Presentation_HS17_merge/src/orxonox/controllers/WaypointArrow.cc (copied) * code/branches/Presentation_HS17_merge/src/orxonox/controllers/WaypointArrow.h (copied) * code/branches/Presentation_HS17_merge/src/orxonox/graphics/Model.cc (modified) * code/branches/Presentation_HS17_merge/src/orxonox/worldentities/Arrow.cc (copied) * code/branches/Presentation_HS17_merge/src/orxonox/worldentities/Arrow.h (copied) * code/branches/Presentation_HS17_merge/src/orxonox/worldentities/AutonomousDrone.cc (copied) * code/branches/Presentation_HS17_merge/src/orxonox/worldentities/AutonomousDrone.h (copied) * code/branches/Presentation_HS17_merge/src/orxonox/worldentities/CMakeLists.txt (modified) merged Waypoints_HS17 Sun, 18 Feb 2018 17:21:10 GMT landauf [11773] * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOB.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOB.h (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFireball.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBQBlock.cc (modified) [SOBv2_HS17] fixed a bunch of compiler warnings (MSVC) Sun, 18 Feb 2018 16:49:32 GMT landauf [11772] * code/branches/Presentation_HS17_merge/data/levels/SOB.oxw (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOB.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFireball.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBGumba.cc (modified) [SOBv2_HS17] fixed a bunch of runtime warnings Sun, 18 Feb 2018 16:33:19 GMT landauf [11770] * code/branches/Presentation_HS17_merge/src/libraries/tools/Mesh.cc (modified) * code/branches/Presentation_HS17_merge/src/libraries/tools/Mesh.h (modified) * code/branches/Presentation_HS17_merge/src/orxonox/graphics/Model.cc (modified) * code/branches/Presentation_HS17_merge/src/orxonox/graphics/Model.h (modified) [SOBv2_HS17] some cleanup in Model/Mesh Sun, 18 Feb 2018 16:23:29 GMT landauf [11769] * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOB.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOB.h (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBCoin.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBCoin.h (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFigure.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFigure.h (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFireball.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFireball.h (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFlagstone.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBGumba.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBGumba.h (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBGumbaBoss.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBMushroom.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBMushroom.h (modified) [SOBv2_HS17] removed unused variables, added some initializations Sun, 18 Feb 2018 15:27:43 GMT landauf [11768] * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFigure.cc (modified) * code/branches/Presentation_HS17_merge/src/orxonox/Highscore.cc (modified) * code/branches/Presentation_HS17_merge/src/orxonox/Highscore.h (modified) [SOBv2_HS17] fixed build (Highscopre API has changed) Sun, 18 Feb 2018 15:10:35 GMT landauf [11767] * code/branches/Presentation_HS17_merge/BlenderFilesSOB (deleted) * code/branches/Presentation_HS17_merge/SOB.oxw (deleted) * code/branches/Presentation_HS17_merge/TRANSFER (deleted) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/Orxo.cc (deleted) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/Orxo.h (deleted) [SOBv2_HS17] removed a bunch of files that shouldn't be here Sun, 18 Feb 2018 15:02:50 GMT landauf [11766] * code/branches/Presentation_HS17_merge (modified) * code/branches/Presentation_HS17_merge/BlenderFilesSOB (copied) * code/branches/Presentation_HS17_merge/SOB.oxw (copied) * code/branches/Presentation_HS17_merge/TRANSFER (copied) * code/branches/Presentation_HS17_merge/data/levels/SOB.oxw (modified) * code/branches/Presentation_HS17_merge/src/libraries/tools/Mesh.cc (modified) * code/branches/Presentation_HS17_merge/src/libraries/tools/Mesh.h (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/CMakeLists.txt (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOB.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOB.h (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFigure.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFigure.h (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFireball.cc (copied) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFireball.h (copied) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFlagstone.h (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBGumba.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBGumba.h (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBGumbaBoss.cc (copied) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBGumbaBoss.h (copied) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBPrereqs.h (modified) * code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBQBlock.cc (modified) * code/branches/Presentation_HS17_merge/src/orxonox/graphics/Model.cc (modified) * code/branches/Presentation_HS17_merge/src/orxonox/graphics/Model.h (modified) merged SOBv2_HS17 Sun, 18 Feb 2018 00:32:05 GMT landauf [11765] * code/branches/Presentation_HS17_merge/data/levels/ProtectBoss.oxw (modified) * code/branches/Presentation_HS17_merge/data/levels/emptyLevel.oxw (modified) [ProtectBoss_HS17] fixed level and reverted unwanted changes from ... Sun, 18 Feb 2018 00:17:48 GMT landauf [11764] * code/branches/Presentation_HS17_merge (modified) * code/branches/Presentation_HS17_merge/data/levels/ProtectBoss.oxw (copied) * code/branches/Presentation_HS17_merge/data/levels/emptyLevel.oxw (modified) * code/branches/Presentation_HS17_merge/src/orxonox/controllers/DroneController.cc (modified) * code/branches/Presentation_HS17_merge/src/orxonox/worldentities/pawns/CMakeLists.txt (modified) * code/branches/Presentation_HS17_merge/src/orxonox/worldentities/pawns/ShootableObstacle.cc (copied) * code/branches/Presentation_HS17_merge/src/orxonox/worldentities/pawns/ShootableObstacle.h (copied) merged ProtectBoss_HS17 Sun, 18 Feb 2018 00:13:20 GMT landauf [11763] * code/branches/Presentation_HS17_merge/data/levels/FlappyOrx.oxw (modified) * code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrx.cc (modified) [FlappyOrx_HS17] found better solution to avoid warning when loading ... Sun, 18 Feb 2018 00:02:47 GMT landauf [11762] * code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrx.cc (modified) [FlappyOrx_HS17] bugfix: always check for queue size before accessing ... Sat, 17 Feb 2018 23:50:22 GMT landauf [11761] * code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrxShip.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrxShip.h (modified) [FlappyOrx_HS17] bugfix: velocity was never initialized (expecially ... Sat, 17 Feb 2018 22:50:25 GMT landauf [11760] * code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrx.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrx.h (modified) * code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrxHUDinfo.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrxHUDinfo.h (modified) [FlappyOrx_HS17] some cleanup Sat, 17 Feb 2018 22:43:12 GMT landauf [11759] * code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrx.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrxHUDinfo.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrxShip.cc (modified) [FlappyOrx_HS17] initialize all variables Sat, 17 Feb 2018 22:36:30 GMT landauf [11758] * code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrx.h (modified) * code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrxHUDinfo.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrxHUDinfo.h (modified) * code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrxShip.h (modified) [FlappyOrx_HS17] removed unused variables Sat, 17 Feb 2018 22:06:06 GMT landauf [11757] * code/branches/Presentation_HS17_merge/data/levels/FlappyOrx.oxw (modified) * code/branches/Presentation_HS17_merge/src/modules/flappyorx/CMakeLists.txt (modified) * code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrx.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrx.h (modified) * code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrxCenterPoint.cc (deleted) * code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrxCenterPoint.h (deleted) * code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrxPrereqs.h (modified) [FlappyOrx_HS17] removed FlappyOrxCenterPoint, it doesn't seem to be ... Sat, 17 Feb 2018 21:54:16 GMT landauf [11756] * code/branches/Presentation_HS17_merge/data/levels/FlappyOrx.oxw (modified) [FlappyOrx_HS17] avoid warning when loading level Thu, 15 Feb 2018 23:37:37 GMT landauf [11755] * code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrx.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrx.h (modified) * code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrxHUDinfo.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrxShip.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrxShip.h (modified) [FlappyOrx_HS17] fixed some warnings (MSVC) Thu, 15 Feb 2018 22:42:36 GMT landauf [11754] * code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrx.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrxShip.cc (modified) [FlappyOrx_HS17] fixed build (Highscopre API has changed; usleep is ... Thu, 15 Feb 2018 22:36:40 GMT landauf [11753] * code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrxPrereqs.h (modified) [FlappyOrx_HS17] fixed dll linkage for MSVC Thu, 15 Feb 2018 22:32:36 GMT landauf [11752] * code/branches/Presentation_HS17_merge (modified) * code/branches/Presentation_HS17_merge/data/levels/FlappyOrx.oxw (copied) * code/branches/Presentation_HS17_merge/data/levels/templates/enemyFlappyOrx.oxt (copied) * code/branches/Presentation_HS17_merge/data/levels/templates/spaceshipFlappyOrx.oxt (copied) * code/branches/Presentation_HS17_merge/data/overlays/FlappyOrxHUD.oxo (copied) * code/branches/Presentation_HS17_merge/data/particle/fire3.particle (modified) * code/branches/Presentation_HS17_merge/src/modules/CMakeLists.txt (modified) * code/branches/Presentation_HS17_merge/src/modules/flappyorx (copied) merged FlappyOrx_HS17 Thu, 15 Feb 2018 22:29:31 GMT landauf [11751] * code/branches/Presentation_HS17_merge/data/gui/layouts/Dialog.layout (modified) * code/branches/Presentation_HS17_merge/src/modules/dialog/DialogManager.cc (modified) [Dialog_HS17] details Thu, 15 Feb 2018 22:18:38 GMT landauf [11750] * code/branches/Presentation_HS17_merge/src/modules/dialog/Dialog.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/dialog/Dialog.h (modified) * code/branches/Presentation_HS17_merge/src/modules/dialog/DialogManager.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/dialog/Question.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/dialog/Question.h (modified) [Dialog_HS17] cleanup XMLPort collection getters Thu, 15 Feb 2018 21:42:30 GMT landauf [11749] * code/branches/Presentation_HS17_merge/src/modules/dialog/Answer.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/dialog/Answer.h (modified) * code/branches/Presentation_HS17_merge/src/modules/dialog/AnswerId.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/dialog/AnswerId.h (modified) * code/branches/Presentation_HS17_merge/src/modules/dialog/Dialog.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/dialog/Dialog.h (modified) * code/branches/Presentation_HS17_merge/src/modules/dialog/DialogManager.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/dialog/DialogManager.h (modified) * code/branches/Presentation_HS17_merge/src/modules/dialog/Question.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/dialog/Question.h (modified) [Dialog_HS17] added license text Thu, 15 Feb 2018 21:36:32 GMT landauf [11748] * code/branches/Presentation_HS17_merge/src/modules/dialog/AnswerId.h (modified) * code/branches/Presentation_HS17_merge/src/modules/dialog/DialogManager.h (modified) * code/branches/Presentation_HS17_merge/src/modules/dialog/DialogPrereqs.h (modified) [Dialog_HS17] fixed dll linkage for MSVC Thu, 15 Feb 2018 21:28:52 GMT landauf [11747] * code/branches/Presentation_HS17_merge (modified) * code/branches/Presentation_HS17_merge/data/gui/layouts/Dialog.layout (copied) * code/branches/Presentation_HS17_merge/data/gui/layouts/Dialogue.layout (deleted) * code/branches/Presentation_HS17_merge/data/gui/scripts/Dialog.lua (copied) * code/branches/Presentation_HS17_merge/data/gui/scripts/Dialogue.lua (deleted) * code/branches/Presentation_HS17_merge/data/levels/DialogShowcase.oxw (copied) * code/branches/Presentation_HS17_merge/data/levels/DialogueShowcase.oxw (deleted) * code/branches/Presentation_HS17_merge/data/overlays/HUDTemplates3.oxo (modified) * code/branches/Presentation_HS17_merge/src/modules/CMakeLists.txt (modified) * code/branches/Presentation_HS17_merge/src/modules/dialog (copied) * code/branches/Presentation_HS17_merge/src/modules/dialogue (deleted) merged Dialog_HS17 Wed, 14 Feb 2018 23:11:35 GMT landauf [11746] * code/branches/Presentation_HS17_merge/data/overlays/HUDTemplatesFPS.oxo (modified) * code/branches/Presentation_HS17_merge/src/orxonox/OrxonoxPrereqs.h (modified) * code/branches/Presentation_HS17_merge/src/orxonox/controllers/HumanController.h (modified) * code/branches/Presentation_HS17_merge/src/orxonox/interfaces/RadarViewable.h (modified) removed some more occurrences of "Map" (a class that doesn't seem to ... Wed, 14 Feb 2018 23:11:04 GMT landauf [11745] * code/branches/Presentation_HS17_merge/src/modules/overlays/hud/StoryModeHUD.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/overlays/hud/StoryModeHUD.h (modified) * code/branches/Presentation_HS17_merge/src/orxonox/worldentities/NameableStaticEntity.h (modified) * code/branches/Presentation_HS17_merge/src/orxonox/worldentities/pawns/StoryModePawn.cc (modified) * code/branches/Presentation_HS17_merge/src/orxonox/worldentities/pawns/StoryModePawn.h (modified) [CampaignMap_HS17] some cleanup Wed, 14 Feb 2018 22:44:50 GMT landauf [11744] * code/branches/Presentation_HS17_merge/data/levels/NC_StoryModeLevel (deleted) * code/branches/Presentation_HS17_merge/src/orxonox/gametypes/StoryMode.cc (modified) * code/branches/Presentation_HS17_merge/src/orxonox/gametypes/StoryMode.h (modified) * code/branches/Presentation_HS17_merge/src/orxonox/infos/Bot.cc (modified) * code/branches/Presentation_HS17_merge/svn-commit.tmp (deleted) [CampaignMap_HS17] reverted some unwanted changes Wed, 14 Feb 2018 22:31:43 GMT landauf [11743] * code/branches/Presentation_HS17_merge (modified) * code/branches/Presentation_HS17_merge/data/levels/NC_StoryModeLevel (copied) * code/branches/Presentation_HS17_merge/data/levels/NC_StoryModeLevel.oxw (copied) * code/branches/Presentation_HS17_merge/data/levels/templates/StoryModeEscort.oxt (copied) * code/branches/Presentation_HS17_merge/data/overlays/HUDTemplates3.oxo (modified) * code/branches/Presentation_HS17_merge/data/overlays/StoryModeHUD.oxo (modified) * code/branches/Presentation_HS17_merge/data/overlays/StoryModeHUD2.oxo (copied) * code/branches/Presentation_HS17_merge/src/modules/overlays/hud/CMakeLists.txt (modified) * code/branches/Presentation_HS17_merge/src/modules/overlays/hud/StoryModeHUD.cc (copied) * code/branches/Presentation_HS17_merge/src/modules/overlays/hud/StoryModeHUD.h (copied) * code/branches/Presentation_HS17_merge/src/orxonox/gametypes/StoryMode.cc (modified) * code/branches/Presentation_HS17_merge/src/orxonox/gametypes/StoryMode.h (modified) * code/branches/Presentation_HS17_merge/src/orxonox/infos/Bot.cc (modified) * code/branches/Presentation_HS17_merge/src/orxonox/worldentities/CMakeLists.txt (modified) * code/branches/Presentation_HS17_merge/src/orxonox/worldentities/NameableStaticEntity.cc (copied) * code/branches/Presentation_HS17_merge/src/orxonox/worldentities/NameableStaticEntity.h (copied) * code/branches/Presentation_HS17_merge/src/orxonox/worldentities/pawns/CMakeLists.txt (modified) * code/branches/Presentation_HS17_merge/src/orxonox/worldentities/pawns/StoryModePawn.cc (copied) * code/branches/Presentation_HS17_merge/src/orxonox/worldentities/pawns/StoryModePawn.h (copied) * code/branches/Presentation_HS17_merge/svn-commit.tmp (copied) merged CampaignMap_HS17 Sun, 11 Feb 2018 23:24:38 GMT landauf [11742] * code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DStone.cc (modified) [Asteroid_HS17] use enum instead of string Sun, 11 Feb 2018 23:24:13 GMT landauf [11741] * code/branches/Presentation_HS17_merge/src/modules/asteroidmining/AsteroidMinable.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/asteroidmining/AsteroidMinable.h (modified) * code/branches/Presentation_HS17_merge/src/modules/asteroidmining/SpicedAsteroidBelt.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/asteroidmining/SpicedAsteroidBelt.h (modified) * code/branches/Presentation_HS17_merge/src/modules/asteroidmining/SpicedAsteroidField.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/asteroidmining/SpicedAsteroidField.h (modified) [AsteroidMining_HS17] fixed author Sun, 11 Feb 2018 23:20:18 GMT landauf [11740] * code/branches/Presentation_HS17_merge/src/modules/asteroidmining/SpicedAsteroidBelt.cc (modified) [AsteroidMining_HS17] use existing definitions of pi and abs Sun, 11 Feb 2018 23:17:34 GMT landauf [11739] * code/branches/Presentation_HS17_merge/src/modules/asteroidmining/AsteroidMinable.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/asteroidmining/AsteroidMinable.h (modified) * code/branches/Presentation_HS17_merge/src/modules/asteroidmining/SpicedAsteroidBelt.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/asteroidmining/SpicedAsteroidBelt.h (modified) * code/branches/Presentation_HS17_merge/src/modules/asteroidmining/SpicedAsteroidField.cc (modified) * code/branches/Presentation_HS17_merge/src/modules/asteroidmining/SpicedAsteroidField.h (modified) [AsteroidMining_HS17] fixed a bunch of compiler warnings Sun, 11 Feb 2018 22:31:58 GMT landauf [11738] * code/branches/Presentation_HS17_merge/src/modules/asteroidmining/AsteroidMinable.cc (modified) [AsteroidMining_HS17] fixed two buffer overflows that caused random ...