# # ChangeLog for code # # Generated by Trac 1.0.9 # Nov 29, 2024, 9:08:14 AM Sun, 19 Apr 2015 20:07:27 GMT landauf [10375] * code/branches/core7/src/libraries/core/class/Identifier.cc (modified) trying to keep the correct order of parents Sun, 19 Apr 2015 20:04:35 GMT landauf [10374] * code/branches/core7/src/libraries/core/CoreIncludes.h (modified) * code/branches/core7/src/libraries/core/class/Identifiable.cc (modified) * code/branches/core7/src/libraries/core/class/Identifier.cc (modified) * code/branches/core7/src/libraries/core/class/Identifier.h (modified) * code/branches/core7/src/libraries/core/class/OrxonoxInterface.cc (modified) * code/branches/core7/src/libraries/core/config/Configurable.cc (modified) * code/branches/core7/src/libraries/core/object/Listable.cc (modified) added flag to define if a class should be used as a virtual parent ... Sat, 18 Apr 2015 11:09:33 GMT landauf [10373] * code/branches/core7/src/libraries/core/class/Identifier.h (modified) detail (re-ordered functions) Sat, 18 Apr 2015 11:07:08 GMT landauf [10372] * code/branches/core7/src/libraries/core/class/Identifier.cc (modified) * 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) * code/branches/core7/test/core/class/IdentifierClassHierarchyTest.cc (modified) * code/branches/core7/test/core/class/IdentifierExternalClassHierarchyTest.cc (modified) * code/branches/core7/test/core/class/IdentifierNestedClassHierarchyTest.cc (modified) * code/branches/core7/test/core/class/IdentifierSimpleClassHierarchyTest.cc (modified) * code/branches/core7/test/core/class/SuperTest.cc (modified) use lists instead of sets to store parent identifiers. this allows to ... Sat, 18 Apr 2015 10:46:57 GMT landauf [10371] * code/branches/core7/src/libraries/core/class/Identifier.cc (modified) * code/branches/core7/src/libraries/core/class/Identifier.h (modified) * code/branches/core7/src/libraries/core/class/IdentifierManager.cc (modified) trying to make the initialization of parents of an identifier better ... Thu, 16 Apr 2015 19:59:58 GMT landauf [10370] * code/branches/core7/src/libraries/core/class/IdentifierManager.cc (modified) * code/branches/core7/src/libraries/core/class/IdentifierManager.h (modified) more checks. Thu, 16 Apr 2015 14:43:55 GMT meggiman [10369] * code/branches/weaponFS15/data/levels/emptyLevel.oxw (modified) * code/branches/weaponFS15/data/levels/includes/weaponSettingsAssff.oxi (modified) * code/branches/weaponFS15/src/modules/weapons/WeaponsPrereqs.h (modified) * code/branches/weaponFS15/src/modules/weapons/munitions/CMakeLists.txt (modified) * code/branches/weaponFS15/src/modules/weapons/munitions/GravityBombMunition.cc (added) * code/branches/weaponFS15/src/modules/weapons/munitions/GravityBombMunition.h (added) * 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 (modified) * code/branches/weaponFS15/src/modules/weapons/weaponmodes/CMakeLists.txt (modified) * code/branches/weaponFS15/src/modules/weapons/weaponmodes/GravityBombFire.cc (added) * code/branches/weaponFS15/src/modules/weapons/weaponmodes/GravityBombFire.h (modified) Alle Klassen implementiert um die Waffe abzufeuern. Noch sehr fehlerhaft. Thu, 16 Apr 2015 14:24:41 GMT erbj [10368] * code/branches/towerdefenseFS15/data/levels/towerDefense.oxw (modified) * code/branches/towerdefenseFS15/src/modules/objects/controllers/TurretController.cc (modified) * code/branches/towerdefenseFS15/src/modules/towerdefense/CMakeLists.txt (modified) * code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefense.cc (modified) * code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefense.h (modified) * code/branches/towerdefenseFS15/src/orxonox/controllers/FormationController.cc (modified) added timer in tick function to pause for 10 seconds between waves , ... Wed, 15 Apr 2015 20:37:17 GMT landauf [10367] * code/branches/core7/src/libraries/core/ClassTreeMask.cc (modified) * code/branches/core7/src/libraries/core/class/Identifier.h (modified) removed some functions which were (almost) unused Wed, 15 Apr 2015 20:11:15 GMT landauf [10366] * code/branches/core7/src/libraries/core/class/Identifier.cc (modified) * 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) found a better solution to find identifiers that don't belong to the ... Tue, 14 Apr 2015 20:29:05 GMT landauf [10365] * code/branches/core7/src/libraries/core/class/IdentifierManager.cc (modified) fixed tests, added more output Tue, 14 Apr 2015 20:11:35 GMT landauf [10364] * code/branches/core7/src/libraries/core/class/IdentifierManager.cc (modified) only check class hierarchy in dev mode Mon, 13 Apr 2015 21:15:04 GMT landauf [10363] * code/branches/core7/src/libraries/core/class/Identifier.cc (modified) * code/branches/core7/src/libraries/core/class/Identifier.h (modified) * code/branches/core7/src/libraries/core/class/IdentifierManager.cc (modified) * code/branches/core7/test/core/CMakeLists.txt (modified) * code/branches/core7/test/core/class/IdentifierNestedClassHierarchyTest.cc (added) bugfix: class hierarchy wrongly considered the classes of nested ... 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 Sun, 15 Mar 2015 16:27:57 GMT smerkli [10318] * code/trunk/src/modules/gametypes/SpaceRaceController.cc (modified) fixed destructor (during class hierarchy initialization) Sun, 15 Mar 2015 16:22:19 GMT smerkli [10317] * code/trunk/src/libraries/util/output/OutputDefinitions.h (modified) fixed compiler warnings Sun, 15 Mar 2015 14:22:18 GMT smerkli [10316] * code/trunk/src/orxonox/Scene.cc (modified) only load debug drawer if graphics is enabled 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 Mon, 02 Mar 2015 22:19:32 GMT landauf [10299] * code/trunk/src/modules/weapons/projectiles/SimpleRocket.cc (modified) * code/trunk/src/orxonox/gamestates/GSLevel.cc (modified) fixed crash in SimpleRocket (during level-unloading). improved debug ... Mon, 02 Mar 2015 22:18:45 GMT landauf [10298] * code/trunk/src/libraries/core/BaseObject.h (modified) * code/trunk/src/libraries/core/Namespace.cc (modified) fixed potential crash during level-unloading: Namespace is a context ... Sun, 01 Mar 2015 21:11:26 GMT landauf [10297] * code/trunk/data/levels/underAttack.oxw (modified) improved underAttack.oxw - now with lots of turrets attached to the ... Sun, 01 Mar 2015 21:06:17 GMT landauf [10296] * code/trunk/src/modules/weapons/weaponmodes/EnergyDrink.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/FusionFire.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/HsW01.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/LaserFire.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/LightningGun.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/RocketFire.cc (modified) don't add the pawn's velocity to the projectile's velocity. this ... Sun, 01 Mar 2015 20:59:53 GMT muemart [10295] * code/trunk/src/libraries/core/DynLib.cc (modified) * code/trunk/src/libraries/core/GraphicsManager.cc (modified) * code/trunk/src/libraries/core/PathConfig.cc (modified) Avoid using the system path variables on windows (also gets rid of ... Sun, 01 Mar 2015 20:59:28 GMT landauf [10294] * code/trunk/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/EnergyDrink.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/FusionFire.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/HsW01.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/LaserFire.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/LightningGun.cc (modified) * code/trunk/src/orxonox/controllers/ArtificialController.cc (modified) made projectiles slower (and all have the same speed now). makes it ... Sun, 01 Mar 2015 19:59:15 GMT landauf [10293] * code/trunk/src/modules/weapons/projectiles/BasicProjectile.cc (modified) * code/trunk/src/modules/weapons/projectiles/BasicProjectile.h (modified) avoid collisions between projectiles of a turret and the parent-pawn ... Sun, 01 Mar 2015 14:27:01 GMT landauf [10292] * code/trunk/data/overlays/HUD.oxo (modified) * code/trunk/data/overlays/HUDTemplates3.oxo (modified) * code/trunk/data/overlays/HUDTemplatesFPS.oxo (modified) * code/trunk/src/modules/overlays/hud/HUDNavigation.cc (modified) fixed text size in HUD (marker which shows the enemy's name). the ... Sun, 01 Mar 2015 14:08:45 GMT landauf [10291] * code/trunk/src/libraries/util/Math.cc (modified) * code/trunk/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/trunk/src/modules/overlays/hud/HUDNavigation.h (modified) simplified Math: temp is always positive, thus only solution1 is ... Sun, 01 Mar 2015 13:17:08 GMT landauf [10290] * code/trunk/src/modules/weapons/weaponmodes/HsW01.cc (modified) * code/trunk/src/orxonox/controllers/FormationController.cc (modified) details Sun, 01 Mar 2015 13:16:34 GMT landauf [10289] * code/trunk/src/libraries/util/Math.cc (modified) * code/trunk/src/orxonox/controllers/ArtificialController.cc (modified) fixed target position calculation: a) the math was wrong (not sure ... Sat, 28 Feb 2015 22:55:18 GMT landauf [10288] * code/trunk/src/orxonox/worldentities/WorldEntity.cc (modified) * code/trunk/src/orxonox/worldentities/WorldEntity.h (modified) added bullet settings for CCD (continuous collision detection) to ... Sat, 28 Feb 2015 22:50:41 GMT landauf [10287] * code/trunk/src/modules/weapons/projectiles/BasicProjectile.cc (modified) * code/trunk/src/modules/weapons/projectiles/Projectile.cc (modified) use dynamic physics for projectiles. this seems to avoid 'tunneling' ... Sat, 28 Feb 2015 17:14:55 GMT landauf [10286] * code/trunk/cmake/CompilerConfigMSVC.cmake (modified) trying to fix msvc linker warnings related to /INCREMENTAL:YES 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 21:29:13 GMT landauf [10284] * code/trunk/src/modules/dodgerace/CMakeLists.txt (modified) * code/trunk/src/modules/dodgerace/DodgeRaceShip.h (modified) * code/trunk/src/modules/jump/CMakeLists.txt (modified) * code/trunk/src/modules/mini4dgame/CMakeLists.txt (modified) * code/trunk/src/modules/questsystem/CMakeLists.txt (modified) removed some unnecessary module dependencies 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 Tue, 24 Feb 2015 21:54:24 GMT landauf [10281] * code/trunk/data/defaultConfig/keybindings.ini (modified) * code/trunk/src/orxonox/OrxonoxPrereqs.h (modified) * code/trunk/src/orxonox/gamestates/GSLevel.cc (modified) * code/trunk/src/orxonox/gamestates/GSLevel.h (modified) * code/trunk/src/orxonox/gamestates/GSLevelMemento.h (added) * code/trunk/src/orxonox/gametypes/Gametype.cc (modified) * code/trunk/src/orxonox/gametypes/Gametype.h (modified) added command 'reloadLevel' (by default on F5) which reloads the ... 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 20:57:42 GMT landauf [10279] * code/trunk/src/libraries/core/GUIManager.cc (modified) fixed msvc warnings Wed, 18 Feb 2015 20:56:38 GMT landauf [10278] * code/trunk/src/libraries/core/Loader.cc (modified) fixed issue with inline-lua-code. only add an extra space if there's ... Wed, 18 Feb 2015 20:32:48 GMT landauf [10277] * code/trunk/src/libraries/tools/BulletDebugDrawer.cc (modified) * code/trunk/src/libraries/tools/BulletDebugDrawer.h (modified) potential fix of compile problem on 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 Sun, 15 Feb 2015 22:11:59 GMT landauf [10274] * code/trunk/data/levels/iJohnVane_TriptoArea51.oxw (modified) * code/trunk/src/orxonox/worldentities/WorldEntity.cc (modified) fixed #419 http://www.orxonox.net/ticket/419 physics is only ... Sun, 15 Feb 2015 20:46:31 GMT landauf [10273] * code/trunk/src/libraries/core/Loader.cc (modified) bugfix & simplification & comment by bknecht Sun, 15 Feb 2015 20:37:54 GMT landauf [10272] * code/trunk/src/libraries/core/Loader.cc (modified) reverted a part of the changes from r10264. only single lua-tags ... Sat, 14 Feb 2015 23:19:13 GMT landauf [10271] * code/trunk/src/libraries/core/GUIManager.cc (modified) bugfix: resize CEGUI if render window changes size Sat, 14 Feb 2015 21:49:23 GMT landauf [10270] * code/trunk/src/orxonox/worldentities/pawns/ModularSpaceShip.cc (modified) fixed crash: cs can be null (e.g. when using the 'suicide' command) Sat, 14 Feb 2015 11:51:14 GMT muemart [10269] * code/trunk/src/libraries/core/Loader.cc (modified) Tweak the xml error message a bit Thu, 12 Feb 2015 22:28:26 GMT landauf [10268] * code/trunk/cmake/tools/PrecompiledHeaderFiles.cmake (modified) * code/trunk/src/CMakeLists.txt (modified) * code/trunk/src/libraries/core/CMakeLists.txt (modified) * code/trunk/src/libraries/core/GraphicsManager.cc (modified) program icon now works also with MinGW. but I had to exclude the PCH- ... Thu, 12 Feb 2015 17:05:25 GMT muemart [10267] * code/trunk/cmake/tools/SourceFileUtilities.cmake (modified) * code/trunk/cmake/tools/TargetUtilities.cmake (modified) * code/trunk/contrib/orxonox.ico (added) * code/trunk/contrib/winresource.rc (added) * code/trunk/src/CMakeLists.txt (modified) * code/trunk/src/libraries/core/CMakeLists.txt (modified) * code/trunk/src/libraries/core/GraphicsManager.cc (modified) Add program icon for Windows builds (MSVC only for now) Thu, 12 Feb 2015 13:51:41 GMT muemart [10266] * code/trunk/doc/api/doxy.config.in (modified) Add support for paths with spaces for doxygen and exclude some enet pages Wed, 11 Feb 2015 22:17:57 GMT landauf [10265] * code/trunk/src/libraries/core/Loader.cc (modified) * code/trunk/src/libraries/core/LuaState.cc (modified) * code/trunk/src/libraries/core/LuaState.h (modified) fixed build with older compilers (pre c++11) Wed, 11 Feb 2015 09:56:26 GMT muemart [10264] * code/trunk/src/libraries/core/Loader.cc (modified) * code/trunk/src/libraries/core/LuaState.cc (modified) * code/trunk/src/libraries/core/LuaState.h (modified) Various fixes and improvements in the Loader (and LuaState) - When ... Tue, 10 Feb 2015 22:10:39 GMT landauf [10263] * code/trunk/cmake/tools/FlagUtilities.cmake (modified) fixed details Fri, 06 Feb 2015 22:30:26 GMT landauf [10262] * code/trunk/data/defaultConfig/orxonox.ini (modified) * code/trunk/data/gui/layouts/CampaignMenu.layout (modified) * code/trunk/data/gui/scripts/CampaignMenu.lua (modified) * code/trunk/data/gui/scripts/testscript.lua (modified) * code/trunk/data/levels/4Dtest.oxw (modified) * code/trunk/data/levels/AnihilationThreat.oxw (modified) * code/trunk/data/levels/DodgeRace.oxw (modified) * code/trunk/data/levels/FPS_Level_HS14.oxw (modified) * code/trunk/data/levels/ModularShipsTest0.oxw (modified) * code/trunk/data/levels/ModularShipsTest1.oxw (modified) * code/trunk/data/levels/collisionShapes.oxw (modified) * code/trunk/data/levels/includes/weaponSettingsFPS_HS14.oxi (modified) * code/trunk/data/levels/includes/weaponSettingsTurret1.oxi (modified) * code/trunk/data/levels/jump.oxw (modified) * code/trunk/data/levels/kecks.oxw (modified) * code/trunk/data/levels/levelTry.oxw (modified) * code/trunk/data/levels/michaelstestfile.lua (modified) * code/trunk/data/levels/scriptController.oxw (modified) * code/trunk/data/levels/templates/DodgeRacePattern.oxt (modified) * code/trunk/data/levels/templates/FPS_HS14.oxt (modified) * code/trunk/data/levels/templates/ModularSpaceShipTest.oxt (modified) * code/trunk/data/levels/templates/enemytowerdefense.oxt (modified) * code/trunk/data/levels/templates/spaceshipDodgeRace.oxt (modified) * code/trunk/data/levels/templates/spacestation_elements.oxt (modified) * code/trunk/data/levels/templates/ss_tube01.oxt (modified) * code/trunk/data/levels/templates/standardTurret.oxt (modified) * code/trunk/data/overlays/DodgeRaceHUD.oxo (modified) * code/trunk/data/overlays/jumpHUD.oxo (modified) * code/trunk/src/libraries/tools/BulletDebugDrawer.cc (modified) * code/trunk/src/libraries/tools/BulletDebugDrawer.h (modified) * code/trunk/src/libraries/tools/DebugDrawer.cc (modified) * code/trunk/src/libraries/tools/DebugDrawer.h (modified) * code/trunk/src/libraries/tools/IcoSphere.cc (modified) * code/trunk/src/libraries/tools/IcoSphere.h (modified) * code/trunk/src/libraries/tools/OgreBulletUtils.h (modified) * code/trunk/src/modules/gametypes/SpaceRaceBot.cc (modified) * code/trunk/src/modules/gametypes/SpaceRaceBot.h (modified) * code/trunk/src/modules/gametypes/SpaceRaceController.cc (modified) * code/trunk/src/modules/gametypes/SpaceRaceController.h (modified) * code/trunk/src/modules/jump/CMakeLists.txt (modified) * code/trunk/src/modules/jump/Jump.cc (modified) * code/trunk/src/modules/jump/Jump.h (modified) * code/trunk/src/modules/jump/JumpBoots.cc (modified) * code/trunk/src/modules/jump/JumpBoots.h (modified) * code/trunk/src/modules/jump/JumpCenterpoint.cc (modified) * code/trunk/src/modules/jump/JumpCenterpoint.h (modified) * code/trunk/src/modules/jump/JumpEnemy.cc (modified) * code/trunk/src/modules/jump/JumpEnemy.h (modified) * code/trunk/src/modules/jump/JumpFigure.cc (modified) * code/trunk/src/modules/jump/JumpFigure.h (modified) * code/trunk/src/modules/jump/JumpItem.cc (modified) * code/trunk/src/modules/jump/JumpItem.h (modified) * code/trunk/src/modules/jump/JumpPlatform.cc (modified) * code/trunk/src/modules/jump/JumpPlatform.h (modified) * code/trunk/src/modules/jump/JumpPlatformDisappear.cc (modified) * code/trunk/src/modules/jump/JumpPlatformDisappear.h (modified) * code/trunk/src/modules/jump/JumpPlatformFake.cc (modified) * code/trunk/src/modules/jump/JumpPlatformFake.h (modified) * code/trunk/src/modules/jump/JumpPlatformHMove.cc (modified) * code/trunk/src/modules/jump/JumpPlatformHMove.h (modified) * code/trunk/src/modules/jump/JumpPlatformStatic.cc (modified) * code/trunk/src/modules/jump/JumpPlatformStatic.h (modified) * code/trunk/src/modules/jump/JumpPlatformTimer.cc (modified) * code/trunk/src/modules/jump/JumpPlatformTimer.h (modified) * code/trunk/src/modules/jump/JumpPlatformVMove.cc (modified) * code/trunk/src/modules/jump/JumpPlatformVMove.h (modified) * code/trunk/src/modules/jump/JumpPrereqs.h (modified) * code/trunk/src/modules/jump/JumpProjectile.cc (modified) * code/trunk/src/modules/jump/JumpProjectile.h (modified) * code/trunk/src/modules/jump/JumpPropeller.cc (modified) * code/trunk/src/modules/jump/JumpPropeller.h (modified) * code/trunk/src/modules/jump/JumpRocket.cc (modified) * code/trunk/src/modules/jump/JumpRocket.h (modified) * code/trunk/src/modules/jump/JumpScore.cc (modified) * code/trunk/src/modules/jump/JumpScore.h (modified) * code/trunk/src/modules/jump/JumpShield.cc (modified) * code/trunk/src/modules/jump/JumpShield.h (modified) * code/trunk/src/modules/jump/JumpSpring.cc (modified) * code/trunk/src/modules/jump/JumpSpring.h (modified) * code/trunk/src/modules/objects/Turret.cc (modified) * code/trunk/src/modules/objects/Turret.h (modified) * code/trunk/src/modules/objects/collisionshapes/CylinderCollisionShape.cc (modified) * code/trunk/src/modules/objects/collisionshapes/CylinderCollisionShape.h (modified) * code/trunk/src/modules/objects/controllers/CMakeLists.txt (modified) * code/trunk/src/modules/objects/controllers/TeamTargetProxy.cc (modified) * code/trunk/src/modules/objects/controllers/TeamTargetProxy.h (modified) * code/trunk/src/modules/objects/controllers/TurretController.cc (modified) * code/trunk/src/modules/objects/controllers/TurretController.h (modified) * code/trunk/src/modules/tetris/TetrisBrick.cc (modified) * code/trunk/src/modules/tetris/TetrisBrick.h (modified) * code/trunk/src/modules/tetris/TetrisScore.cc (modified) * code/trunk/src/modules/tetris/TetrisScore.h (modified) * code/trunk/src/orxonox/ShipPartManager.cc (modified) * code/trunk/src/orxonox/ShipPartManager.h (modified) * code/trunk/src/orxonox/controllers/ControllerDirector.cc (modified) * code/trunk/src/orxonox/controllers/ControllerDirector.h (modified) * code/trunk/src/orxonox/controllers/ScriptController.cc (modified) * code/trunk/src/orxonox/controllers/ScriptController.h (modified) * code/trunk/src/orxonox/controllers/testscript.lua (modified) * code/trunk/src/orxonox/items/PartDestructionEvent.cc (modified) * code/trunk/src/orxonox/items/PartDestructionEvent.h (modified) * code/trunk/src/orxonox/items/ShipPart.cc (modified) * code/trunk/src/orxonox/items/ShipPart.h (modified) * code/trunk/src/orxonox/worldentities/pawns/ModularSpaceShip.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/ModularSpaceShip.h (modified) eol-style native. no changes in code. Fri, 06 Feb 2015 22:11:10 GMT landauf [10261] * code/trunk/src/modules/jump/Jump.cc (modified) fixed warning Fri, 06 Feb 2015 22:03:00 GMT landauf [10260] * code/trunk (modified) * code/trunk/data/levels/jump.oxw (modified) * code/trunk/data/overlays/jumpHUD.oxo (modified) * code/trunk/src/modules/jump/Jump.cc (modified) * code/trunk/src/modules/jump/Jump.h (modified) * code/trunk/src/modules/jump/JumpBoots.cc (modified) * code/trunk/src/modules/jump/JumpBoots.h (modified) * code/trunk/src/modules/jump/JumpFigure.cc (modified) * code/trunk/src/modules/jump/JumpFigure.h (modified) * code/trunk/src/modules/jump/JumpItem.h (modified) * code/trunk/src/modules/jump/JumpPropeller.cc (modified) * code/trunk/src/modules/jump/JumpPropeller.h (modified) * code/trunk/src/modules/jump/JumpRocket.cc (modified) * code/trunk/src/modules/jump/JumpRocket.h (modified) * code/trunk/src/modules/jump/JumpScore.cc (modified) * code/trunk/src/modules/jump/JumpScore.h (modified) * code/trunk/src/modules/jump/JumpShield.cc (modified) * code/trunk/src/modules/jump/JumpShield.h (modified) merged the latest changes from pickupsFS14 to trunk Fri, 06 Feb 2015 21:55:17 GMT landauf [10259] * code/trunk (modified) * code/trunk/data/levels/jump.oxw (modified) * code/trunk/src/modules/jump/Jump.cc (modified) recorded merge of pickupsFS14 up to r10112 (which was already mostly ... Thu, 05 Feb 2015 22:47:13 GMT landauf [10258] * code/trunk (modified) * code/trunk/cmake/LibraryConfig.cmake (modified) * code/trunk/data/defaultConfig/orxonox.ini (copied) * code/trunk/data/gui/layouts/CampaignMenu.layout (copied) * code/trunk/data/gui/layouts/SingleplayerMenu.layout (modified) * code/trunk/data/gui/scripts/CampaignMenu.lua (copied) * code/trunk/data/gui/scripts/SingleplayerMenu.lua (modified) * code/trunk/data/levels/4Dtest.oxw (copied) * code/trunk/data/levels/AnihilationThreat.oxw (copied) * code/trunk/data/levels/DodgeRace.oxw (copied) * code/trunk/data/levels/FPS_Level_HS14.oxw (copied) * code/trunk/data/levels/includes/weaponSettingsFPS_HS14.oxi (copied) * code/trunk/data/levels/includes/weaponSettingsTurret1.oxi (copied) * code/trunk/data/levels/kecks.oxw (copied) * code/trunk/data/levels/presentationHS13.oxw (modified) * code/trunk/data/levels/templates/DodgeRacePattern.oxt (copied) * code/trunk/data/levels/templates/FPS.oxt (modified) * code/trunk/data/levels/templates/FPS_HS14.oxt (copied) * code/trunk/data/levels/templates/enemytowerdefense.oxt (copied) * code/trunk/data/levels/templates/spaceshipDodgeRace.oxt (copied) * code/trunk/data/levels/templates/spacestation_elements.oxt (copied) * code/trunk/data/levels/templates/ss_tube01.oxt (copied) * code/trunk/data/levels/templates/tower.oxt (modified) * code/trunk/data/levels/towerDefense.oxw (modified) * code/trunk/data/overlays/DodgeRaceHUD.oxo (copied) * code/trunk/data/overlays/HUDTemplates3.oxo (modified) * code/trunk/data/overlays/towerdefenseHUD.oxo (modified) * code/trunk/src/modules/CMakeLists.txt (modified) * code/trunk/src/modules/dodgerace (copied) * code/trunk/src/modules/mini4dgame (copied) * code/trunk/src/modules/notifications/NotificationQueueCEGUI.cc (modified) * code/trunk/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/trunk/src/modules/overlays/hud/HUDNavigation.h (modified) * code/trunk/src/modules/towerdefense/CMakeLists.txt (modified) * code/trunk/src/modules/towerdefense/TDCoordinate.cc (copied) * code/trunk/src/modules/towerdefense/TDCoordinate.h (copied) * code/trunk/src/modules/towerdefense/TDEnemy.h (modified) * code/trunk/src/modules/towerdefense/Tower.cc (modified) * code/trunk/src/modules/towerdefense/TowerDefense.cc (modified) * code/trunk/src/modules/towerdefense/TowerDefense.h (modified) * code/trunk/src/modules/towerdefense/TowerDefenseController.cc (modified) * code/trunk/src/modules/towerdefense/TowerDefenseEnemy.cc (copied) * code/trunk/src/modules/towerdefense/TowerDefenseEnemy.h (copied) * code/trunk/src/modules/towerdefense/TowerDefenseHUDController.cc (modified) * code/trunk/src/modules/towerdefense/TowerDefenseHUDController.h (modified) * code/trunk/src/modules/towerdefense/TowerDefensePlayerStats.cc (modified) * code/trunk/src/modules/towerdefense/TowerDefensePlayerStats.h (modified) * code/trunk/src/modules/towerdefense/TowerDefensePrereqs.h (modified) * code/trunk/src/modules/towerdefense/TowerDefenseTower.cc (copied) * code/trunk/src/modules/towerdefense/TowerDefenseTower.h (copied) * code/trunk/src/modules/towerdefense/TowerTurret.cc (copied) * code/trunk/src/modules/towerdefense/TowerTurret.h (copied) * code/trunk/src/modules/weapons/RocketController.cc (modified) * code/trunk/src/orxonox/LevelManager.cc (modified) * code/trunk/src/orxonox/LevelManager.h (modified) * code/trunk/src/orxonox/gametypes/Mission.cc (modified) merged presentationHS14merge back to trunk 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