# # ChangeLog for code/branches # # Generated by Trac 1.0.9 # May 5, 2024, 12:25:58 PM Sun, 12 Apr 2015 21:07:14 GMT landauf [10362] * code/branches/core7/src/libraries/core/Core.cc (modified) * code/branches/core7/src/libraries/core/CoreIncludes.h (modified) * code/branches/core7/src/libraries/core/ViewportEventListener.cc (modified) * code/branches/core7/src/libraries/core/WindowEventListener.cc (modified) * code/branches/core7/src/libraries/core/XMLNameListener.cc (modified) * code/branches/core7/src/libraries/network/ClientConnectionListener.cc (modified) * code/branches/core7/src/libraries/network/NetworkFunction.cc (modified) * code/branches/core7/src/libraries/network/synchronisable/Synchronisable.cc (modified) * code/branches/core7/src/libraries/tools/interfaces/ToolsInterfaceCompilation.cc (modified) * code/branches/core7/src/modules/docking/DockingAnimation.cc (modified) * code/branches/core7/src/modules/docking/DockingEffect.cc (modified) * code/branches/core7/src/modules/objects/collisionshapes/AbstractRadiusHeightCollisionShape.cc (modified) * code/branches/core7/src/modules/pickup/CollectiblePickup.cc (modified) * code/branches/core7/src/modules/questsystem/Quest.cc (modified) * code/branches/core7/src/modules/questsystem/QuestEffect.cc (modified) * code/branches/core7/src/modules/questsystem/effects/ChangeQuestStatus.cc (modified) * code/branches/core7/src/orxonox/chat/ChatManager.cc (modified) * code/branches/core7/src/orxonox/collisionshapes/CollisionShape.cc (modified) * code/branches/core7/src/orxonox/gamestates/GSLevel.cc (modified) * code/branches/core7/src/orxonox/infos/PlayerInfo.cc (modified) * code/branches/core7/src/orxonox/interfaces/InterfaceCompilation.cc (modified) * code/branches/core7/src/orxonox/interfaces/PickupCarrier.cc (modified) * code/branches/core7/src/orxonox/interfaces/Pickupable.cc (modified) * code/branches/core7/src/orxonox/interfaces/RadarViewable.cc (modified) * code/branches/core7/src/orxonox/sound/BaseSound.cc (modified) * code/branches/core7/src/orxonox/weaponsystem/WeaponMode.cc (modified) * code/branches/core7/src/orxonox/worldentities/WorldEntity.cc (modified) use static identifier initializer to store the inheritance definition ... Sun, 12 Apr 2015 21:05:10 GMT landauf [10361] * code/branches/core7/src/libraries/core/class/Identifier.h (modified) * code/branches/core7/src/libraries/core/class/IdentifierManager.cc (modified) * code/branches/core7/src/libraries/core/class/IdentifierManager.h (modified) added run-time check for class hierarchy Sun, 12 Apr 2015 19:41:22 GMT landauf [10360] * code/branches/core7/src/libraries/core/CoreIncludes.h (modified) * code/branches/core7/test/core/class/IdentifierClassHierarchyTest.cc (modified) * code/branches/core7/test/core/class/IdentifierExternalClassHierarchyTest.cc (modified) * code/branches/core7/test/core/class/IdentifierSimpleClassHierarchyTest.cc (modified) wrap Identifiers in a StaticallyInitializedInstance. doesn't do a lot ... Sun, 12 Apr 2015 13:28:15 GMT landauf [10359] * code/branches/core7/test/core/object/SmartPtrTest.cc (modified) * code/branches/core7/test/core/object/WeakPtrTest.cc (modified) added tests Sun, 12 Apr 2015 13:27:09 GMT landauf [10358] * code/branches/core7/src/libraries/core/BaseObject.cc (modified) * code/branches/core7/src/libraries/core/object/SmartPtr.h (modified) * code/branches/core7/src/libraries/core/object/WeakPtr.h (modified) removed int constructor & assignment-operator from WeakPtr and SmartPtr Sun, 12 Apr 2015 09:58:06 GMT landauf [10357] * code/branches/core7/src/modules/dodgerace/DodgeRace.cc (modified) * code/branches/core7/src/modules/dodgerace/DodgeRace.h (modified) * code/branches/core7/src/modules/dodgerace/DodgeRaceCube.cc (modified) * code/branches/core7/src/modules/dodgerace/DodgeRaceShip.cc (modified) * code/branches/core7/src/modules/dodgerace/DodgeRaceShip.h (modified) * code/branches/core7/src/modules/towerdefense/TDCoordinate.h (modified) don't include CoreIncludes.h in *.h files Sat, 11 Apr 2015 21:21:56 GMT landauf [10356] * code/branches/core7/test/core/command/CommandTest.cc (modified) fixed test Sat, 11 Apr 2015 20:46:40 GMT landauf [10355] * code/branches/core7/src/libraries/core/command/CommandExecutor.cc (modified) don't forget to register new commands (fixes 'alias' command) Sat, 11 Apr 2015 20:36:15 GMT landauf [10354] * code/branches/core7/src/libraries/core/command/ConsoleCommandIncludes.cc (modified) * code/branches/core7/src/libraries/core/command/ConsoleCommandManager.cc (modified) * code/branches/core7/src/libraries/core/command/ConsoleCommandManager.h (modified) moved code from static initializer into new function in ... Wed, 08 Apr 2015 21:15:43 GMT landauf [10353] * code/branches/core7/src/libraries/core/commandline/CommandLineIncludes.h (modified) detail Wed, 08 Apr 2015 21:15:11 GMT landauf [10352] * code/branches/core7/src/libraries/core/Core.cc (modified) * code/branches/core7/src/libraries/core/command/CMakeLists.txt (modified) * code/branches/core7/src/libraries/core/command/ConsoleCommand.cc (modified) * code/branches/core7/src/libraries/core/command/ConsoleCommand.h (modified) * code/branches/core7/src/libraries/core/command/ConsoleCommandIncludes.cc (added) * code/branches/core7/src/libraries/core/command/ConsoleCommandIncludes.h (modified) wrap ConsoleCommands in StaticallyInitializedInstances Tue, 07 Apr 2015 20:12:07 GMT landauf [10351] * code/branches/towerdefenseFS15 (modified) * code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefense.cc (modified) * code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefense.h (modified) using the 'official' way to define a non-static console command Mon, 06 Apr 2015 20:40:54 GMT landauf [10350] * code/branches/core7/src/modules/towerdefense/TowerDefense.cc (modified) * code/branches/core7/src/modules/towerdefense/TowerDefense.h (modified) removed hack Mon, 06 Apr 2015 20:18:25 GMT landauf [10349] * code/branches/core7/src/orxonox/controllers/HumanController.cc (modified) * code/branches/core7/src/orxonox/controllers/HumanController.h (modified) * code/branches/core7/src/orxonox/gametypes/Gametype.cc (modified) * code/branches/core7/src/orxonox/gametypes/Gametype.h (modified) removed hack. addBots/killBots is now part of Gametype Mon, 06 Apr 2015 20:00:37 GMT landauf [10348] * code/branches/core7/src/libraries/core/command/CommandExecutor.cc (modified) * code/branches/core7/src/libraries/core/command/ConsoleCommand.cc (modified) * code/branches/core7/src/libraries/core/command/ConsoleCommand.h (modified) * code/branches/core7/src/libraries/core/command/ConsoleCommandIncludes.h (modified) * code/branches/core7/src/modules/towerdefense/TowerDefense.cc (modified) * code/branches/core7/src/orxonox/gametypes/Gametype.cc (modified) removed unnecessary helper functions Mon, 06 Apr 2015 13:47:42 GMT landauf [10347] * code/branches/core7/src/libraries/core/Core.cc (modified) * code/branches/core7/src/libraries/core/GUIManager.cc (modified) * code/branches/core7/src/libraries/core/Game.cc (modified) * code/branches/core7/src/libraries/core/GraphicsManager.cc (modified) * code/branches/core7/src/libraries/core/command/ArgumentCompletionFunctions.cc (modified) * code/branches/core7/src/libraries/core/command/CommandEvaluation.cc (modified) * code/branches/core7/src/libraries/core/command/CommandExecutor.cc (modified) * code/branches/core7/src/libraries/core/command/ConsoleCommand.cc (modified) * code/branches/core7/src/libraries/core/command/ConsoleCommand.h (modified) * code/branches/core7/src/libraries/core/command/ConsoleCommandCompilation.cc (modified) * code/branches/core7/src/libraries/core/command/ConsoleCommandIncludes.h (added) * code/branches/core7/src/libraries/core/command/IRC.cc (modified) * code/branches/core7/src/libraries/core/command/TclBind.cc (modified) * code/branches/core7/src/libraries/core/command/TclThreadManager.cc (modified) * code/branches/core7/src/libraries/core/config/SettingsConfigFile.cc (modified) * code/branches/core7/src/libraries/core/input/InputManager.cc (modified) * code/branches/core7/src/libraries/core/input/KeyBinderManager.cc (modified) * code/branches/core7/src/libraries/core/input/KeyDetector.cc (modified) * code/branches/core7/src/libraries/core/input/Mouse.cc (modified) * code/branches/core7/src/libraries/network/Host.cc (modified) * code/branches/core7/src/libraries/network/MasterServer.cc (modified) * code/branches/core7/src/libraries/tools/Timer.cc (modified) * code/branches/core7/src/modules/designtools/ScreenshotManager.cc (modified) * code/branches/core7/src/modules/designtools/SkyboxGenerator.cc (modified) * code/branches/core7/src/modules/docking/Dock.cc (modified) * code/branches/core7/src/modules/mini4dgame/Mini4Dgame.cc (modified) * code/branches/core7/src/modules/objects/triggers/Trigger.cc (modified) * code/branches/core7/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/branches/core7/src/modules/towerdefense/TowerDefense.cc (modified) * code/branches/core7/src/orxonox/Scene.cc (modified) * code/branches/core7/src/orxonox/Test.cc (modified) * code/branches/core7/src/orxonox/chat/ChatInputHandler.cc (modified) * code/branches/core7/src/orxonox/chat/ChatManager.cc (modified) * code/branches/core7/src/orxonox/controllers/ArtificialController.cc (modified) * code/branches/core7/src/orxonox/controllers/FormationController.cc (modified) * code/branches/core7/src/orxonox/controllers/HumanController.cc (modified) * code/branches/core7/src/orxonox/controllers/NewHumanController.cc (modified) * code/branches/core7/src/orxonox/gamestates/GSLevel.cc (modified) * code/branches/core7/src/orxonox/gamestates/GSMainMenu.cc (modified) * code/branches/core7/src/orxonox/gamestates/GSRoot.cc (modified) * code/branches/core7/src/orxonox/gametypes/Gametype.cc (modified) * code/branches/core7/src/orxonox/gametypes/Mission.cc (modified) * code/branches/core7/src/orxonox/overlays/InGameConsole.cc (modified) * code/branches/core7/src/orxonox/overlays/OrxonoxOverlay.cc (modified) * code/branches/core7/src/orxonox/overlays/OverlayGroup.cc (modified) * code/branches/core7/src/orxonox/sound/WorldAmbientSound.cc (modified) * code/branches/core7/src/orxonox/worldentities/pawns/ModularSpaceShip.cc (modified) * code/branches/core7/src/orxonox/worldentities/pawns/Spectator.cc (modified) * code/branches/core7/test/core/command/CommandTest.cc (modified) moved console command macros to a new file (ConsoleCommandIncludes.h) Sun, 05 Apr 2015 18:25:11 GMT landauf [10346] * code/branches/core7/src/libraries/core/Core.cc (modified) * code/branches/core7/src/libraries/core/CorePrereqs.h (modified) * code/branches/core7/src/libraries/core/command/ArgumentCompletionFunctions.cc (modified) * code/branches/core7/src/libraries/core/command/CMakeLists.txt (modified) * code/branches/core7/src/libraries/core/command/CommandEvaluation.cc (modified) * code/branches/core7/src/libraries/core/command/CommandExecutor.cc (modified) * code/branches/core7/src/libraries/core/command/ConsoleCommand.cc (modified) * code/branches/core7/src/libraries/core/command/ConsoleCommand.h (modified) * code/branches/core7/src/libraries/core/command/ConsoleCommandManager.cc (added) * code/branches/core7/src/libraries/core/command/ConsoleCommandManager.h (added) moved static contents from ConsoleCommand to ConsoleCommandManager Sun, 05 Apr 2015 15:32:40 GMT landauf [10345] * code/branches/core7/src/libraries/core/Core.cc (modified) * code/branches/core7/src/libraries/core/PathConfig.cc (modified) * code/branches/core7/src/libraries/core/commandline/CommandLineIncludes.h (added) * code/branches/core7/src/libraries/core/commandline/CommandLineParser.cc (modified) * code/branches/core7/src/libraries/core/commandline/CommandLineParser.h (modified) * code/branches/core7/src/libraries/core/input/InputManager.cc (modified) * code/branches/core7/src/orxonox/LevelManager.cc (modified) * code/branches/core7/src/orxonox/Main.cc (modified) * code/branches/core7/src/orxonox/gamestates/GSClient.cc (modified) * code/branches/core7/src/orxonox/gamestates/GSServer.cc (modified) wrap CommandLineArguments in StaticallyInitializedInstances Sun, 05 Apr 2015 15:29:21 GMT landauf [10344] * code/branches/core7/src/libraries/core/module/ModuleInstance.cc (modified) * code/branches/core7/src/libraries/core/module/ModuleInstance.h (modified) * code/branches/core7/src/libraries/core/module/StaticallyInitializedInstance.cc (modified) * code/branches/core7/src/libraries/core/module/StaticallyInitializedInstance.h (modified) remove and destroy StaticallyInitializedInstances Sat, 04 Apr 2015 11:34:39 GMT landauf [10343] * code/branches/core7/src/libraries/core/CMakeLists.txt (modified) * code/branches/core7/src/libraries/core/Core.cc (modified) * code/branches/core7/src/libraries/core/Game.cc (modified) * code/branches/core7/src/libraries/core/PathConfig.cc (modified) * code/branches/core7/src/libraries/core/commandline (added) * code/branches/core7/src/libraries/core/commandline/CMakeLists.txt (added) * code/branches/core7/src/libraries/core/commandline/CommandLineParser.cc (moved) * code/branches/core7/src/libraries/core/commandline/CommandLineParser.h (moved) * code/branches/core7/src/libraries/core/config/CMakeLists.txt (modified) * code/branches/core7/src/libraries/core/input/InputManager.cc (modified) * code/branches/core7/src/libraries/network/Client.cc (modified) * code/branches/core7/src/orxonox/LevelManager.cc (modified) * code/branches/core7/src/orxonox/Main.cc (modified) * code/branches/core7/src/orxonox/gamestates/GSClient.cc (modified) * code/branches/core7/src/orxonox/gamestates/GSServer.cc (modified) moved CommandLineParser into separate subfolder Sat, 04 Apr 2015 11:24:49 GMT landauf [10342] * code/branches/core7/src/libraries/core/CMakeLists.txt (modified) * code/branches/core7/src/libraries/core/Core.cc (modified) * code/branches/core7/src/libraries/core/CorePrereqs.h (modified) * code/branches/core7/src/libraries/core/module (added) * code/branches/core7/src/libraries/core/module/CMakeLists.txt (added) * code/branches/core7/src/libraries/core/module/ModuleInstance.cc (added) * code/branches/core7/src/libraries/core/module/ModuleInstance.h (added) * code/branches/core7/src/libraries/core/module/StaticallyInitializedInstance.cc (added) * code/branches/core7/src/libraries/core/module/StaticallyInitializedInstance.h (added) added helper class for module initialization Thu, 02 Apr 2015 14:08:52 GMT meggiman [10341] * code/branches/weaponFS15/src/modules/objects/ForceField.h (modified) * code/branches/weaponFS15/src/modules/weapons/projectiles/CMakeLists.txt (modified) * code/branches/weaponFS15/src/modules/weapons/projectiles/GravityBomb.cc (modified) * code/branches/weaponFS15/src/modules/weapons/projectiles/GravityBomb.h (modified) * code/branches/weaponFS15/src/modules/weapons/projectiles/GravityBombField.cc (added) * code/branches/weaponFS15/src/modules/weapons/projectiles/GravityBombField.h (added) Started implementing GravityBombField Thu, 02 Apr 2015 13:57:34 GMT erbj [10340] * code/branches/towerdefenseFS15/data/levels/templates/towerdefensetower.oxt (modified) * code/branches/towerdefenseFS15/src/modules/objects/Turret.cc (modified) * code/branches/towerdefenseFS15/src/modules/objects/Turret.h (modified) * code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefense.cc (modified) * code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefense.h (modified) * code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefenseEnemy.cc (modified) * code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefenseTower.cc (modified) Tower upgrade now implemented and towers are now saved in the ... Thu, 26 Mar 2015 15:14:43 GMT meggiman [10336] * code/branches/weaponFS15/src/modules/weapons/WeaponsPrereqs.h (modified) * code/branches/weaponFS15/src/modules/weapons/projectiles/CMakeLists.txt (modified) * code/branches/weaponFS15/src/modules/weapons/projectiles/GravityBomb.cc (added) * code/branches/weaponFS15/src/modules/weapons/projectiles/GravityBomb.h (modified) Started implementing GravityBomb.cc Thu, 26 Mar 2015 14:26:26 GMT erbj [10335] * code/branches/towerdefenseFS15/data/levels/templates/enemytowerdefense.oxt (modified) * code/branches/towerdefenseFS15/data/levels/templates/towerdefensetower.oxt (modified) * code/branches/towerdefenseFS15/data/levels/towerDefense.oxw (modified) * code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefense.cc (modified) * code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefenseTower.cc (modified) * code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefenseTower.h (modified) * code/branches/towerdefenseFS15/src/orxonox/controllers/FormationController.cc (modified) tower don't shoot at the centerpoint anymore(because we shifted it by ... Thu, 26 Mar 2015 12:38:24 GMT frovelli [10334] * code/branches/multiplayerFS15/data/gui/scripts/MultiplayerMenu.lua (modified) * code/branches/multiplayerFS15/src/libraries/network/LANDiscovery.cc (modified) * code/branches/multiplayerFS15/src/libraries/network/LANDiscovery.h (modified) * code/branches/multiplayerFS15/src/libraries/network/ServerList.cc (modified) * code/branches/multiplayerFS15/src/libraries/network/packet/ServerInformation.cc (modified) * code/branches/multiplayerFS15/src/libraries/network/packet/ServerInformation.h (modified) Added serverlist ping display in LAN Sun, 22 Mar 2015 21:00:03 GMT landauf [10328] * code/branches/core7 (copied) created branch to work on new core features Sun, 22 Mar 2015 20:59:36 GMT landauf [10327] * code/branches/core7 (deleted) re-creating branch... Thu, 19 Mar 2015 15:05:10 GMT meggiman [10326] * code/branches/weaponFS15/data/levels/includes/weaponSettingsAssff.oxi (modified) * code/branches/weaponFS15/src/modules/weapons/projectiles/GravityBomb.h (added) * code/branches/weaponFS15/src/modules/weapons/weaponmodes/GravityBombFire.h (added) Created header files for new classes GravityBombFire and GravityBomb Thu, 19 Mar 2015 14:59:26 GMT erbj [10325] * code/branches/towerdefenseFS15/data/levels/templates/tower.oxt (deleted) * code/branches/towerdefenseFS15/data/levels/templates/towerdefensetower.oxt (added) * code/branches/towerdefenseFS15/data/levels/towerDefense.oxw (modified) * code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefense.cc (modified) * code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefenseCenterpoint.cc (modified) * code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefenseCenterpoint.h (modified) * code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefenseTower.cc (modified) tower templates verwaltet und tower direkt turret, nicht eigenes objekt Thu, 19 Mar 2015 14:49:23 GMT maxima [10324] * code/branches/multiplayerFS15 (copied) new branch Thu, 19 Mar 2015 13:30:34 GMT sborghi [10321] * code/branches/formationFS15/data/levels/sborghi.oxw (added) New Level File Thu, 19 Mar 2015 13:11:10 GMT maxima [10320] * code/branches/formationFS15 (copied) new branch for sborghi Thu, 19 Mar 2015 12:31:54 GMT erbj [10319] * code/branches/towerdefenseFS15/src/modules/towerdefense/CMakeLists.txt (modified) * code/branches/towerdefenseFS15/src/modules/towerdefense/Tower.cc (deleted) * code/branches/towerdefenseFS15/src/modules/towerdefense/Tower.h (deleted) * code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefense.cc (modified) * code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefenseTower.cc (modified) * code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefenseTower.h (modified) * code/branches/towerdefenseFS15/src/modules/towerdefense/TowerTurret.cc (deleted) * code/branches/towerdefenseFS15/src/modules/towerdefense/TowerTurret.h (deleted) tower now inherits from turret Thu, 12 Mar 2015 14:56:09 GMT rgraczyk [10315] * code/branches/SciptableControllerFS15/src/orxonox/controllers/ScriptController.h (modified) Added some comments Thu, 12 Mar 2015 14:08:44 GMT maxima [10312] * code/branches/tuandreFS15 (copied) new branch for andrea Thu, 12 Mar 2015 13:32:47 GMT maxima [10309] * code/branches/ParticleEffectsFS15 (copied) new branch for PPS Thu, 12 Mar 2015 13:19:18 GMT maxima [10308] * code/branches/SciptableControllerFS15 (copied) new branch for PPS Thu, 12 Mar 2015 12:59:34 GMT maxima [10302] * code/branches/weaponFS15 (copied) new branch for meggiman Sat, 28 Feb 2015 10:08:41 GMT landauf [10285] * code/branches/core7 (copied) created branch to work on new core features Thu, 26 Feb 2015 12:12:53 GMT maxima [10283] * code/branches/towerdefenseFS15 (copied) New Branch for PPS FS15. Thu, 26 Feb 2015 11:37:54 GMT maxima [10282] * code/branches/tutorial5/data/levels/tutorial.oxw (modified) * code/branches/tutorial5/doc/api/doxy.config.in (modified) * code/branches/tutorial5/src/orxonox/controllers/AutonomousDroneController.cc (added) * code/branches/tutorial5/src/orxonox/controllers/AutonomousDroneController.h (added) * code/branches/tutorial5/src/orxonox/worldentities/AutonomousDrone.cc (added) * code/branches/tutorial5/src/orxonox/worldentities/AutonomousDrone.h (added) AutonomousDrone files for Tutorial Thu, 19 Feb 2015 11:39:06 GMT maxima [10280] * code/branches/tutorial5 (modified) * code/branches/tutorial5/src/libraries/core/GUIManager.cc (modified) * code/branches/tutorial5/src/libraries/core/Loader.cc (modified) * code/branches/tutorial5/src/libraries/tools/BulletDebugDrawer.cc (modified) * code/branches/tutorial5/src/libraries/tools/BulletDebugDrawer.h (modified) Trunk(-r10279) merged to tutorial branch. Works now on ITET-Tardis. Wed, 18 Feb 2015 09:48:08 GMT maxima [10276] * code/branches/tutorial5 (copied) Copy of the trunk for the PPS Tutorial Mon, 16 Feb 2015 21:23:52 GMT landauf [10275] * code/branches/hudHS14 (deleted) * code/branches/keckslevelHS14 (deleted) * code/branches/leveljoemeHS14 (deleted) * code/branches/minigame4DHS14 (deleted) * code/branches/pickupsFS14 (deleted) * code/branches/presentationHS14 (deleted) * code/branches/presentationHS14merge (deleted) * code/branches/storymodeHS14 (deleted) * code/branches/surfaceraceHS14 (deleted) * code/branches/towerdefenseHS14 (deleted) * code/branches/weaponupdateHS14 (deleted) removed old branches Thu, 05 Feb 2015 22:43:24 GMT landauf [10257] * code/branches/presentationHS14merge/data/levels/kecks.oxw (modified) fixed tag Thu, 05 Feb 2015 22:21:35 GMT landauf [10256] * code/branches/presentationHS14merge/src/modules/mini4dgame/Mini4DgamePrereqs.h (modified) * code/branches/presentationHS14merge/src/modules/towerdefense/TowerDefenseEnemy.cc (modified) * code/branches/presentationHS14merge/src/modules/towerdefense/TowerDefenseEnemy.h (modified) found some hidden changes in a merge commit in presentationHS14 and ... Wed, 04 Feb 2015 21:21:28 GMT landauf [10255] * code/branches/presentationHS14merge (modified) * code/branches/presentationHS14merge/cmake/LibraryConfig.cmake (modified) * code/branches/presentationHS14merge/data/defaultConfig/orxonox.ini (copied) * code/branches/presentationHS14merge/data/gui/layouts/CampaignMenu.layout (copied) * code/branches/presentationHS14merge/data/gui/layouts/SingleplayerMenu.layout (modified) * code/branches/presentationHS14merge/data/gui/scripts/CampaignMenu.lua (copied) * code/branches/presentationHS14merge/data/gui/scripts/SingleplayerMenu.lua (modified) * code/branches/presentationHS14merge/src/orxonox/LevelManager.cc (modified) * code/branches/presentationHS14merge/src/orxonox/LevelManager.h (modified) * code/branches/presentationHS14merge/src/orxonox/gametypes/Mission.cc (modified) merged storymodeHS14 Tue, 03 Feb 2015 22:43:42 GMT landauf [10254] * code/branches/storymodeHS14/data/gui/scripts/SingleplayerMenu.lua (modified) * code/branches/storymodeHS14/src/orxonox/gametypes/Mission.cc (modified) cleanup Tue, 03 Feb 2015 22:38:07 GMT landauf [10253] * code/branches/storymodeHS14/data/defaultConfig/orxonox.ini (added) * code/branches/storymodeHS14/data/gui/layouts/CampaignMenu.layout (modified) * code/branches/storymodeHS14/data/gui/scripts/CampaignMenu.lua (modified) * code/branches/storymodeHS14/data/tcl (modified) * code/branches/storymodeHS14/src/orxonox/LevelManager.cc (modified) * code/branches/storymodeHS14/src/orxonox/LevelManager.h (modified) * code/branches/storymodeHS14/src/orxonox/gametypes/Mission.cc (modified) improved campaign mode. use config value instead of writing a new ... Sun, 01 Feb 2015 22:46:42 GMT landauf [10251] * code/branches/storymodeHS14/data/gui/scripts/CampaignMenu.lua (modified) * code/branches/storymodeHS14/data/tcl (modified) * code/branches/storymodeHS14/src/orxonox/gametypes/Mission.cc (modified) use relative path Sun, 01 Feb 2015 21:51:47 GMT landauf [10250] * code/branches/storymodeHS14/cmake/LibraryConfig.cmake (modified) * code/branches/storymodeHS14/data/gui/scripts/CampaignMenu.lua (modified) * code/branches/storymodeHS14/data/gui/scripts/SingleplayerMenu.lua (modified) * code/branches/storymodeHS14/data/gui/scripts/campaign.txt (deleted) tabs -> spaces. removed temp-file Sun, 01 Feb 2015 21:37:36 GMT landauf [10249] * code/branches/storymodeHS14/src/orxonox/gametypes/Mission.cc (modified) autoformatted code and removed commented block Sun, 01 Feb 2015 21:21:51 GMT landauf [10248] * code/branches/presentationHS14merge (modified) * code/branches/presentationHS14merge/data/levels/includes/weaponSettingsTurret1.oxi (copied) * code/branches/presentationHS14merge/data/levels/templates/enemytowerdefense.oxt (copied) * code/branches/presentationHS14merge/data/levels/templates/tower.oxt (modified) * code/branches/presentationHS14merge/data/levels/towerDefense.oxw (modified) * code/branches/presentationHS14merge/data/overlays/towerdefenseHUD.oxo (modified) * code/branches/presentationHS14merge/src/modules/towerdefense/CMakeLists.txt (modified) * code/branches/presentationHS14merge/src/modules/towerdefense/TDCoordinate.cc (copied) * code/branches/presentationHS14merge/src/modules/towerdefense/TDCoordinate.h (copied) * code/branches/presentationHS14merge/src/modules/towerdefense/TDEnemy.h (modified) * code/branches/presentationHS14merge/src/modules/towerdefense/Tower.cc (modified) * code/branches/presentationHS14merge/src/modules/towerdefense/TowerDefense.cc (modified) * code/branches/presentationHS14merge/src/modules/towerdefense/TowerDefense.h (modified) * code/branches/presentationHS14merge/src/modules/towerdefense/TowerDefenseController.cc (modified) * code/branches/presentationHS14merge/src/modules/towerdefense/TowerDefenseEnemy.cc (copied) * code/branches/presentationHS14merge/src/modules/towerdefense/TowerDefenseEnemy.h (copied) * code/branches/presentationHS14merge/src/modules/towerdefense/TowerDefenseHUDController.cc (modified) * code/branches/presentationHS14merge/src/modules/towerdefense/TowerDefenseHUDController.h (modified) * code/branches/presentationHS14merge/src/modules/towerdefense/TowerDefensePlayerStats.cc (modified) * code/branches/presentationHS14merge/src/modules/towerdefense/TowerDefensePlayerStats.h (modified) * code/branches/presentationHS14merge/src/modules/towerdefense/TowerDefensePrereqs.h (modified) * code/branches/presentationHS14merge/src/modules/towerdefense/TowerDefenseTower.cc (copied) * code/branches/presentationHS14merge/src/modules/towerdefense/TowerDefenseTower.h (copied) * code/branches/presentationHS14merge/src/modules/towerdefense/TowerTurret.cc (copied) * code/branches/presentationHS14merge/src/modules/towerdefense/TowerTurret.h (copied) merged towerdefenseHS14 (except some debug code) Sun, 01 Feb 2015 20:32:19 GMT landauf [10247] * code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefenseTower.cc (modified) fixed warnings (MinGW) Sun, 01 Feb 2015 20:30:37 GMT landauf [10246] * code/branches/towerdefenseHS14/src/modules/towerdefense/TDCoordinate.cc (modified) * code/branches/towerdefenseHS14/src/modules/towerdefense/TDCoordinate.h (modified) * code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefense.cc (modified) * code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefense.h (modified) * code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefenseEnemy.cc (modified) * code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefenseEnemy.h (modified) * code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefensePlayerStats.h (modified) * code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefenseTower.cc (modified) replaced tabs with spaces + some formatting sometimes. no changes in ... Sun, 01 Feb 2015 20:23:00 GMT landauf [10245] * code/branches/towerdefenseHS14/src/modules/towerdefense/TDCoordinate.cc (modified) * code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefenseTower.cc (modified) fixed some warnings (MSVC) Sun, 01 Feb 2015 20:20:47 GMT landauf [10244] * code/branches/towerdefenseHS14/src/modules/towerdefense/TDCoordinate.cc (modified) * code/branches/towerdefenseHS14/src/modules/towerdefense/TDCoordinate.h (modified) * code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefenseEnemy.cc (modified) * code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefenseEnemy.h (modified) * code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefenseTower.cc (modified) * code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefenseTower.h (modified) * code/branches/towerdefenseHS14/src/modules/towerdefense/TowerTurret.cc (modified) * code/branches/towerdefenseHS14/src/modules/towerdefense/TowerTurret.h (modified) eol-style native Sun, 01 Feb 2015 20:18:22 GMT landauf [10243] * code/branches/towerdefenseHS14/src/modules/objects/controllers (copied) merged the updated controller files from trunk (including SVN history) Sun, 01 Feb 2015 19:58:38 GMT landauf [10242] * code/branches/presentationHS14merge (modified) * code/branches/presentationHS14merge/data/overlays/HUDTemplates3.oxo (modified) * code/branches/presentationHS14merge/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/branches/presentationHS14merge/src/modules/overlays/hud/HUDNavigation.h (modified) merged hudHS14 Sun, 01 Feb 2015 19:57:37 GMT landauf [10241] * code/branches/hudHS14/data/overlays/HUDTemplates3.oxo (modified) * code/branches/hudHS14/src/modules/overlays/hud/HUDEnemyHealthBar.cc (modified) * code/branches/hudHS14/src/modules/overlays/hud/HUDHealthBar.cc (modified) cleanup Sun, 01 Feb 2015 19:52:31 GMT landauf [10240] * code/branches/hudHS14/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/branches/hudHS14/src/modules/overlays/hud/HUDNavigation.h (modified) replaced tabs with spaces. no changes in code. Sun, 01 Feb 2015 19:50:08 GMT landauf [10239] * code/branches/hudHS14/src/modules/overlays/hud/HUDNavigation.cc (modified) fixed some warnings (MSVC) Sun, 01 Feb 2015 17:42:19 GMT landauf [10238] * code/branches/presentationHS14merge (modified) * code/branches/presentationHS14merge/data/levels/FPS_Level_HS14.oxw (copied) * code/branches/presentationHS14merge/data/levels/includes/weaponSettingsFPS_HS14.oxi (copied) * code/branches/presentationHS14merge/data/levels/presentationHS13.oxw (modified) * code/branches/presentationHS14merge/data/levels/templates/FPS.oxt (modified) * code/branches/presentationHS14merge/data/levels/templates/FPS_HS14.oxt (copied) * code/branches/presentationHS14merge/data/levels/templates/spacestation_elements.oxt (copied) * code/branches/presentationHS14merge/data/levels/templates/ss_tube01.oxt (copied) * code/branches/presentationHS14merge/src/modules/weapons/RocketController.cc (modified) merged weaponupdateHS14 (except some unnecessary changes) Sun, 01 Feb 2015 14:57:57 GMT landauf [10237] * code/branches/presentationHS14merge (modified) * code/branches/presentationHS14merge/data/levels/DodgeRace.oxw (copied) * code/branches/presentationHS14merge/data/levels/templates/DodgeRacePattern.oxt (copied) * code/branches/presentationHS14merge/data/levels/templates/spaceshipDodgeRace.oxt (copied) * code/branches/presentationHS14merge/data/overlays/DodgeRaceHUD.oxo (copied) * code/branches/presentationHS14merge/src/modules/CMakeLists.txt (modified) * code/branches/presentationHS14merge/src/modules/dodgerace (copied) merged surfaceraceHS14 (but without all the strange stuff that ... Sun, 01 Feb 2015 14:56:21 GMT landauf [10236] * code/branches/surfaceraceHS14/src/modules/dodgerace/DodgeRace.cc (modified) * code/branches/surfaceraceHS14/src/modules/dodgerace/DodgeRace.h (modified) * code/branches/surfaceraceHS14/src/modules/dodgerace/DodgeRaceCube.cc (modified) * code/branches/surfaceraceHS14/src/modules/dodgerace/DodgeRaceHUDinfo.cc (modified) * code/branches/surfaceraceHS14/src/modules/dodgerace/DodgeRaceShip.cc (modified) * code/branches/surfaceraceHS14/src/modules/dodgerace/DodgeRaceShip.h (modified) replaced tabs with spaces. no changes in code. Sun, 01 Feb 2015 14:43:14 GMT landauf [10235] * code/branches/surfaceraceHS14/src/modules/dodgerace/DodgeRace.cc (modified) * code/branches/surfaceraceHS14/src/modules/dodgerace/DodgeRace.h (modified) fixed build and warnings (MSVC) Sun, 01 Feb 2015 14:22:58 GMT landauf [10234] * code/branches/surfaceraceHS14/src/modules/CMakeLists.txt (modified) * code/branches/surfaceraceHS14/src/modules/dodgerace (modified) * code/branches/surfaceraceHS14/src/modules/dodgerace/CMakeLists.txt (modified) * code/branches/surfaceraceHS14/src/modules/dodgerace/DodgeRace.h (modified) * code/branches/surfaceraceHS14/src/modules/dodgerace/DodgeRaceCenterPoint.h (modified) * code/branches/surfaceraceHS14/src/modules/dodgerace/DodgeRaceCube.h (modified) * code/branches/surfaceraceHS14/src/modules/dodgerace/DodgeRaceHUDinfo.h (modified) * code/branches/surfaceraceHS14/src/modules/dodgerace/DodgeRaceShip.h (modified) changed paths Sun, 01 Feb 2015 14:20:57 GMT landauf [10233] * code/branches/surfaceraceHS14/src/modules/dodgerace (moved) renamed module dodgerace2 -> dodgerace Sun, 01 Feb 2015 14:19:54 GMT landauf [10232] * code/branches/surfaceraceHS14/src/modules/dodgerace2/CMakeLists.txt (modified) * code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRace.cc (modified) * code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRace.h (modified) * code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceCenterPoint.cc (modified) * code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceCenterPoint.h (modified) * code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceCube.cc (modified) * code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceCube.h (modified) * code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceHUDinfo.cc (modified) * code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceHUDinfo.h (modified) * code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRacePrereqs.h (modified) * code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceShip.cc (modified) * code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceShip.h (modified) eol-style native Sun, 01 Feb 2015 14:07:00 GMT landauf [10231] * code/branches/presentationHS14merge (modified) * code/branches/presentationHS14merge/data/levels/4Dtest.oxw (copied) * code/branches/presentationHS14merge/src/modules/CMakeLists.txt (modified) * code/branches/presentationHS14merge/src/modules/mini4dgame (copied) merged minigame4DHS14 Sun, 01 Feb 2015 13:55:44 GMT landauf [10230] * code/branches/minigame4DHS14/src/modules/mini4dgame/Mini4Dgame.cc (modified) * code/branches/minigame4DHS14/src/modules/mini4dgame/Mini4Dgame.h (modified) * code/branches/minigame4DHS14/src/modules/mini4dgame/Mini4DgameAI.cc (modified) * code/branches/minigame4DHS14/src/modules/mini4dgame/Mini4DgameAI.h (modified) * code/branches/minigame4DHS14/src/modules/mini4dgame/Mini4DgameBoard.cc (modified) * code/branches/minigame4DHS14/src/modules/mini4dgame/Mini4DgameBoard.h (modified) replaced tabs with spaces. no changes in code. Sun, 01 Feb 2015 13:50:46 GMT landauf [10229] * code/branches/minigame4DHS14/src/modules/mini4dgame/Mini4Dgame.cc (modified) * code/branches/minigame4DHS14/src/modules/mini4dgame/Mini4DgameBoard.cc (modified) * code/branches/minigame4DHS14/src/modules/mini4dgame/Mini4DgameBoard.h (modified) fixed warnings & details Sun, 01 Feb 2015 13:27:56 GMT landauf [10228] * code/branches/minigame4DHS14/src/modules/mini4dgame (modified) removed accidentally added merge-info (where did that come from?) Sun, 01 Feb 2015 13:25:02 GMT landauf [10227] * code/branches/minigame4DHS14/src/modules/CMakeLists.txt (modified) * code/branches/minigame4DHS14/src/modules/mini4dgame/CMakeLists.txt (modified) * code/branches/minigame4DHS14/src/modules/mini4dgame/Mini4Dgame.h (modified) * code/branches/minigame4DHS14/src/modules/mini4dgame/Mini4DgameAI.h (modified) * code/branches/minigame4DHS14/src/modules/mini4dgame/Mini4DgameBoard.h (modified) * code/branches/minigame4DHS14/src/modules/mini4dgame/Mini4DgamePrereqs.h (modified) changed paths & fixed macro in Mini4DgamePrereqs.h Sun, 01 Feb 2015 13:23:41 GMT landauf [10226] * code/branches/minigame4DHS14/src/modules/mini4dgame (moved) use only lowercase characters in module names Sun, 01 Feb 2015 13:20:04 GMT landauf [10225] * code/branches/minigame4DHS14/src/modules/mini4Dgame/CMakeLists.txt (modified) * code/branches/minigame4DHS14/src/modules/mini4Dgame/Mini4Dgame.cc (modified) * code/branches/minigame4DHS14/src/modules/mini4Dgame/Mini4Dgame.h (modified) * code/branches/minigame4DHS14/src/modules/mini4Dgame/Mini4DgameAI.cc (modified) * code/branches/minigame4DHS14/src/modules/mini4Dgame/Mini4DgameAI.h (modified) * code/branches/minigame4DHS14/src/modules/mini4Dgame/Mini4DgameBoard.cc (modified) * code/branches/minigame4DHS14/src/modules/mini4Dgame/Mini4DgameBoard.h (modified) * code/branches/minigame4DHS14/src/modules/mini4Dgame/Mini4DgamePrereqs.h (modified) eol-style native Sun, 01 Feb 2015 13:03:23 GMT landauf [10224] * code/branches/presentationHS14merge (modified) * code/branches/presentationHS14merge/data/levels/AnihilationThreat.oxw (copied) * code/branches/presentationHS14merge/src/modules/notifications/NotificationQueueCEGUI.cc (modified) merged leveljoemeHS14 Sun, 01 Feb 2015 13:02:26 GMT landauf [10223] * code/branches/presentationHS14merge (modified) * code/branches/presentationHS14merge/data/levels/kecks.oxw (copied) merged keckslevelHS14 Sun, 01 Feb 2015 12:51:57 GMT landauf [10222] * code/branches/presentationHS14merge (copied) created new branch to merge the changes from HS14 Sun, 01 Feb 2015 12:39:16 GMT landauf [10221] * code/branches/presentationHS14/src/modules/CMakeLists.txt (modified) * code/branches/presentationHS14/src/modules/dodgerace (moved) * code/branches/presentationHS14/src/modules/dodgerace/CMakeLists.txt (modified) * code/branches/presentationHS14/src/modules/dodgerace/DodgeRace.cc (copied) * code/branches/presentationHS14/src/modules/dodgerace/DodgeRace.h (modified) * code/branches/presentationHS14/src/modules/dodgerace/DodgeRaceCenterPoint.h (modified) * code/branches/presentationHS14/src/modules/dodgerace/DodgeRaceCube.h (modified) * code/branches/presentationHS14/src/modules/dodgerace/DodgeRaceHUDinfo.h (modified) * code/branches/presentationHS14/src/modules/dodgerace/DodgeRaceShip.h (modified) renamed module: dodgerace2 -> dodgerace (this also fixes build on ... Sun, 01 Feb 2015 12:37:29 GMT landauf [10220] * code/branches/presentationHS14/src/modules/mini4Dgame/Mini4DgamePrereqs.h (modified) * code/branches/presentationHS14/src/modules/objects/controllers/TeamTargetProxy.h (modified) * code/branches/presentationHS14/src/modules/objects/controllers/TurretController.cc (modified) * code/branches/presentationHS14/src/modules/objects/controllers/TurretController.h (modified) fixed build of objects and mini4Dgame modules (MSVC) Sat, 31 Jan 2015 22:54:35 GMT landauf [10219] * code/branches/presentationHS14/src/modules/dodgerace2/DodgeRace.cc (modified) * code/branches/presentationHS14/src/modules/towerdefense/TowerDefenseTower.cc (modified) fixed build (DodgeRace) and warnings (TowerDefenseTower) for MinGW on ... Sat, 31 Jan 2015 17:05:40 GMT landauf [10217] * code/branches/ScriptableController (deleted) * code/branches/modularships (deleted) * code/branches/presentationFS14 (deleted) * code/branches/turretFS14 (deleted) removed old & merged branches from FS14 Sat, 31 Jan 2015 16:31:23 GMT landauf [10215] * code/branches/presentationFS14/src/modules/jump/Jump.cc (modified) * code/branches/presentationFS14/src/modules/jump/JumpBoots.cc (modified) * code/branches/presentationFS14/src/modules/jump/JumpEnemy.cc (modified) * code/branches/presentationFS14/src/modules/jump/JumpFigure.cc (modified) * code/branches/presentationFS14/src/modules/jump/JumpFigure.h (modified) * code/branches/presentationFS14/src/modules/jump/JumpItem.cc (modified) * code/branches/presentationFS14/src/modules/jump/JumpPlatform.cc (modified) * code/branches/presentationFS14/src/modules/jump/JumpPlatformDisappear.cc (modified) * code/branches/presentationFS14/src/modules/jump/JumpPlatformDisappear.h (modified) * code/branches/presentationFS14/src/modules/jump/JumpPlatformFake.h (modified) * code/branches/presentationFS14/src/modules/jump/JumpPlatformHMove.cc (modified) * code/branches/presentationFS14/src/modules/jump/JumpPlatformHMove.h (modified) * code/branches/presentationFS14/src/modules/jump/JumpPlatformStatic.cc (modified) * code/branches/presentationFS14/src/modules/jump/JumpPlatformStatic.h (modified) * code/branches/presentationFS14/src/modules/jump/JumpPlatformTimer.cc (modified) * code/branches/presentationFS14/src/modules/jump/JumpPlatformTimer.h (modified) * code/branches/presentationFS14/src/modules/jump/JumpPlatformVMove.cc (modified) * code/branches/presentationFS14/src/modules/jump/JumpPlatformVMove.h (modified) * code/branches/presentationFS14/src/modules/jump/JumpProjectile.cc (modified) * code/branches/presentationFS14/src/modules/jump/JumpPropeller.cc (modified) * code/branches/presentationFS14/src/modules/jump/JumpRocket.cc (modified) * code/branches/presentationFS14/src/modules/jump/JumpScore.cc (modified) * code/branches/presentationFS14/src/modules/jump/JumpShield.cc (modified) * code/branches/presentationFS14/src/modules/jump/JumpSpring.cc (modified) * code/branches/presentationFS14/src/modules/objects/controllers/TeamTargetProxy.cc (modified) * code/branches/presentationFS14/src/modules/objects/controllers/TeamTargetProxy.h (modified) * code/branches/presentationFS14/src/modules/objects/controllers/TurretController.cc (modified) * code/branches/presentationFS14/src/modules/objects/controllers/TurretController.h (modified) * code/branches/presentationFS14/src/orxonox/controllers/ControllerDirector.cc (modified) * code/branches/presentationFS14/src/orxonox/controllers/ControllerDirector.h (modified) replaced tabs with spaces. no changes in code. Sat, 31 Jan 2015 15:54:16 GMT landauf [10214] * code/branches/presentationFS14/src/orxonox/items/PartDestructionEvent.cc (modified) * code/branches/presentationFS14/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) fixed segfault. after removing the engine from the ship, we need to ... Sat, 31 Jan 2015 15:21:49 GMT landauf [10213] * code/branches/presentationFS14/src/orxonox/worldentities/pawns/ModularSpaceShip.cc (modified) * code/branches/presentationFS14/src/orxonox/worldentities/pawns/ModularSpaceShip.h (modified) removed attach() from ModularSpaceShip because it shadows the non- ... Sat, 31 Jan 2015 15:14:57 GMT landauf [10212] * code/branches/presentationFS14/src/orxonox/worldentities/WorldEntity.h (modified) * code/branches/presentationFS14/src/orxonox/worldentities/pawns/ModularSpaceShip.cc (modified) * code/branches/presentationFS14/src/orxonox/worldentities/pawns/ModularSpaceShip.h (modified) removed detach() from ModularSpaceShip which was just copy-pasted ... Sat, 31 Jan 2015 14:51:08 GMT landauf [10211] * code/branches/presentationFS14/src/orxonox/worldentities/pawns/ModularSpaceShip.cc (modified) * code/branches/presentationFS14/src/orxonox/worldentities/pawns/ModularSpaceShip.h (modified) * code/branches/presentationFS14/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) * code/branches/presentationFS14/src/orxonox/worldentities/pawns/SpaceShip.h (modified) made SpaceShip::engineList_ private again. moved function from ... Sun, 25 Jan 2015 23:22:57 GMT landauf [10205] * code/branches/presentationFS14/src/orxonox/collisionshapes/CollisionShape.cc (modified) the previous commit was not correct. re-added the call to ... Sun, 25 Jan 2015 22:32:17 GMT landauf [10204] * code/branches/presentationFS14/src/orxonox/collisionshapes/CompoundCollisionShape.cc (modified) i think this can be removed as well. the user pointer was probably ... Sun, 25 Jan 2015 22:15:24 GMT landauf [10203] * code/branches/presentationFS14/src/external/bullet/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp (modified) * code/branches/presentationFS14/src/orxonox/Scene.h (modified) * code/branches/presentationFS14/src/orxonox/collisionshapes/CollisionShape.h (modified) * code/branches/presentationFS14/src/orxonox/collisionshapes/CompoundCollisionShape.cc (modified) * code/branches/presentationFS14/src/orxonox/collisionshapes/CompoundCollisionShape.h (modified) * code/branches/presentationFS14/src/orxonox/worldentities/StaticEntity.cc (modified) * code/branches/presentationFS14/src/orxonox/worldentities/WorldEntity.cc (modified) * code/branches/presentationFS14/src/orxonox/worldentities/WorldEntity.h (modified) * code/branches/presentationFS14/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/branches/presentationFS14/src/orxonox/worldentities/pawns/Pawn.h (modified) removed unused code and debug output Sun, 25 Jan 2015 20:18:15 GMT landauf [10202] * code/branches/formationupdate (deleted) * code/branches/libs (deleted) removed two merged branches Sun, 25 Jan 2015 18:32:42 GMT landauf [10201] * code/branches/Racingbot (deleted) * code/branches/invaders (deleted) * code/branches/largeShip1 (deleted) * code/branches/levelElias (deleted) * code/branches/levelKaan (deleted) * code/branches/levelMichael (deleted) * code/branches/presentationHS12 (deleted) * code/branches/presentationHS13 (deleted) * code/branches/radarDreiD (deleted) * code/branches/sfxThilo (deleted) * code/branches/spaceNavigation (deleted) * code/branches/spacestationentry (deleted) * code/branches/turret (deleted) removed old (and merged) branches from HS12 and HS12. notes: - ... Sun, 25 Jan 2015 17:48:12 GMT landauf [10200] * code/branches/LevelLoader (deleted) * code/branches/core7 (deleted) * code/branches/questlog (deleted) * code/branches/revampbigships (deleted) * code/branches/sfxSebastian (deleted) * code/branches/strongTurret (deleted) removed old branches that never received any commits Sun, 25 Jan 2015 14:43:11 GMT landauf [10199] * code/branches/presentationFS14/data/levels/templates/spaceshipTurret.oxt (copied) reverted spaceshipTurret.oxt to the old (and correct) version of r10071 Sun, 25 Jan 2015 14:39:30 GMT landauf [10198] * code/branches/presentationFS14/data/levels/templates/standardTurret.oxt (modified) * code/branches/presentationFS14/src/orxonox/worldentities/WorldEntity.cc (modified) disabled physics for turret -> removed attachment-hack in WorldEntity Wed, 17 Dec 2014 14:43:07 GMT fvultier [10184] * code/branches/pickupsFS14/data/levels/emptyLevel.oxw (modified) * code/branches/pickupsFS14/data/levels/jump.oxw (modified) * code/branches/pickupsFS14/data/overlays/jumpHUD.oxo (modified) * code/branches/pickupsFS14/src/modules/jump/Jump.cc (modified) * code/branches/pickupsFS14/src/modules/jump/Jump.h (modified) * code/branches/pickupsFS14/src/modules/jump/JumpBoots.cc (modified) * code/branches/pickupsFS14/src/modules/jump/JumpBoots.h (modified) * code/branches/pickupsFS14/src/modules/jump/JumpFigure.cc (modified) * code/branches/pickupsFS14/src/modules/jump/JumpFigure.h (modified) * code/branches/pickupsFS14/src/modules/jump/JumpItem.h (modified) * code/branches/pickupsFS14/src/modules/jump/JumpPropeller.cc (modified) * code/branches/pickupsFS14/src/modules/jump/JumpPropeller.h (modified) * code/branches/pickupsFS14/src/modules/jump/JumpRocket.cc (modified) * code/branches/pickupsFS14/src/modules/jump/JumpRocket.h (modified) * code/branches/pickupsFS14/src/modules/jump/JumpScore.cc (modified) * code/branches/pickupsFS14/src/modules/jump/JumpScore.h (modified) * code/branches/pickupsFS14/src/modules/jump/JumpShield.cc (modified) * code/branches/pickupsFS14/src/modules/jump/JumpShield.h (modified) Es wird nun angezeigt, wie lange ein item noch aktiv ist. Mon, 15 Dec 2014 15:12:02 GMT maxima [10182] * code/branches/presentationHS14/src/orxonox/gametypes/Mission.cc (modified) Had to change Mission::start() to play the mission levels. Mon, 15 Dec 2014 14:58:14 GMT maxima [10181] * code/branches/presentationHS14 (modified) * code/branches/presentationHS14/data/levels/includes/weaponSettingsTurret.oxi (modified) * code/branches/presentationHS14/data/levels/includes/weaponSettingsTurret1.oxi (copied) * code/branches/presentationHS14/data/levels/templates/enemytowerdefense.oxt (copied) * code/branches/presentationHS14/data/levels/templates/standardTurret.oxt (copied) * code/branches/presentationHS14/data/levels/templates/tower.oxt (modified) * code/branches/presentationHS14/data/levels/towerDefense.oxw (modified) * code/branches/presentationHS14/data/levels/turretTest.oxw (modified) * code/branches/presentationHS14/data/overlays/towerdefenseHUD.oxo (modified) * code/branches/presentationHS14/src/libraries/core/input/InputManager.cc (modified) * code/branches/presentationHS14/src/modules/objects/CMakeLists.txt (modified) * code/branches/presentationHS14/src/modules/objects/Turret.cc (modified) * code/branches/presentationHS14/src/modules/objects/Turret.h (modified) * code/branches/presentationHS14/src/modules/objects/controllers (copied) * code/branches/presentationHS14/src/modules/towerdefense/CMakeLists.txt (modified) * code/branches/presentationHS14/src/modules/towerdefense/TDCoordinate.cc (copied) * code/branches/presentationHS14/src/modules/towerdefense/TDCoordinate.h (copied) * code/branches/presentationHS14/src/modules/towerdefense/TDEnemy.h (modified) * code/branches/presentationHS14/src/modules/towerdefense/Tower.cc (modified) * code/branches/presentationHS14/src/modules/towerdefense/TowerDefense.cc (modified) * code/branches/presentationHS14/src/modules/towerdefense/TowerDefense.h (modified) * code/branches/presentationHS14/src/modules/towerdefense/TowerDefenseController.cc (modified) * code/branches/presentationHS14/src/modules/towerdefense/TowerDefenseEnemy.cc (copied) * code/branches/presentationHS14/src/modules/towerdefense/TowerDefenseEnemy.h (copied) * code/branches/presentationHS14/src/modules/towerdefense/TowerDefenseHUDController.cc (modified) * code/branches/presentationHS14/src/modules/towerdefense/TowerDefenseHUDController.h (modified) * code/branches/presentationHS14/src/modules/towerdefense/TowerDefensePlayerStats.cc (modified) * code/branches/presentationHS14/src/modules/towerdefense/TowerDefensePlayerStats.h (modified) * code/branches/presentationHS14/src/modules/towerdefense/TowerDefensePrereqs.h (modified) * code/branches/presentationHS14/src/modules/towerdefense/TowerDefenseTower.cc (copied) * code/branches/presentationHS14/src/modules/towerdefense/TowerDefenseTower.h (copied) * code/branches/presentationHS14/src/modules/towerdefense/TowerTurret.cc (copied) * code/branches/presentationHS14/src/modules/towerdefense/TowerTurret.h (copied) * code/branches/presentationHS14/src/orxonox/controllers/ArtificialController.cc (modified) * code/branches/presentationHS14/src/orxonox/worldentities/WorldEntity.cc (modified) towerdefenseHS14 merged.