# # ChangeLog for code/branches # # Generated by Trac 1.0.9 # Nov 22, 2024, 2:21:22 PM Thu, 12 Nov 2015 10:27:41 GMT gania [10797] * code/branches/AI_HS15/src/orxonox/controllers/CommonController.cc (modified) * code/branches/AI_HS15/src/orxonox/controllers/DivisionController.cc (modified) low on battery Thu, 12 Nov 2015 08:30:14 GMT gania [10796] * code/branches/AI_HS15/src/orxonox/controllers/CommonController.cc (modified) * code/branches/AI_HS15/src/orxonox/controllers/CommonController.h (modified) * code/branches/AI_HS15/src/orxonox/controllers/DivisionController.cc (modified) Sometimes there are too many rotations Tue, 10 Nov 2015 18:50:34 GMT fvultier [10795] * code/branches/fabienHS15/src/modules/overlays/hud/HUDWeaponMode.cc (modified) * code/branches/fabienHS15/src/modules/weapons/projectiles/Rocket.cc (modified) * code/branches/fabienHS15/src/modules/weapons/projectiles/SimpleRocket.cc (modified) Tue, 10 Nov 2015 18:47:39 GMT fvultier [10794] * code/branches/fabienHS15/data/overlays/jumpHUD.oxo (modified) * code/branches/fabienHS15/src/modules/overlays/hud/HUDWeapon.cc (modified) * code/branches/fabienHS15/src/modules/overlays/hud/HUDWeaponMode.cc (modified) * code/branches/fabienHS15/src/modules/overlays/hud/HUDWeaponSystem.cc (modified) * code/branches/fabienHS15/src/modules/weapons/projectiles/Rocket.cc (modified) * code/branches/fabienHS15/src/modules/weapons/projectiles/SimpleRocket.cc (modified) * code/branches/fabienHS15/src/modules/weapons/weaponmodes/RocketFire.cc (modified) * code/branches/fabienHS15/src/modules/weapons/weaponmodes/SimpleRocketFire.cc (modified) * code/branches/fabienHS15/src/orxonox/weaponsystem/Munition.h (modified) bug in the WeaponHUD fixed. Tue, 10 Nov 2015 15:37:34 GMT gania [10793] * code/branches/AI_HS15/src/orxonox/controllers/CommonController.cc (modified) * code/branches/AI_HS15/src/orxonox/controllers/CommonController.h (modified) * code/branches/AI_HS15/src/orxonox/controllers/DivisionController.cc (modified) * code/branches/AI_HS15/src/orxonox/controllers/FleetController.cc (modified) added choose maneuver type functionality Mon, 09 Nov 2015 16:56:56 GMT paulsc [10792] * code/branches/campaignHS15/data/levels/Campaign1.oxw (modified) Made number of enemies increase over time, added fps undock, advanced ... Mon, 09 Nov 2015 16:55:42 GMT fvultier [10791] * code/branches/fabienHS15/data/levels/includes/invaderWeapon.oxi (modified) * code/branches/fabienHS15/data/levels/includes/invaderWeaponEnemy.oxi (modified) * code/branches/fabienHS15/data/levels/includes/towerWeaponSettings.oxi (deleted) * code/branches/fabienHS15/data/levels/includes/weaponSettingsAssff.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsAssff2.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsCollateral.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsEscort.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsFPS.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsFPS_HS14.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsFS15.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsGhost.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsH2.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsHXY.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsHeartAttack.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsHeavyCruiser.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsHeavyCruiserBody.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsImmTest.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsPirate.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsRing.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsSpacecruiser.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsSwallow.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsTransporter.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsTurret.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsTurret1.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsbigship.oxi (modified) * code/branches/fabienHS15/data/levels/templates/pickupRepresentationTemplates.oxt (modified) * code/branches/fabienHS15/data/levels/towerDefense.oxw (modified) * code/branches/fabienHS15/src/modules/overlays/hud/HUDWeaponMode.cc (modified) * code/branches/fabienHS15/src/modules/weapons/munitions/FusionMunition.cc (modified) * code/branches/fabienHS15/src/modules/weapons/munitions/FusionMunition.h (modified) * code/branches/fabienHS15/src/modules/weapons/munitions/GravityBombMunition.cc (modified) * code/branches/fabienHS15/src/modules/weapons/munitions/GravityBombMunition.h (modified) * code/branches/fabienHS15/src/modules/weapons/munitions/IceMunition.cc (modified) * code/branches/fabienHS15/src/modules/weapons/munitions/IceMunition.h (modified) * code/branches/fabienHS15/src/modules/weapons/munitions/LaserMunition.cc (modified) * code/branches/fabienHS15/src/modules/weapons/munitions/LaserMunition.h (modified) * code/branches/fabienHS15/src/modules/weapons/munitions/LightningMunition.cc (modified) * code/branches/fabienHS15/src/modules/weapons/munitions/LightningMunition.h (modified) * code/branches/fabienHS15/src/modules/weapons/munitions/RocketMunition.cc (modified) * code/branches/fabienHS15/src/modules/weapons/munitions/RocketMunition.h (modified) * code/branches/fabienHS15/src/modules/weapons/munitions/SplitMunition.cc (modified) * code/branches/fabienHS15/src/modules/weapons/munitions/SplitMunition.h (modified) * code/branches/fabienHS15/src/orxonox/weaponsystem/Munition.cc (modified) * code/branches/fabienHS15/src/orxonox/weaponsystem/Munition.h (modified) * code/branches/fabienHS15/src/orxonox/weaponsystem/ReplenishingMunition.cc (modified) * code/branches/fabienHS15/src/orxonox/weaponsystem/ReplenishingMunition.h (modified) * code/branches/fabienHS15/src/orxonox/weaponsystem/Weapon.cc (modified) * code/branches/fabienHS15/src/orxonox/weaponsystem/Weapon.h (modified) * code/branches/fabienHS15/src/orxonox/weaponsystem/WeaponMode.cc (modified) * code/branches/fabienHS15/src/orxonox/weaponsystem/WeaponMode.h (modified) * code/branches/fabienHS15/src/orxonox/weaponsystem/WeaponPack.cc (modified) * code/branches/fabienHS15/src/orxonox/weaponsystem/WeaponPack.h (modified) * code/branches/fabienHS15/src/orxonox/weaponsystem/WeaponSystem.cc (modified) * code/branches/fabienHS15/src/orxonox/weaponsystem/WeaponSystem.h (modified) * code/branches/fabienHS15/src/orxonox/worldentities/MobileEntity.h (modified) * code/branches/fabienHS15/src/orxonox/worldentities/StaticEntity.h (modified) * code/branches/fabienHS15/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/branches/fabienHS15/src/orxonox/worldentities/pawns/Pawn.h (modified) * code/branches/fabienHS15/src/orxonox/worldentities/pawns/SpaceShip.h (modified) Munition may and must now be defined for each pawn separately. This ... Mon, 09 Nov 2015 15:38:02 GMT gania [10789] * code/branches/AI_HS15/data/levels/AITest.oxw (modified) * code/branches/AI_HS15/src/orxonox/controllers/CommonController.cc (modified) * code/branches/AI_HS15/src/orxonox/controllers/CommonController.h (modified) * code/branches/AI_HS15/src/orxonox/controllers/DivisionController.cc (modified) * code/branches/AI_HS15/src/orxonox/controllers/FleetController.cc (modified) * code/branches/AI_HS15/src/orxonox/controllers/SectionController.cc (modified) * code/branches/AI_HS15/src/orxonox/controllers/WingmanController.cc (modified) did nothing today Mon, 09 Nov 2015 15:02:14 GMT hzuellig [10788] * code/branches/planetLevelHS15/data/levels/betterearth.oxw (modified) skyscrapers and stuff Mon, 09 Nov 2015 14:54:40 GMT meierman [10787] * code/branches/hoverHS15/data/levels/Hover.oxw (modified) * code/branches/hoverHS15/src/modules/hover/Hover.cc (modified) * code/branches/hoverHS15/src/modules/hover/HoverWall.cc (modified) programm wall placement works Mon, 09 Nov 2015 14:51:17 GMT vaydin [10786] * code/branches/explosionChunksHS15/data/levels/emptyLevel.oxw (modified) * code/branches/explosionChunksHS15/src/orxonox/worldentities/ExplosionPart.cc (modified) * code/branches/explosionChunksHS15/src/orxonox/worldentities/ExplosionPart.h (modified) * code/branches/explosionChunksHS15/src/orxonox/worldentities/pawns/Pawn.cc (modified) added ability to attach second particle effect to explosionpart, ... Mon, 09 Nov 2015 13:14:47 GMT meierman [10785] * code/branches/hoverHS15/data/levels/Hover.oxw (modified) * code/branches/hoverHS15/src/modules/hover/Hover.cc (modified) * code/branches/hoverHS15/src/modules/hover/HoverWall.cc (modified) * code/branches/hoverHS15/src/modules/hover/HoverWall.h (modified) Placing Walls works Mon, 09 Nov 2015 13:09:38 GMT bucyril [10784] * code/branches/hoverHS15/data/levels/templates/spaceshipHover.oxt (modified) * code/branches/hoverHS15/src/modules/hover/HoverShip.cc (modified) * code/branches/hoverHS15/src/modules/hover/HoverShip.h (modified) Finished hover ship control and resolved merge conflict --this line, ... Mon, 09 Nov 2015 12:57:59 GMT bhatiab [10783] * code/branches/campaignHS15/data/levels/Campaign1.oxw (modified) Finished descriptions for the quests Mon, 09 Nov 2015 10:19:51 GMT gania [10782] * code/branches/AI_HS15/src/orxonox/controllers/CommonController.cc (modified) * code/branches/AI_HS15/src/orxonox/controllers/CommonController.h (modified) not compilable change to move behaviour Sun, 08 Nov 2015 20:10:30 GMT landauf [10781] * code/branches/cpp11_v2/src/libraries/core/command/ExecutorPtr.h (modified) * code/branches/cpp11_v2/src/libraries/core/command/FunctorPtr.h (modified) in C++11 it's now possible to define 'typedefs' for templates (called ... Sun, 08 Nov 2015 17:19:12 GMT gania [10780] * code/branches/AI_HS15/src/orxonox/controllers/CommonController.cc (modified) * code/branches/AI_HS15/src/orxonox/controllers/CommonController.h (modified) * code/branches/AI_HS15/src/orxonox/controllers/DivisionController.cc (modified) * code/branches/AI_HS15/src/orxonox/controllers/SectionController.cc (modified) * code/branches/AI_HS15/src/orxonox/controllers/WingmanController.cc (modified) * code/branches/AI_HS15/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/branches/AI_HS15/src/orxonox/worldentities/pawns/Pawn.h (modified) fixed firing direction Sun, 08 Nov 2015 16:21:46 GMT bhatiab [10779] * code/branches/campaignHS15/data/levels/Campaign1.oxw (modified) Added a few Descriptions Sun, 08 Nov 2015 14:12:17 GMT landauf [10778] * code/branches/cpp11_v2/src/libraries/core/input/InputManager.cc (modified) * code/branches/cpp11_v2/src/libraries/core/input/JoyStick.cc (modified) use range-based-for-loop instead of BOOST_FOREACH Sun, 08 Nov 2015 10:16:22 GMT landauf [10777] * code/branches/cpp11_v2/src/libraries/core/Loader.cc (modified) * code/branches/cpp11_v2/src/libraries/util/StringUtils.cc (modified) replacing boost::scoped_ptr/array with 'const std::unique_ptr' Sun, 08 Nov 2015 10:11:00 GMT landauf [10776] * code/branches/cpp11_v2/src/libraries/core/config/ConfigFileManager.cc (modified) * code/branches/cpp11_v2/src/libraries/core/config/ConfigFileManager.h (modified) using std::array instead of boost::array Sun, 08 Nov 2015 09:40:44 GMT landauf [10775] * code/branches/cpp11_v2/src/external/cpptcl/cpptcl.h (modified) * code/branches/cpp11_v2/src/external/cpptcl/details/methods.h (modified) * code/branches/cpp11_v2/src/external/cpptcl/details/methods_v.h (modified) * code/branches/cpp11_v2/src/libraries/core/GUIManager.cc (modified) * code/branches/cpp11_v2/src/libraries/core/Thread.cc (modified) * code/branches/cpp11_v2/src/libraries/core/ThreadWin.cc (modified) * code/branches/cpp11_v2/src/libraries/core/command/TclThreadManager.cc (modified) * code/branches/cpp11_v2/src/libraries/core/input/InputManager.h (modified) * code/branches/cpp11_v2/src/libraries/core/input/InputState.h (modified) * code/branches/cpp11_v2/src/libraries/network/TrafficControl.cc (modified) using std::bind and std::function instead of boost::bind and ... Sat, 07 Nov 2015 21:46:11 GMT landauf [10774] * code/branches/cpp11_v2/src/libraries/core/class/Identifier.h (modified) * code/branches/cpp11_v2/src/libraries/core/object/IteratorBase.h (modified) * code/branches/cpp11_v2/src/libraries/core/object/ObjectList.h (modified) * code/branches/cpp11_v2/src/libraries/network/Connection.h (modified) * code/branches/cpp11_v2/src/libraries/network/GamestateManager.h (modified) * code/branches/cpp11_v2/src/libraries/network/NetworkFunctionIncludes.h (modified) * code/branches/cpp11_v2/src/libraries/network/packet/Packet.cc (modified) * code/branches/cpp11_v2/src/modules/overlays/OverlayText.cc (modified) * code/branches/cpp11_v2/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/branches/cpp11_v2/src/orxonox/graphics/Light.cc (modified) * code/branches/cpp11_v2/src/orxonox/worldentities/WorldEntity.cc (modified) using static_assert instead of BOOST_STATIC_ASSERT Sat, 07 Nov 2015 17:03:26 GMT landauf [10773] * code/branches/cpp11_v2/src/external/tinyxml/ticpp.cpp (modified) * code/branches/cpp11_v2/src/external/tinyxml/ticpp.h (modified) * code/branches/cpp11_v2/src/libraries/core/GUIManager.cc (modified) using std::unique_ptr instead of std::auto_ptr Sat, 07 Nov 2015 16:38:21 GMT landauf [10772] * code/branches/cpp11_v2/src/libraries/core/Game.cc (modified) * code/branches/cpp11_v2/src/libraries/core/Game.h (modified) * code/branches/cpp11_v2/src/libraries/core/Loader.cc (modified) * code/branches/cpp11_v2/src/libraries/core/Resource.cc (modified) * code/branches/cpp11_v2/src/libraries/core/input/KeyBinder.cc (modified) use std::make_shared for better performance with shared_ptr Sat, 07 Nov 2015 16:24:58 GMT landauf [10771] * code/branches/cpp11_v2/src/OrxonoxConfig.h.in (modified) * code/branches/cpp11_v2/src/external/cpptcl/cpptcl.cc (modified) * code/branches/cpp11_v2/src/external/cpptcl/cpptcl.h (modified) * code/branches/cpp11_v2/src/libraries/core/CorePrecompiledHeaders.h (modified) * code/branches/cpp11_v2/src/libraries/core/GUIManager.h (modified) * code/branches/cpp11_v2/src/libraries/core/Game.cc (modified) * code/branches/cpp11_v2/src/libraries/core/Game.h (modified) * code/branches/cpp11_v2/src/libraries/core/GraphicsManager.cc (modified) * code/branches/cpp11_v2/src/libraries/core/GraphicsManager.h (modified) * code/branches/cpp11_v2/src/libraries/core/Loader.cc (modified) * code/branches/cpp11_v2/src/libraries/core/LuaState.cc (modified) * code/branches/cpp11_v2/src/libraries/core/LuaState.h (modified) * code/branches/cpp11_v2/src/libraries/core/Resource.cc (modified) * code/branches/cpp11_v2/src/libraries/core/Resource.h (modified) * code/branches/cpp11_v2/src/libraries/core/input/KeyBinder.cc (modified) * code/branches/cpp11_v2/src/libraries/core/input/KeyBinder.h (modified) * code/branches/cpp11_v2/src/orxonox/sound/AmbientSound.cc (modified) * code/branches/cpp11_v2/src/orxonox/sound/BaseSound.h (modified) * code/branches/cpp11_v2/src/orxonox/sound/SoundBuffer.cc (modified) * code/branches/cpp11_v2/src/orxonox/sound/SoundBuffer.h (modified) * code/branches/cpp11_v2/src/orxonox/sound/SoundManager.cc (modified) * code/branches/cpp11_v2/src/orxonox/sound/SoundManager.h (modified) using std::shared_ptr instead of boost::shared_ptr (same for weak_ptr) Sat, 07 Nov 2015 13:42:14 GMT landauf [10770] * code/branches/cpp11_v2/src/libraries/core/ClassTreeMask.h (modified) * code/branches/cpp11_v2/src/libraries/core/object/IteratorBase.h (modified) * code/branches/cpp11_v2/src/libraries/core/object/StrongPtr.h (modified) * code/branches/cpp11_v2/src/libraries/core/object/WeakPtr.h (modified) * code/branches/cpp11_v2/src/libraries/util/SharedPtr.h (modified) * code/branches/cpp11_v2/test/util/SharedPtrTest.cc (modified) made conversion to bool operators explicit Sat, 07 Nov 2015 09:23:42 GMT landauf [10769] * code/branches/cpp11_v2/src/OrxonoxConfig.h.in (modified) * code/branches/cpp11_v2/src/libraries/core/ClassTreeMask.h (modified) * code/branches/cpp11_v2/src/libraries/core/ConfigurablePaths.cc (modified) * code/branches/cpp11_v2/src/libraries/core/EventIncludes.h (modified) * code/branches/cpp11_v2/src/libraries/core/GUIManager.cc (modified) * code/branches/cpp11_v2/src/libraries/core/Game.cc (modified) * code/branches/cpp11_v2/src/libraries/core/Game.h (modified) * code/branches/cpp11_v2/src/libraries/core/Loader.cc (modified) * code/branches/cpp11_v2/src/libraries/core/Loader.h (modified) * code/branches/cpp11_v2/src/libraries/core/LuaState.cc (modified) * code/branches/cpp11_v2/src/libraries/core/LuaState.h (modified) * code/branches/cpp11_v2/src/libraries/core/class/Identifiable.h (modified) * code/branches/cpp11_v2/src/libraries/core/class/Identifier.h (modified) * code/branches/cpp11_v2/src/libraries/core/class/IdentifierManager.h (modified) * code/branches/cpp11_v2/src/libraries/core/command/ArgumentCompletionFunctions.cc (modified) * code/branches/cpp11_v2/src/libraries/core/command/CommandEvaluation.cc (modified) * code/branches/cpp11_v2/src/libraries/core/command/ConsoleCommandManager.cc (modified) * code/branches/cpp11_v2/src/libraries/core/command/ConsoleCommandManager.h (modified) * code/branches/cpp11_v2/src/libraries/core/command/ExecutorPtr.h (modified) * code/branches/cpp11_v2/src/libraries/core/command/FunctorPtr.h (modified) * code/branches/cpp11_v2/src/libraries/core/command/Shell.h (modified) * code/branches/cpp11_v2/src/libraries/core/config/SettingsConfigFile.h (modified) * code/branches/cpp11_v2/src/libraries/core/input/InputManager.h (modified) * code/branches/cpp11_v2/src/libraries/core/input/KeyBinder.h (modified) * code/branches/cpp11_v2/src/libraries/core/module/ModuleInstance.cc (modified) * code/branches/cpp11_v2/src/libraries/core/module/ModuleInstance.h (modified) * code/branches/cpp11_v2/src/libraries/core/object/DestroyLaterManager.h (modified) * code/branches/cpp11_v2/src/libraries/core/object/Iterator.h (modified) * code/branches/cpp11_v2/src/libraries/core/object/ObjectListIterator.h (modified) * code/branches/cpp11_v2/src/libraries/core/singleton/ScopeManager.h (modified) * code/branches/cpp11_v2/src/libraries/network/FunctionCallManager.cc (modified) * code/branches/cpp11_v2/src/libraries/network/FunctionCallManager.h (modified) * code/branches/cpp11_v2/src/libraries/network/GamestateManager.cc (modified) * code/branches/cpp11_v2/src/libraries/network/GamestateManager.h (modified) * code/branches/cpp11_v2/src/libraries/network/TrafficControl.cc (modified) * code/branches/cpp11_v2/src/libraries/network/TrafficControl.h (modified) * code/branches/cpp11_v2/src/libraries/network/packet/ClassID.cc (modified) * code/branches/cpp11_v2/src/libraries/network/packet/FunctionIDs.cc (modified) * code/branches/cpp11_v2/src/libraries/network/synchronisable/Serialise.h (modified) * code/branches/cpp11_v2/src/libraries/network/synchronisable/Synchronisable.h (modified) * code/branches/cpp11_v2/src/libraries/tools/TextureGenerator.cc (modified) * code/branches/cpp11_v2/src/libraries/tools/TextureGenerator.h (modified) * code/branches/cpp11_v2/src/libraries/util/SharedPtr.h (modified) * code/branches/cpp11_v2/src/modules/designtools/SkyboxGenerator.h (modified) * code/branches/cpp11_v2/src/modules/mini4dgame/Mini4DgameAI.h (modified) * code/branches/cpp11_v2/src/modules/objects/SpaceBoundaries.cc (modified) * code/branches/cpp11_v2/src/modules/objects/SpaceBoundaries.h (modified) * code/branches/cpp11_v2/src/modules/objects/triggers/DistanceMultiTrigger.cc (modified) * code/branches/cpp11_v2/src/modules/objects/triggers/DistanceMultiTrigger.h (modified) * code/branches/cpp11_v2/src/modules/objects/triggers/MultiTrigger.h (modified) * code/branches/cpp11_v2/src/modules/objects/triggers/Trigger.h (modified) * code/branches/cpp11_v2/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/branches/cpp11_v2/src/modules/overlays/hud/HUDNavigation.h (modified) * code/branches/cpp11_v2/src/modules/pickup/PickupManager.h (modified) * code/branches/cpp11_v2/src/modules/pickup/items/ShrinkPickup.cc (modified) * code/branches/cpp11_v2/src/modules/pong/PongAI.cc (modified) * code/branches/cpp11_v2/src/modules/pong/PongAI.h (modified) * code/branches/cpp11_v2/src/modules/tetris/Tetris.cc (modified) * code/branches/cpp11_v2/src/modules/tetris/Tetris.h (modified) * code/branches/cpp11_v2/src/modules/towerdefense/TowerDefense.cc (modified) * code/branches/cpp11_v2/src/modules/towerdefense/TowerDefense.h (modified) * code/branches/cpp11_v2/src/orxonox/controllers/ArtificialController.h (modified) * code/branches/cpp11_v2/src/orxonox/infos/PlayerInfo.h (modified) * code/branches/cpp11_v2/src/orxonox/overlays/OverlayGroup.cc (modified) * code/branches/cpp11_v2/src/orxonox/overlays/OverlayGroup.h (modified) * code/branches/cpp11_v2/src/orxonox/sound/SoundBuffer.cc (modified) * code/branches/cpp11_v2/src/orxonox/sound/SoundBuffer.h (modified) * code/branches/cpp11_v2/src/orxonox/sound/SoundManager.cc (modified) * code/branches/cpp11_v2/src/orxonox/sound/SoundManager.h (modified) * code/branches/cpp11_v2/src/orxonox/worldentities/ControllableEntity.cc (modified) * code/branches/cpp11_v2/src/orxonox/worldentities/ControllableEntity.h (modified) * code/branches/cpp11_v2/test/util/SharedPtrTest.cc (modified) no space needed anymore between closing template brackets ('> >' -> '>>') Fri, 06 Nov 2015 21:54:34 GMT landauf [10768] * code/branches/cpp11_v2/src/libraries/core/ApplicationPaths.cc (modified) * code/branches/cpp11_v2/src/libraries/core/BaseObject.cc (modified) * code/branches/cpp11_v2/src/libraries/core/BaseObject.h (modified) * code/branches/cpp11_v2/src/libraries/core/ClassTreeMask.cc (modified) * code/branches/cpp11_v2/src/libraries/core/ClassTreeMask.h (modified) * code/branches/cpp11_v2/src/libraries/core/ConfigurablePaths.cc (modified) * code/branches/cpp11_v2/src/libraries/core/Core.cc (modified) * code/branches/cpp11_v2/src/libraries/core/GUIManager.cc (modified) * code/branches/cpp11_v2/src/libraries/core/GUIManager.h (modified) * code/branches/cpp11_v2/src/libraries/core/Game.cc (modified) * code/branches/cpp11_v2/src/libraries/core/GraphicsManager.cc (modified) * code/branches/cpp11_v2/src/libraries/core/Language.cc (modified) * code/branches/cpp11_v2/src/libraries/core/Loader.cc (modified) * code/branches/cpp11_v2/src/libraries/core/Namespace.cc (modified) * code/branches/cpp11_v2/src/libraries/core/NamespaceNode.h (modified) * code/branches/cpp11_v2/src/libraries/core/Template.cc (modified) * code/branches/cpp11_v2/src/libraries/core/Thread.cc (modified) * code/branches/cpp11_v2/src/libraries/core/ThreadWin.cc (modified) * code/branches/cpp11_v2/src/libraries/core/XMLPort.h (modified) * code/branches/cpp11_v2/src/libraries/core/class/Identifiable.cc (modified) * code/branches/cpp11_v2/src/libraries/core/class/Identifier.cc (modified) * code/branches/cpp11_v2/src/libraries/core/class/Identifier.h (modified) * code/branches/cpp11_v2/src/libraries/core/class/IdentifierManager.cc (modified) * code/branches/cpp11_v2/src/libraries/core/class/SubclassIdentifier.h (modified) * code/branches/cpp11_v2/src/libraries/core/class/Super.h (modified) * code/branches/cpp11_v2/src/libraries/core/command/CommandEvaluation.cc (modified) * code/branches/cpp11_v2/src/libraries/core/command/CommandEvaluation.h (modified) * code/branches/cpp11_v2/src/libraries/core/command/CommandExecutor.h (modified) * code/branches/cpp11_v2/src/libraries/core/command/ConsoleCommand.cc (modified) * code/branches/cpp11_v2/src/libraries/core/command/ConsoleCommandManager.cc (modified) * code/branches/cpp11_v2/src/libraries/core/command/Executor.h (modified) * code/branches/cpp11_v2/src/libraries/core/command/Functor.h (modified) * code/branches/cpp11_v2/src/libraries/core/command/IOConsolePOSIX.cc (modified) * code/branches/cpp11_v2/src/libraries/core/command/IRC.cc (modified) * code/branches/cpp11_v2/src/libraries/core/command/TclBind.cc (modified) * code/branches/cpp11_v2/src/libraries/core/command/TclBind.h (modified) * code/branches/cpp11_v2/src/libraries/core/command/TclThreadManager.cc (modified) * code/branches/cpp11_v2/src/libraries/core/commandline/CommandLineParser.cc (modified) * code/branches/cpp11_v2/src/libraries/core/config/ConfigFile.cc (modified) * code/branches/cpp11_v2/src/libraries/core/config/ConfigFileManager.cc (modified) * code/branches/cpp11_v2/src/libraries/core/config/ConfigValueContainer.cc (modified) * code/branches/cpp11_v2/src/libraries/core/config/SettingsConfigFile.cc (modified) * code/branches/cpp11_v2/src/libraries/core/input/Button.cc (modified) * code/branches/cpp11_v2/src/libraries/core/input/HalfAxis.h (modified) * code/branches/cpp11_v2/src/libraries/core/input/InputCommands.h (modified) * code/branches/cpp11_v2/src/libraries/core/input/InputManager.cc (modified) * code/branches/cpp11_v2/src/libraries/core/input/InputState.cc (modified) * code/branches/cpp11_v2/src/libraries/core/input/KeyBinder.cc (modified) * code/branches/cpp11_v2/src/libraries/core/input/KeyBinderManager.cc (modified) * code/branches/cpp11_v2/src/libraries/core/input/Mouse.cc (modified) * code/branches/cpp11_v2/src/libraries/core/module/DynLibManager.cc (modified) * code/branches/cpp11_v2/src/libraries/core/module/PluginManager.cc (modified) * code/branches/cpp11_v2/src/libraries/core/module/StaticInitializationManager.cc (modified) * code/branches/cpp11_v2/src/libraries/core/object/Context.cc (modified) * code/branches/cpp11_v2/src/libraries/core/object/ObjectListBase.cc (modified) * code/branches/cpp11_v2/src/libraries/core/object/ObjectListBase.h (modified) * code/branches/cpp11_v2/src/libraries/core/object/StrongPtr.h (modified) * code/branches/cpp11_v2/src/libraries/core/object/WeakPtr.h (modified) * code/branches/cpp11_v2/src/libraries/core/singleton/ScopeManager.cc (modified) * code/branches/cpp11_v2/src/libraries/network/Connection.cc (modified) * code/branches/cpp11_v2/src/libraries/network/GamestateHandler.cc (modified) * code/branches/cpp11_v2/src/libraries/network/GamestateManager.cc (modified) * code/branches/cpp11_v2/src/libraries/network/Host.cc (modified) * code/branches/cpp11_v2/src/libraries/network/LANDiscoverable.cc (modified) * code/branches/cpp11_v2/src/libraries/network/NetworkFunction.h (modified) * code/branches/cpp11_v2/src/libraries/network/NetworkFunctionManager.cc (modified) * code/branches/cpp11_v2/src/libraries/network/Server.cc (modified) * code/branches/cpp11_v2/src/libraries/network/TrafficControl.cc (modified) * code/branches/cpp11_v2/src/libraries/network/packet/Gamestate.cc (modified) * code/branches/cpp11_v2/src/libraries/network/packet/Gamestate.h (modified) * code/branches/cpp11_v2/src/libraries/network/packet/Packet.cc (modified) * code/branches/cpp11_v2/src/libraries/network/synchronisable/Synchronisable.cc (modified) * code/branches/cpp11_v2/src/libraries/network/synchronisable/Synchronisable.h (modified) * code/branches/cpp11_v2/src/libraries/network/synchronisable/SynchronisableVariable.h (modified) * code/branches/cpp11_v2/src/libraries/tools/BillboardSet.cc (modified) * code/branches/cpp11_v2/src/libraries/tools/DebugDrawer.cc (modified) * code/branches/cpp11_v2/src/libraries/tools/Mesh.cc (modified) * code/branches/cpp11_v2/src/libraries/tools/ParticleInterface.cc (modified) * code/branches/cpp11_v2/src/libraries/tools/Shader.cc (modified) * code/branches/cpp11_v2/src/libraries/tools/Shader.h (modified) * code/branches/cpp11_v2/src/libraries/tools/Timer.cc (modified) * code/branches/cpp11_v2/src/libraries/util/Math.h (modified) * code/branches/cpp11_v2/src/libraries/util/MultiType.h (modified) * code/branches/cpp11_v2/src/libraries/util/MultiTypeValue.h (modified) * code/branches/cpp11_v2/src/libraries/util/SharedPtr.h (modified) * code/branches/cpp11_v2/src/libraries/util/SignalHandler.cc (modified) * code/branches/cpp11_v2/src/libraries/util/SmallObjectAllocator.cc (modified) * code/branches/cpp11_v2/src/libraries/util/output/OutputManager.cc (modified) * code/branches/cpp11_v2/src/modules/dodgerace/DodgeRace.cc (modified) * code/branches/cpp11_v2/src/modules/dodgerace/DodgeRaceHUDinfo.cc (modified) * code/branches/cpp11_v2/src/modules/gametypes/SpaceRaceController.cc (modified) * code/branches/cpp11_v2/src/modules/gametypes/SpaceRaceManager.cc (modified) * code/branches/cpp11_v2/src/modules/invader/Invader.cc (modified) * code/branches/cpp11_v2/src/modules/invader/InvaderHUDinfo.cc (modified) * code/branches/cpp11_v2/src/modules/jump/Jump.cc (modified) * code/branches/cpp11_v2/src/modules/jump/JumpEnemy.cc (modified) * code/branches/cpp11_v2/src/modules/jump/JumpItem.cc (modified) * code/branches/cpp11_v2/src/modules/jump/JumpPlatform.cc (modified) * code/branches/cpp11_v2/src/modules/jump/JumpProjectile.cc (modified) * code/branches/cpp11_v2/src/modules/jump/JumpSpring.cc (modified) * code/branches/cpp11_v2/src/modules/mini4dgame/Mini4Dgame.cc (modified) * code/branches/cpp11_v2/src/modules/mini4dgame/Mini4DgameAI.cc (modified) * code/branches/cpp11_v2/src/modules/mini4dgame/Mini4DgameBoard.cc (modified) * code/branches/cpp11_v2/src/modules/objects/Attacher.cc (modified) * code/branches/cpp11_v2/src/modules/objects/controllers/TurretController.cc (modified) * code/branches/cpp11_v2/src/modules/objects/eventsystem/EventDispatcher.cc (modified) * code/branches/cpp11_v2/src/modules/objects/eventsystem/EventFilter.cc (modified) * code/branches/cpp11_v2/src/modules/overlays/hud/AnnounceMessage.cc (modified) * code/branches/cpp11_v2/src/modules/overlays/hud/CountDown.cc (modified) * code/branches/cpp11_v2/src/modules/overlays/hud/DeathMessage.cc (modified) * code/branches/cpp11_v2/src/modules/overlays/hud/GametypeFadingMessage.cc (modified) * code/branches/cpp11_v2/src/modules/overlays/hud/GametypeStaticMessage.cc (modified) * code/branches/cpp11_v2/src/modules/overlays/hud/HUDBar.cc (modified) * code/branches/cpp11_v2/src/modules/overlays/hud/HUDBoostBar.cc (modified) * code/branches/cpp11_v2/src/modules/overlays/hud/HUDEnemyHealthBar.cc (modified) * code/branches/cpp11_v2/src/modules/overlays/hud/HUDHealthBar.cc (modified) * code/branches/cpp11_v2/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/branches/cpp11_v2/src/modules/overlays/hud/HUDRadar.cc (modified) * code/branches/cpp11_v2/src/modules/overlays/hud/HUDSpeedBar.cc (modified) * code/branches/cpp11_v2/src/modules/overlays/hud/HUDTimer.cc (modified) * code/branches/cpp11_v2/src/modules/overlays/hud/KillMessage.cc (modified) * code/branches/cpp11_v2/src/modules/overlays/hud/LastManStandingInfos.cc (modified) * code/branches/cpp11_v2/src/modules/overlays/hud/LastTeamStandingInfos.cc (modified) * code/branches/cpp11_v2/src/modules/overlays/hud/PauseNotice.cc (modified) * code/branches/cpp11_v2/src/modules/overlays/hud/TeamBaseMatchScore.cc (modified) * code/branches/cpp11_v2/src/modules/overlays/stats/CreateLines.cc (modified) * code/branches/cpp11_v2/src/modules/overlays/stats/Stats.cc (modified) * code/branches/cpp11_v2/src/modules/pong/Pong.cc (modified) * code/branches/cpp11_v2/src/modules/pong/PongAI.cc (modified) * code/branches/cpp11_v2/src/modules/pong/PongBall.cc (modified) * code/branches/cpp11_v2/src/modules/pong/PongScore.cc (modified) * code/branches/cpp11_v2/src/modules/portals/PortalEndPoint.cc (modified) * code/branches/cpp11_v2/src/modules/portals/PortalLink.cc (modified) * code/branches/cpp11_v2/src/modules/tetris/Tetris.cc (modified) * code/branches/cpp11_v2/src/modules/tetris/TetrisScore.cc (modified) * code/branches/cpp11_v2/src/modules/towerdefense/TowerDefenseHUDController.cc (modified) * code/branches/cpp11_v2/src/modules/weapons/projectiles/ParticleProjectile.cc (modified) * code/branches/cpp11_v2/src/modules/weapons/projectiles/Rocket.cc (modified) * code/branches/cpp11_v2/src/modules/weapons/projectiles/RocketOld.cc (modified) * code/branches/cpp11_v2/src/orxonox/CameraManager.cc (modified) * code/branches/cpp11_v2/src/orxonox/Level.cc (modified) * code/branches/cpp11_v2/src/orxonox/LevelManager.cc (modified) * code/branches/cpp11_v2/src/orxonox/PlayerManager.cc (modified) * code/branches/cpp11_v2/src/orxonox/Radar.cc (modified) * code/branches/cpp11_v2/src/orxonox/Scene.cc (modified) * code/branches/cpp11_v2/src/orxonox/Scene.h (modified) * code/branches/cpp11_v2/src/orxonox/Test.cc (modified) * code/branches/cpp11_v2/src/orxonox/collisionshapes/CollisionShape.cc (modified) * code/branches/cpp11_v2/src/orxonox/collisionshapes/CompoundCollisionShape.cc (modified) * code/branches/cpp11_v2/src/orxonox/collisionshapes/CompoundCollisionShape.h (modified) * code/branches/cpp11_v2/src/orxonox/collisionshapes/WorldEntityCollisionShape.cc (modified) * code/branches/cpp11_v2/src/orxonox/controllers/ArtificialController.cc (modified) * code/branches/cpp11_v2/src/orxonox/controllers/Controller.cc (modified) * code/branches/cpp11_v2/src/orxonox/controllers/DroneController.cc (modified) * code/branches/cpp11_v2/src/orxonox/controllers/FormationController.cc (modified) * code/branches/cpp11_v2/src/orxonox/controllers/HumanController.cc (modified) * code/branches/cpp11_v2/src/orxonox/controllers/NewHumanController.cc (modified) * code/branches/cpp11_v2/src/orxonox/controllers/WaypointPatrolController.cc (modified) * code/branches/cpp11_v2/src/orxonox/gamestates/GSLevel.cc (modified) * code/branches/cpp11_v2/src/orxonox/gamestates/GSMainMenu.cc (modified) * code/branches/cpp11_v2/src/orxonox/gamestates/GSRoot.cc (modified) * code/branches/cpp11_v2/src/orxonox/gamestates/GSServer.cc (modified) * code/branches/cpp11_v2/src/orxonox/gametypes/Asteroids.h (modified) * code/branches/cpp11_v2/src/orxonox/gametypes/Deathmatch.h (modified) * code/branches/cpp11_v2/src/orxonox/gametypes/Dynamicmatch.cc (modified) * code/branches/cpp11_v2/src/orxonox/gametypes/Dynamicmatch.h (modified) * code/branches/cpp11_v2/src/orxonox/gametypes/Gametype.cc (modified) * code/branches/cpp11_v2/src/orxonox/gametypes/Gametype.h (modified) * code/branches/cpp11_v2/src/orxonox/gametypes/LastManStanding.h (modified) * code/branches/cpp11_v2/src/orxonox/gametypes/LastTeamStanding.h (modified) * code/branches/cpp11_v2/src/orxonox/gametypes/Mission.h (modified) * code/branches/cpp11_v2/src/orxonox/gametypes/TeamBaseMatch.cc (modified) * code/branches/cpp11_v2/src/orxonox/gametypes/TeamBaseMatch.h (modified) * code/branches/cpp11_v2/src/orxonox/gametypes/TeamDeathmatch.h (modified) * code/branches/cpp11_v2/src/orxonox/gametypes/TeamGametype.cc (modified) * code/branches/cpp11_v2/src/orxonox/gametypes/TeamGametype.h (modified) * code/branches/cpp11_v2/src/orxonox/gametypes/UnderAttack.cc (modified) * code/branches/cpp11_v2/src/orxonox/gametypes/UnderAttack.h (modified) * code/branches/cpp11_v2/src/orxonox/graphics/Backlight.cc (modified) * code/branches/cpp11_v2/src/orxonox/graphics/Light.cc (modified) * code/branches/cpp11_v2/src/orxonox/graphics/Model.cc (modified) * code/branches/cpp11_v2/src/orxonox/graphics/ParticleEmitter.cc (modified) * code/branches/cpp11_v2/src/orxonox/infos/HumanPlayer.cc (modified) * code/branches/cpp11_v2/src/orxonox/infos/PlayerInfo.cc (modified) * code/branches/cpp11_v2/src/orxonox/interfaces/RadarViewable.h (modified) * code/branches/cpp11_v2/src/orxonox/items/Engine.cc (modified) * code/branches/cpp11_v2/src/orxonox/items/MultiStateEngine.cc (modified) * code/branches/cpp11_v2/src/orxonox/overlays/InGameConsole.cc (modified) * code/branches/cpp11_v2/src/orxonox/overlays/OrxonoxOverlay.cc (modified) * code/branches/cpp11_v2/src/orxonox/overlays/OverlayGroup.cc (modified) * code/branches/cpp11_v2/src/orxonox/weaponsystem/Munition.cc (modified) * code/branches/cpp11_v2/src/orxonox/weaponsystem/Weapon.cc (modified) * code/branches/cpp11_v2/src/orxonox/weaponsystem/WeaponMode.cc (modified) * code/branches/cpp11_v2/src/orxonox/weaponsystem/WeaponPack.cc (modified) * code/branches/cpp11_v2/src/orxonox/weaponsystem/WeaponSet.cc (modified) * code/branches/cpp11_v2/src/orxonox/weaponsystem/WeaponSlot.cc (modified) * code/branches/cpp11_v2/src/orxonox/weaponsystem/WeaponSlot.h (modified) * code/branches/cpp11_v2/src/orxonox/weaponsystem/WeaponSystem.cc (modified) * code/branches/cpp11_v2/src/orxonox/worldentities/BigExplosion.cc (modified) * code/branches/cpp11_v2/src/orxonox/worldentities/ControllableEntity.cc (modified) * code/branches/cpp11_v2/src/orxonox/worldentities/Drone.cc (modified) * code/branches/cpp11_v2/src/orxonox/worldentities/ExplosionChunk.cc (modified) * code/branches/cpp11_v2/src/orxonox/worldentities/MovableEntity.cc (modified) * code/branches/cpp11_v2/src/orxonox/worldentities/SpawnPoint.cc (modified) * code/branches/cpp11_v2/src/orxonox/worldentities/WorldEntity.cc (modified) * code/branches/cpp11_v2/src/orxonox/worldentities/pawns/ModularSpaceShip.cc (modified) * code/branches/cpp11_v2/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/branches/cpp11_v2/src/orxonox/worldentities/pawns/Pawn.h (modified) * code/branches/cpp11_v2/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) * code/branches/cpp11_v2/src/orxonox/worldentities/pawns/Spectator.cc (modified) * code/branches/cpp11_v2/test/core/command/CommandTest.cc (modified) * code/branches/cpp11_v2/test/core/object/StrongPtrTest.cc (modified) * code/branches/cpp11_v2/test/core/object/WeakPtrTest.cc (modified) * code/branches/cpp11_v2/test/util/SharedPtrTest.cc (modified) * code/branches/cpp11_v2/test/util/SmallObjectAllocatorTest.cc (modified) replace '0' by 'nullptr' Thu, 05 Nov 2015 20:48:41 GMT paulsc [10767] * code/branches/campaignHS15/data/levels/Campaign1.oxw (modified) Changed coordinates to (y,z,x) and implemented FPSPlayer. Undocking ... Wed, 04 Nov 2015 21:55:50 GMT paulsc [10766] * code/branches/campaignHS15/data/levels/Campaign1.oxw (modified) Corrected formatting, improved allies, introduced lua coordinates and ... Wed, 04 Nov 2015 21:25:42 GMT landauf [10765] * code/branches/cpp11_v2/src/libraries/core/ApplicationPaths.cc (modified) * code/branches/cpp11_v2/src/libraries/core/BaseObject.cc (modified) * code/branches/cpp11_v2/src/libraries/core/BaseObject.h (modified) * code/branches/cpp11_v2/src/libraries/core/ConfigurablePaths.cc (modified) * code/branches/cpp11_v2/src/libraries/core/Core.cc (modified) * code/branches/cpp11_v2/src/libraries/core/CoreConfig.cc (modified) * code/branches/cpp11_v2/src/libraries/core/CoreIncludes.h (modified) * code/branches/cpp11_v2/src/libraries/core/GUIManager.cc (modified) * code/branches/cpp11_v2/src/libraries/core/Game.cc (modified) * code/branches/cpp11_v2/src/libraries/core/GraphicsManager.cc (modified) * code/branches/cpp11_v2/src/libraries/core/GraphicsManager.h (modified) * code/branches/cpp11_v2/src/libraries/core/Loader.cc (modified) * code/branches/cpp11_v2/src/libraries/core/LuaState.cc (modified) * code/branches/cpp11_v2/src/libraries/core/Resource.cc (modified) * code/branches/cpp11_v2/src/libraries/core/class/Identifiable.h (modified) * code/branches/cpp11_v2/src/libraries/core/class/Identifier.h (modified) * code/branches/cpp11_v2/src/libraries/core/class/IdentifierManager.cc (modified) * code/branches/cpp11_v2/src/libraries/core/class/SubclassIdentifier.h (modified) * code/branches/cpp11_v2/src/libraries/core/command/CommandEvaluation.cc (modified) * code/branches/cpp11_v2/src/libraries/core/command/CommandEvaluation.h (modified) * code/branches/cpp11_v2/src/libraries/core/command/CommandExecutor.cc (modified) * code/branches/cpp11_v2/src/libraries/core/command/ConsoleCommand.cc (modified) * code/branches/cpp11_v2/src/libraries/core/command/ConsoleCommand.h (modified) * code/branches/cpp11_v2/src/libraries/core/command/ConsoleCommandIncludes.h (modified) * code/branches/cpp11_v2/src/libraries/core/command/Executor.cc (modified) * code/branches/cpp11_v2/src/libraries/core/command/Functor.h (modified) * code/branches/cpp11_v2/src/libraries/core/command/IOConsolePOSIX.cc (modified) * code/branches/cpp11_v2/src/libraries/core/command/IOConsoleWindows.cc (modified) * code/branches/cpp11_v2/src/libraries/core/command/TclBind.cc (modified) * code/branches/cpp11_v2/src/libraries/core/config/ConfigFile.cc (modified) * code/branches/cpp11_v2/src/libraries/core/config/ConfigFileManager.cc (modified) * code/branches/cpp11_v2/src/libraries/core/config/ConfigFileSection.cc (modified) * code/branches/cpp11_v2/src/libraries/core/config/ConfigValueContainer.h (modified) * code/branches/cpp11_v2/src/libraries/core/config/SettingsConfigFile.cc (modified) * code/branches/cpp11_v2/src/libraries/core/input/InputManager.cc (modified) * code/branches/cpp11_v2/src/libraries/core/input/InputManager.h (modified) * code/branches/cpp11_v2/src/libraries/core/input/InputState.cc (modified) * code/branches/cpp11_v2/src/libraries/core/input/InputState.h (modified) * code/branches/cpp11_v2/src/libraries/core/input/KeyBinder.cc (modified) * code/branches/cpp11_v2/src/libraries/core/input/KeyBinder.h (modified) * code/branches/cpp11_v2/src/libraries/core/input/KeyBinderManager.cc (modified) * code/branches/cpp11_v2/src/libraries/core/input/KeyBinderManager.h (modified) * code/branches/cpp11_v2/src/libraries/core/input/KeyDetector.cc (modified) * code/branches/cpp11_v2/src/libraries/core/module/DynLib.cc (modified) * code/branches/cpp11_v2/src/libraries/core/module/DynLib.h (modified) * code/branches/cpp11_v2/src/libraries/core/module/ModuleInstance.cc (modified) * code/branches/cpp11_v2/src/libraries/core/module/Plugin.cc (modified) * code/branches/cpp11_v2/src/libraries/core/module/PluginManager.cc (modified) * code/branches/cpp11_v2/src/libraries/core/object/Context.cc (modified) * code/branches/cpp11_v2/src/libraries/core/object/Destroyable.cc (modified) * code/branches/cpp11_v2/src/libraries/core/object/IteratorBase.h (modified) * code/branches/cpp11_v2/src/libraries/core/object/StrongPtr.h (modified) * code/branches/cpp11_v2/src/libraries/core/object/WeakPtr.h (modified) * code/branches/cpp11_v2/src/libraries/core/singleton/ScopedSingletonIncludes.h (modified) * code/branches/cpp11_v2/src/libraries/core/singleton/ScopedSingletonWrapper.h (modified) * code/branches/cpp11_v2/src/libraries/network/ClientConnection.cc (modified) * code/branches/cpp11_v2/src/libraries/network/FunctionCall.cc (modified) * code/branches/cpp11_v2/src/libraries/network/LANDiscoverable.cc (modified) * code/branches/cpp11_v2/src/libraries/network/LANDiscovery.cc (modified) * code/branches/cpp11_v2/src/libraries/network/MasterServer.cc (modified) * code/branches/cpp11_v2/src/libraries/network/MasterServerComm.cc (modified) * code/branches/cpp11_v2/src/libraries/network/NetworkFunctionManager.cc (modified) * code/branches/cpp11_v2/src/libraries/network/PeerList.cc (modified) * code/branches/cpp11_v2/src/libraries/network/Server.cc (modified) * code/branches/cpp11_v2/src/libraries/network/ServerConnection.cc (modified) * code/branches/cpp11_v2/src/libraries/network/packet/ClassID.cc (modified) * code/branches/cpp11_v2/src/libraries/network/packet/Gamestate.cc (modified) * code/branches/cpp11_v2/src/libraries/network/packet/Packet.cc (modified) * code/branches/cpp11_v2/src/libraries/network/synchronisable/Synchronisable.cc (modified) * code/branches/cpp11_v2/src/libraries/tools/ResourceCollection.cc (modified) * code/branches/cpp11_v2/src/libraries/tools/Shader.cc (modified) * code/branches/cpp11_v2/src/libraries/util/Clipboard.cc (modified) * code/branches/cpp11_v2/src/libraries/util/DestructionHelper.h (modified) * code/branches/cpp11_v2/src/libraries/util/SharedPtr.h (modified) * code/branches/cpp11_v2/src/libraries/util/SignalHandler.cc (modified) * code/branches/cpp11_v2/src/libraries/util/SignalHandler.h (modified) * code/branches/cpp11_v2/src/libraries/util/Singleton.h (modified) * code/branches/cpp11_v2/src/libraries/util/SmallObjectAllocator.cc (modified) * code/branches/cpp11_v2/src/modules/designtools/ScreenshotManager.cc (modified) * code/branches/cpp11_v2/src/modules/designtools/SkyboxGenerator.cc (modified) * code/branches/cpp11_v2/src/modules/docking/Dock.cc (modified) * code/branches/cpp11_v2/src/modules/docking/DockToShip.cc (modified) * code/branches/cpp11_v2/src/modules/docking/DockingAnimation.cc (modified) * code/branches/cpp11_v2/src/modules/docking/DockingController.cc (modified) * code/branches/cpp11_v2/src/modules/docking/DockingEffect.cc (modified) * code/branches/cpp11_v2/src/modules/dodgerace/DodgeRace.cc (modified) * code/branches/cpp11_v2/src/modules/dodgerace/DodgeRaceCenterPoint.cc (modified) * code/branches/cpp11_v2/src/modules/dodgerace/DodgeRaceShip.cc (modified) * code/branches/cpp11_v2/src/modules/gametypes/RaceCheckPoint.cc (modified) * code/branches/cpp11_v2/src/modules/gametypes/SpaceRaceController.cc (modified) * code/branches/cpp11_v2/src/modules/gametypes/SpaceRaceManager.cc (modified) * code/branches/cpp11_v2/src/modules/invader/Invader.cc (modified) * code/branches/cpp11_v2/src/modules/invader/InvaderCenterPoint.cc (modified) * code/branches/cpp11_v2/src/modules/invader/InvaderEnemy.cc (modified) * code/branches/cpp11_v2/src/modules/invader/InvaderEnemyShooter.cc (modified) * code/branches/cpp11_v2/src/modules/invader/InvaderShip.cc (modified) * code/branches/cpp11_v2/src/modules/jump/Jump.cc (modified) * code/branches/cpp11_v2/src/modules/jump/JumpBoots.cc (modified) * code/branches/cpp11_v2/src/modules/jump/JumpCenterpoint.cc (modified) * code/branches/cpp11_v2/src/modules/jump/JumpEnemy.cc (modified) * code/branches/cpp11_v2/src/modules/jump/JumpFigure.cc (modified) * code/branches/cpp11_v2/src/modules/jump/JumpPlatform.cc (modified) * code/branches/cpp11_v2/src/modules/jump/JumpPlatformTimer.cc (modified) * code/branches/cpp11_v2/src/modules/jump/JumpPropeller.cc (modified) * code/branches/cpp11_v2/src/modules/jump/JumpRocket.cc (modified) * code/branches/cpp11_v2/src/modules/jump/JumpScore.cc (modified) * code/branches/cpp11_v2/src/modules/jump/JumpShield.cc (modified) * code/branches/cpp11_v2/src/modules/jump/JumpSpring.cc (modified) * code/branches/cpp11_v2/src/modules/mini4dgame/Mini4Dgame.cc (modified) * code/branches/cpp11_v2/src/modules/mini4dgame/Mini4DgameBoard.cc (modified) * code/branches/cpp11_v2/src/modules/notifications/NotificationDispatcher.cc (modified) * code/branches/cpp11_v2/src/modules/notifications/NotificationManager.cc (modified) * code/branches/cpp11_v2/src/modules/notifications/NotificationQueueCEGUI.cc (modified) * code/branches/cpp11_v2/src/modules/objects/Script.cc (modified) * code/branches/cpp11_v2/src/modules/objects/SpaceBoundaries.cc (modified) * code/branches/cpp11_v2/src/modules/objects/triggers/DistanceMultiTrigger.cc (modified) * code/branches/cpp11_v2/src/modules/objects/triggers/DistanceTrigger.cc (modified) * code/branches/cpp11_v2/src/modules/objects/triggers/EventMultiTrigger.cc (modified) * code/branches/cpp11_v2/src/modules/objects/triggers/MultiTrigger.cc (modified) * code/branches/cpp11_v2/src/modules/objects/triggers/MultiTrigger.h (modified) * code/branches/cpp11_v2/src/modules/objects/triggers/MultiTriggerContainer.cc (modified) * code/branches/cpp11_v2/src/modules/objects/triggers/TriggerBase.cc (modified) * code/branches/cpp11_v2/src/modules/overlays/GUIOverlay.cc (modified) * code/branches/cpp11_v2/src/modules/overlays/hud/HUDEnemyHealthBar.cc (modified) * code/branches/cpp11_v2/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/branches/cpp11_v2/src/modules/pickup/CollectiblePickup.cc (modified) * code/branches/cpp11_v2/src/modules/pickup/CollectiblePickup.h (modified) * code/branches/cpp11_v2/src/modules/pickup/PickupCollection.cc (modified) * code/branches/cpp11_v2/src/modules/pickup/PickupManager.cc (modified) * code/branches/cpp11_v2/src/modules/pickup/PickupRepresentation.cc (modified) * code/branches/cpp11_v2/src/modules/pickup/PickupRepresentation.h (modified) * code/branches/cpp11_v2/src/modules/pickup/PickupSpawner.cc (modified) * code/branches/cpp11_v2/src/modules/pickup/items/DamageBoostPickup.cc (modified) * code/branches/cpp11_v2/src/modules/pickup/items/DronePickup.cc (modified) * code/branches/cpp11_v2/src/modules/pickup/items/HealthPickup.cc (modified) * code/branches/cpp11_v2/src/modules/pickup/items/InvisiblePickup.cc (modified) * code/branches/cpp11_v2/src/modules/pickup/items/MetaPickup.cc (modified) * code/branches/cpp11_v2/src/modules/pickup/items/ShieldPickup.cc (modified) * code/branches/cpp11_v2/src/modules/pickup/items/ShrinkPickup.cc (modified) * code/branches/cpp11_v2/src/modules/pickup/items/SpeedPickup.cc (modified) * code/branches/cpp11_v2/src/modules/pong/Pong.cc (modified) * code/branches/cpp11_v2/src/modules/pong/PongAI.cc (modified) * code/branches/cpp11_v2/src/modules/pong/PongBall.cc (modified) * code/branches/cpp11_v2/src/modules/pong/PongCenterpoint.cc (modified) * code/branches/cpp11_v2/src/modules/pong/PongScore.cc (modified) * code/branches/cpp11_v2/src/modules/portals/PortalEndPoint.cc (modified) * code/branches/cpp11_v2/src/modules/questsystem/GlobalQuest.cc (modified) * code/branches/cpp11_v2/src/modules/questsystem/LocalQuest.cc (modified) * code/branches/cpp11_v2/src/modules/questsystem/Quest.cc (modified) * code/branches/cpp11_v2/src/modules/questsystem/QuestEffectBeacon.cc (modified) * code/branches/cpp11_v2/src/modules/questsystem/QuestHint.cc (modified) * code/branches/cpp11_v2/src/modules/questsystem/QuestListener.cc (modified) * code/branches/cpp11_v2/src/modules/questsystem/QuestManager.cc (modified) * code/branches/cpp11_v2/src/modules/questsystem/effects/AddQuest.cc (modified) * code/branches/cpp11_v2/src/modules/questsystem/effects/AddQuestHint.cc (modified) * code/branches/cpp11_v2/src/modules/questsystem/effects/AddReward.cc (modified) * code/branches/cpp11_v2/src/modules/questsystem/effects/CompleteQuest.cc (modified) * code/branches/cpp11_v2/src/modules/questsystem/effects/FailQuest.cc (modified) * code/branches/cpp11_v2/src/modules/tetris/Tetris.cc (modified) * code/branches/cpp11_v2/src/modules/tetris/TetrisBrick.cc (modified) * code/branches/cpp11_v2/src/modules/tetris/TetrisCenterpoint.cc (modified) * code/branches/cpp11_v2/src/modules/tetris/TetrisScore.cc (modified) * code/branches/cpp11_v2/src/modules/towerdefense/TowerDefense.cc (modified) * code/branches/cpp11_v2/src/modules/towerdefense/TowerDefenseCenterpoint.cc (modified) * code/branches/cpp11_v2/src/modules/towerdefense/TowerDefenseEnemy.cc (modified) * code/branches/cpp11_v2/src/modules/towerdefense/TowerDefenseField.cc (modified) * code/branches/cpp11_v2/src/modules/towerdefense/TowerDefenseTower.cc (modified) * code/branches/cpp11_v2/src/modules/weapons/IceGunFreezer.cc (modified) * code/branches/cpp11_v2/src/modules/weapons/projectiles/BasicProjectile.cc (modified) * code/branches/cpp11_v2/src/modules/weapons/projectiles/GravityBombField.cc (modified) * code/branches/cpp11_v2/src/modules/weapons/projectiles/Projectile.cc (modified) * code/branches/cpp11_v2/src/orxonox/CameraManager.cc (modified) * code/branches/cpp11_v2/src/orxonox/LevelManager.cc (modified) * code/branches/cpp11_v2/src/orxonox/Scene.cc (modified) * code/branches/cpp11_v2/src/orxonox/chat/ChatInputHandler.cc (modified) * code/branches/cpp11_v2/src/orxonox/collisionshapes/CollisionShape.h (modified) * code/branches/cpp11_v2/src/orxonox/collisionshapes/CompoundCollisionShape.cc (modified) * code/branches/cpp11_v2/src/orxonox/collisionshapes/WorldEntityCollisionShape.cc (modified) * code/branches/cpp11_v2/src/orxonox/controllers/AIController.cc (modified) * code/branches/cpp11_v2/src/orxonox/controllers/ArtificialController.cc (modified) * code/branches/cpp11_v2/src/orxonox/controllers/ControllerDirector.cc (modified) * code/branches/cpp11_v2/src/orxonox/controllers/FormationController.cc (modified) * code/branches/cpp11_v2/src/orxonox/controllers/HumanController.cc (modified) * code/branches/cpp11_v2/src/orxonox/controllers/NewHumanController.cc (modified) * code/branches/cpp11_v2/src/orxonox/controllers/ScriptController.cc (modified) * code/branches/cpp11_v2/src/orxonox/gamestates/GSLevel.cc (modified) * code/branches/cpp11_v2/src/orxonox/gamestates/GSLevelMemento.h (modified) * code/branches/cpp11_v2/src/orxonox/gamestates/GSMainMenu.cc (modified) * code/branches/cpp11_v2/src/orxonox/gametypes/Gametype.cc (modified) * code/branches/cpp11_v2/src/orxonox/gametypes/TeamGametype.cc (modified) * code/branches/cpp11_v2/src/orxonox/graphics/Billboard.cc (modified) * code/branches/cpp11_v2/src/orxonox/graphics/Model.cc (modified) * code/branches/cpp11_v2/src/orxonox/infos/PlayerInfo.cc (modified) * code/branches/cpp11_v2/src/orxonox/interfaces/PickupCarrier.cc (modified) * code/branches/cpp11_v2/src/orxonox/interfaces/PickupCarrier.h (modified) * code/branches/cpp11_v2/src/orxonox/interfaces/Pickupable.cc (modified) * code/branches/cpp11_v2/src/orxonox/items/Engine.cc (modified) * code/branches/cpp11_v2/src/orxonox/items/Engine.h (modified) * code/branches/cpp11_v2/src/orxonox/items/MultiStateEngine.cc (modified) * code/branches/cpp11_v2/src/orxonox/items/ShipPart.cc (modified) * code/branches/cpp11_v2/src/orxonox/sound/AmbientSound.cc (modified) * code/branches/cpp11_v2/src/orxonox/sound/BaseSound.cc (modified) * code/branches/cpp11_v2/src/orxonox/sound/SoundBuffer.cc (modified) * code/branches/cpp11_v2/src/orxonox/sound/SoundManager.cc (modified) * code/branches/cpp11_v2/src/orxonox/sound/SoundStreamer.cc (modified) * code/branches/cpp11_v2/src/orxonox/worldentities/ControllableEntity.cc (modified) * code/branches/cpp11_v2/src/orxonox/worldentities/EffectContainer.cc (modified) * code/branches/cpp11_v2/src/orxonox/worldentities/WorldEntity.cc (modified) * code/branches/cpp11_v2/src/orxonox/worldentities/pawns/ModularSpaceShip.cc (modified) * code/branches/cpp11_v2/src/orxonox/worldentities/pawns/ModularSpaceShip.h (modified) * code/branches/cpp11_v2/src/orxonox/worldentities/pawns/Pawn.h (modified) * code/branches/cpp11_v2/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) * code/branches/cpp11_v2/test/core/class/IdentifiableTest.cc (modified) * code/branches/cpp11_v2/test/core/class/IdentifierClassHierarchyTest.cc (modified) * code/branches/cpp11_v2/test/core/class/IdentifierExternalClassHierarchyTest.cc (modified) * code/branches/cpp11_v2/test/core/class/IdentifierNestedClassHierarchyTest.cc (modified) * code/branches/cpp11_v2/test/core/class/IdentifierSimpleClassHierarchyTest.cc (modified) * code/branches/cpp11_v2/test/core/class/IdentifierTest.cc (modified) * code/branches/cpp11_v2/test/core/class/OrxonoxClassTest.cc (modified) * code/branches/cpp11_v2/test/core/class/OrxonoxInterfaceTest.cc (modified) * code/branches/cpp11_v2/test/core/class/SubclassIdentifierTest.cc (modified) * code/branches/cpp11_v2/test/core/class/SuperTest.cc (modified) * code/branches/cpp11_v2/test/core/command/CommandTest.cc (modified) * code/branches/cpp11_v2/test/core/object/ClassFactoryTest.cc (modified) * code/branches/cpp11_v2/test/core/object/ContextTest.cc (modified) * code/branches/cpp11_v2/test/core/object/DestroyableTest.cc (modified) * code/branches/cpp11_v2/test/core/object/IteratorTest.cc (modified) * code/branches/cpp11_v2/test/core/object/ListableTest.cc (modified) * code/branches/cpp11_v2/test/core/object/ObjectListBaseTest.cc (modified) * code/branches/cpp11_v2/test/core/object/ObjectListIteratorTest.cc (modified) * code/branches/cpp11_v2/test/core/object/ObjectListTest.cc (modified) * code/branches/cpp11_v2/test/core/object/StrongPtrTest.cc (modified) * code/branches/cpp11_v2/test/core/object/WeakPtrTest.cc (modified) * code/branches/cpp11_v2/test/core/singleton/ScopeTest.cc (modified) * code/branches/cpp11_v2/test/util/SharedPtrTest.cc (modified) * code/branches/cpp11_v2/test/util/SingletonTest.cc (modified) * code/branches/cpp11_v2/test/util/output/ConsoleWriterTest.cc (modified) * code/branches/cpp11_v2/test/util/output/OutputManagerTest.cc (modified) replace 'NULL' by 'nullptr' Wed, 04 Nov 2015 15:07:46 GMT gania [10764] * code/branches/AI_HS15/src/orxonox/controllers/CommonController.cc (modified) fixed canFire() function Tue, 03 Nov 2015 16:06:05 GMT gania [10763] * code/branches/AI_HS15/src/orxonox/controllers/CommonController.cc (modified) * code/branches/AI_HS15/src/orxonox/controllers/CommonController.h (modified) * code/branches/AI_HS15/src/orxonox/controllers/DivisionController.cc (modified) * code/branches/AI_HS15/src/orxonox/controllers/FleetController.cc (modified) fixed a bug Tue, 03 Nov 2015 14:56:41 GMT gania [10762] * code/branches/AI_HS15/src/orxonox/controllers/CommonController.cc (modified) * code/branches/AI_HS15/src/orxonox/controllers/CommonController.h (modified) * code/branches/AI_HS15/src/orxonox/controllers/DivisionController.cc (modified) * code/branches/AI_HS15/src/orxonox/controllers/SectionController.cc (modified) * code/branches/AI_HS15/src/orxonox/controllers/WingmanController.cc (modified) added a canFire() function Tue, 03 Nov 2015 13:11:19 GMT gania [10761] * code/branches/AI_HS15/src/orxonox/controllers/CommonController.h (modified) * code/branches/AI_HS15/src/orxonox/controllers/WingmanController.cc (modified) Added enums for maneuvers Mon, 02 Nov 2015 17:01:56 GMT fvultier [10760] * code/branches/hoverHS15/data/levels/Hover.oxw (modified) * code/branches/hoverHS15/data/levels/templates/spaceshipHover.oxt (added) * code/branches/hoverHS15/src/modules/hover/Hover.cc (modified) * code/branches/hoverHS15/src/modules/hover/HoverShip.cc (modified) * code/branches/hoverHS15/src/modules/hover/HoverShip.h (modified) * code/branches/hoverHS15/src/modules/hover/HoverWall.cc (modified) * code/branches/hoverHS15/src/modules/invader/InvaderShip.cc (modified) * code/branches/hoverHS15/src/modules/invader/InvaderShip.h (modified) 2 problems fixed: The collidesAgainst function in the hovership get ... Mon, 02 Nov 2015 15:48:27 GMT gania [10759] * code/branches/AI_HS15/data/levels/AITest.oxw (modified) * code/branches/AI_HS15/src/orxonox/controllers/CommonController.cc (modified) * code/branches/AI_HS15/src/orxonox/controllers/CommonController.h (modified) * code/branches/AI_HS15/src/orxonox/controllers/DivisionController.cc (modified) * code/branches/AI_HS15/src/orxonox/controllers/FleetController.cc (modified) * code/branches/AI_HS15/src/orxonox/controllers/FleetController.h (modified) * code/branches/AI_HS15/src/orxonox/controllers/SectionController.cc (modified) * code/branches/AI_HS15/src/orxonox/controllers/WingmanController.cc (modified) small fixes Mon, 02 Nov 2015 15:33:32 GMT paulsc [10758] * code/branches/campaignHS15/data/levels/Campaign1.oxw (modified) Corrected ally behavoiur. Friendly fire needs fixing though Mon, 02 Nov 2015 15:03:12 GMT luhug [10756] * code/branches/planetLevelHS15/data/levels/flightTest.oxw (deleted) * code/branches/planetLevelHS15/data/levels/skyboxTeleport.oxw (added) Changed flightTest.oxw to skyboxTeleport.oxw. Added a skybox to the ... Mon, 02 Nov 2015 14:56:46 GMT vaydin [10755] * code/branches/explosionChunksHS15/src/orxonox/worldentities/ExplosionPart.cc (modified) * code/branches/explosionChunksHS15/src/orxonox/worldentities/pawns/Pawn.cc (modified) removed lag at first explosion Mon, 02 Nov 2015 14:29:36 GMT bhatiab [10754] * code/branches/campaignHS15/data/levels/Campaign1.oxw (modified) Changed the number of enemies per waves, need to test it, if it works ... Mon, 02 Nov 2015 14:24:09 GMT vaydin [10753] * code/branches/explosionChunksHS15/src/orxonox/worldentities/VaydinExplosion.cc (deleted) * code/branches/explosionChunksHS15/src/orxonox/worldentities/VaydinExplosion.h (deleted) Deleted VaydinExplosion class Mon, 02 Nov 2015 14:23:03 GMT vaydin [10752] * code/branches/explosionChunksHS15/data/levels/emptyLevel.oxw (modified) * code/branches/explosionChunksHS15/data/levels/templates/spaceshipEscort.oxt (modified) * code/branches/explosionChunksHS15/src/orxonox/worldentities/CMakeLists.txt (modified) * code/branches/explosionChunksHS15/src/orxonox/worldentities/ExplosionPart.cc (added) * code/branches/explosionChunksHS15/src/orxonox/worldentities/ExplosionPart.h (added) * code/branches/explosionChunksHS15/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/branches/explosionChunksHS15/src/orxonox/worldentities/pawns/Pawn.h (modified) * code/branches/explosionChunksHS15/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) Deleted previously created VaydinExplosion class, created ... Mon, 02 Nov 2015 14:19:00 GMT meierman [10751] * code/branches/hoverHS15/data/levels/Hover.oxw (modified) * code/branches/hoverHS15/src/modules/hover/CMakeLists.txt (modified) * code/branches/hoverHS15/src/modules/hover/Hover.cc (modified) * code/branches/hoverHS15/src/modules/hover/Hover.h (modified) * code/branches/hoverHS15/src/modules/hover/HoverOrigin.cc (added) * code/branches/hoverHS15/src/modules/hover/HoverOrigin.h (added) * code/branches/hoverHS15/src/modules/hover/HoverPrereqs.h (modified) * code/branches/hoverHS15/src/modules/hover/HoverWall.cc (added) * code/branches/hoverHS15/src/modules/hover/HoverWall.h (added) working cpp object generation Mon, 02 Nov 2015 13:56:51 GMT bhatiab [10750] * code/branches/campaignHS15/data/levels/Campaign1.oxw (modified) Changed the mass for the stations Mon, 02 Nov 2015 13:25:06 GMT bhatiab [10749] * code/branches/campaignHS15/data/levels/Campaign1.oxw (modified) Added planets, changed skybox, fixed asteroids, changed starting ... Mon, 02 Nov 2015 13:10:11 GMT paulsc [10748] * code/branches/campaignHS15/data/levels/Campaign1.oxw (modified) Added Allies. Sun, 01 Nov 2015 21:25:57 GMT fvultier [10746] * code/branches/fabienHS15/data/levels/pickups.oxw (modified) * code/branches/fabienHS15/data/levels/templates/pickupRepresentationTemplates.oxt (modified) * code/branches/fabienHS15/data/overlays/HUDTemplates3.oxo (modified) * code/branches/fabienHS15/src/modules/overlays/hud/CMakeLists.txt (modified) * code/branches/fabienHS15/src/modules/overlays/hud/HUDShieldBar.cc (added) * code/branches/fabienHS15/src/modules/overlays/hud/HUDShieldBar.h (added) * code/branches/fabienHS15/src/modules/pickup/items/MunitionPickup.h (modified) * code/branches/fabienHS15/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/branches/fabienHS15/src/orxonox/worldentities/pawns/Pawn.h (modified) * code/branches/fabienHS15/src/orxonox/worldentities/pawns/SpaceShip.h (modified) Sun, 01 Nov 2015 21:06:23 GMT landauf [10745] * code/branches/cpp11_v2/src/libraries/core/object/StrongPtr.h (modified) * code/branches/cpp11_v2/src/libraries/core/object/WeakPtr.h (modified) * code/branches/cpp11_v2/src/libraries/util/SharedPtr.h (modified) added move-constructor for StrongPtr and SharedPtr. for WeakPtr this ... Sun, 01 Nov 2015 20:03:05 GMT landauf [10744] * code/branches/cpp11_v2/src/libraries/core/object/StrongPtr.h (modified) * code/branches/cpp11_v2/src/libraries/core/object/WeakPtr.h (modified) * code/branches/cpp11_v2/test/core/object/StrongPtrTest.cc (modified) * code/branches/cpp11_v2/test/core/object/WeakPtrTest.cc (modified) * code/branches/cpp11_v2/test/util/SharedPtrTest.cc (modified) added tests and fixed constructors of StrongPtr and WeakPtr Sun, 01 Nov 2015 14:52:16 GMT paulsc [10743] * code/branches/campaignHS15/data/levels/Campaign1.oxw (modified) Did some more work in quests. Sun, 01 Nov 2015 13:52:04 GMT landauf [10742] * code/branches/cpp11_v2/src/libraries/util/Math.h (modified) use constexpr for some math functions and constants Sun, 01 Nov 2015 13:26:37 GMT bhatiab [10741] * code/branches/campaignHS15/data/levels/Campaign1.oxw (modified) Added a planet with a ring Sun, 01 Nov 2015 13:04:55 GMT paulsc [10740] * code/branches/campaignHS15/data/levels/Campaign1.oxw (modified) Did some work on narrative and events, labelled TODO and FIXME, ... Sun, 01 Nov 2015 12:05:54 GMT fvultier [10739] * code/branches/fabienHS15/data/gui/layouts/InGameMenu.layout (modified) * code/branches/fabienHS15/data/gui/scripts/InGameMenu.lua (modified) * code/branches/fabienHS15/data/overlays/HUDTemplates3.oxo (modified) * code/branches/fabienHS15/src/modules/overlays/hud/HUDBar.cc (modified) * code/branches/fabienHS15/src/modules/overlays/hud/HUDBar.h (modified) * code/branches/fabienHS15/src/modules/overlays/hud/HUDBoostBar.cc (modified) * code/branches/fabienHS15/src/modules/overlays/hud/HUDHealthBar.cc (modified) * code/branches/fabienHS15/src/modules/overlays/hud/HUDHealthBar.h (modified) * code/branches/fabienHS15/src/modules/overlays/hud/HUDWeapon.cc (modified) * code/branches/fabienHS15/src/modules/overlays/hud/HUDWeapon.h (modified) * code/branches/fabienHS15/src/modules/overlays/hud/HUDWeaponMode.cc (modified) * code/branches/fabienHS15/src/modules/overlays/hud/HUDWeaponMode.h (modified) * code/branches/fabienHS15/src/modules/overlays/hud/HUDWeaponSystem.cc (modified) * code/branches/fabienHS15/src/modules/towerdefense/TowerDefenseTower.cc (modified) * code/branches/fabienHS15/src/modules/weapons/projectiles/BasicProjectile.cc (modified) * code/branches/fabienHS15/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/branches/fabienHS15/src/orxonox/worldentities/pawns/Pawn.h (modified) HUD improved. Corrected text rescaling. Renamed reload to ... Sun, 01 Nov 2015 08:10:08 GMT gania [10737] * code/branches/AI_HS15/src/orxonox/controllers/ArtificialController.cc (modified) * code/branches/AI_HS15/src/orxonox/controllers/CommonController.cc (modified) * code/branches/AI_HS15/src/orxonox/controllers/CommonController.h (modified) * code/branches/AI_HS15/src/orxonox/controllers/DivisionController.cc (modified) * code/branches/AI_HS15/src/orxonox/controllers/FormationController.cc (modified) * code/branches/AI_HS15/src/orxonox/controllers/FormationController.h (modified) nothing really changed Sat, 31 Oct 2015 22:50:17 GMT landauf [10736] * code/branches/cpp11_v2/src/libraries/core/object/Iterator.h (modified) * code/branches/cpp11_v2/src/libraries/core/object/IteratorBase.h (modified) * code/branches/cpp11_v2/src/libraries/core/object/ObjectList.h (modified) * code/branches/cpp11_v2/src/libraries/core/object/ObjectListBase.h (modified) * code/branches/cpp11_v2/src/libraries/core/object/ObjectListIterator.h (modified) * code/branches/cpp11_v2/test/core/CMakeLists.txt (modified) * code/branches/cpp11_v2/test/core/object/IteratorTest.cc (modified) * code/branches/cpp11_v2/test/core/object/ObjectListIteratorTest.cc (modified) * code/branches/cpp11_v2/test/core/object/ObjectListTest.cc (added) fixed range based for-loop: ObjectList now returns an iterator added ... Sat, 31 Oct 2015 18:15:11 GMT paulsc [10735] * code/branches/campaignHS15/data/levels/Campaign1.oxw (modified) Implemented EffectBeacon for quest 2.1 and added platform for ... Sat, 31 Oct 2015 17:40:29 GMT landauf [10734] * code/branches/cpp11_v2/cmake/CompilerConfigGCC.cmake (modified) fixed build for mingw (apparently it requires gnu extensions to compile) Sat, 31 Oct 2015 17:11:53 GMT landauf [10733] * code/branches/cpp11_v2 (modified) * code/branches/cpp11_v2/cmake/CompilerConfigGCC.cmake (modified) * code/branches/cpp11_v2/src/external/ois/linux/LinuxJoyStickEvents.cpp (modified) * code/branches/cpp11_v2/src/libraries/core/config/ConfigFile.cc (modified) * code/branches/cpp11_v2/src/libraries/core/object/ObjectListBase.h (modified) * code/branches/cpp11_v2/src/libraries/tools/BulletDebugDrawer.h (modified) * code/branches/cpp11_v2/src/libraries/tools/OgreBulletUtils.h (modified) * code/branches/cpp11_v2/src/libraries/util/SmallObjectAllocator.h (modified) * code/branches/cpp11_v2/src/modules/invader/Invader.cc (modified) * code/branches/cpp11_v2/src/modules/invader/Invader.h (modified) * code/branches/cpp11_v2/src/modules/invader/InvaderEnemy.cc (modified) * code/branches/cpp11_v2/src/modules/invader/InvaderEnemy.h (modified) * code/branches/cpp11_v2/src/modules/invader/InvaderEnemyShooter.cc (modified) * code/branches/cpp11_v2/src/modules/invader/InvaderHUDinfo.cc (modified) * code/branches/cpp11_v2/src/modules/invader/InvaderShip.cc (modified) * code/branches/cpp11_v2/src/modules/invader/InvaderShip.h (modified) * code/branches/cpp11_v2/src/modules/invader/InvaderWeapon.h (modified) * code/branches/cpp11_v2/src/modules/invader/InvaderWeaponEnemy.cc (modified) * code/branches/cpp11_v2/src/modules/invader/InvaderWeaponEnemy.h (modified) * code/branches/cpp11_v2/src/modules/jump/Jump.cc (modified) * code/branches/cpp11_v2/src/modules/jump/Jump.h (modified) * code/branches/cpp11_v2/src/modules/jump/JumpBoots.cc (modified) * code/branches/cpp11_v2/src/modules/jump/JumpBoots.h (modified) * code/branches/cpp11_v2/src/modules/jump/JumpCenterpoint.cc (modified) * code/branches/cpp11_v2/src/modules/jump/JumpCenterpoint.h (modified) * code/branches/cpp11_v2/src/modules/jump/JumpEnemy.cc (modified) * code/branches/cpp11_v2/src/modules/jump/JumpEnemy.h (modified) * code/branches/cpp11_v2/src/modules/jump/JumpFigure.cc (modified) * code/branches/cpp11_v2/src/modules/jump/JumpItem.cc (modified) * code/branches/cpp11_v2/src/modules/jump/JumpItem.h (modified) * code/branches/cpp11_v2/src/modules/jump/JumpPlatform.cc (modified) * code/branches/cpp11_v2/src/modules/jump/JumpPlatform.h (modified) * code/branches/cpp11_v2/src/modules/jump/JumpPlatformDisappear.cc (modified) * code/branches/cpp11_v2/src/modules/jump/JumpPlatformDisappear.h (modified) * code/branches/cpp11_v2/src/modules/jump/JumpPlatformFake.cc (modified) * code/branches/cpp11_v2/src/modules/jump/JumpPlatformFake.h (modified) * code/branches/cpp11_v2/src/modules/jump/JumpPlatformHMove.cc (modified) * code/branches/cpp11_v2/src/modules/jump/JumpPlatformHMove.h (modified) * code/branches/cpp11_v2/src/modules/jump/JumpPlatformStatic.cc (modified) * code/branches/cpp11_v2/src/modules/jump/JumpPlatformStatic.h (modified) * code/branches/cpp11_v2/src/modules/jump/JumpPlatformTimer.cc (modified) * code/branches/cpp11_v2/src/modules/jump/JumpPlatformTimer.h (modified) * code/branches/cpp11_v2/src/modules/jump/JumpPlatformVMove.cc (modified) * code/branches/cpp11_v2/src/modules/jump/JumpPlatformVMove.h (modified) * code/branches/cpp11_v2/src/modules/jump/JumpProjectile.cc (modified) * code/branches/cpp11_v2/src/modules/jump/JumpPropeller.cc (modified) * code/branches/cpp11_v2/src/modules/jump/JumpPropeller.h (modified) * code/branches/cpp11_v2/src/modules/jump/JumpRocket.cc (modified) * code/branches/cpp11_v2/src/modules/jump/JumpRocket.h (modified) * code/branches/cpp11_v2/src/modules/jump/JumpScore.cc (modified) * code/branches/cpp11_v2/src/modules/jump/JumpShield.cc (modified) * code/branches/cpp11_v2/src/modules/jump/JumpShield.h (modified) * code/branches/cpp11_v2/src/modules/jump/JumpSpring.cc (modified) * code/branches/cpp11_v2/src/modules/jump/JumpSpring.h (modified) * code/branches/cpp11_v2/src/orxonox/chat/ChatManager.cc (modified) * code/branches/cpp11_v2/src/orxonox/controllers/ArtificialController.cc (modified) merged branch cpp11 to cpp11_v2 Sat, 31 Oct 2015 16:41:17 GMT landauf [10732] * code/branches/cpp11_v2 (copied) created new branch for cpp11 Sat, 31 Oct 2015 15:07:29 GMT gania [10731] * code/branches/AI_HS15/data/levels/AITest.oxw (modified) * code/branches/AI_HS15/src/orxonox/controllers/CommonController.cc (modified) * code/branches/AI_HS15/src/orxonox/controllers/CommonController.h (modified) * code/branches/AI_HS15/src/orxonox/controllers/DivisionController.cc (modified) * code/branches/AI_HS15/src/orxonox/controllers/DivisionController.h (modified) * code/branches/AI_HS15/src/orxonox/controllers/FleetController.cc (modified) * code/branches/AI_HS15/src/orxonox/controllers/FleetController.h (modified) * code/branches/AI_HS15/src/orxonox/controllers/LeaderController.h (modified) * code/branches/AI_HS15/src/orxonox/controllers/SectionController.cc (modified) * code/branches/AI_HS15/src/orxonox/controllers/SectionController.h (modified) * code/branches/AI_HS15/src/orxonox/controllers/WingmanController.cc (modified) * code/branches/AI_HS15/src/orxonox/controllers/WingmanController.h (modified) * code/branches/AI_HS15/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/branches/AI_HS15/src/orxonox/worldentities/pawns/Pawn.h (modified) added a little bit of firing functionality Sat, 31 Oct 2015 12:51:45 GMT bhatiab [10730] * code/branches/campaignHS15/data/levels/Campaign1.oxw (modified) Worked on lua.fog, fogFields is working now, but I'm having problemes ... Sat, 31 Oct 2015 11:20:00 GMT gania [10729] * code/branches/AI_HS15/data/levels/AITest.oxw (modified) * code/branches/AI_HS15/src/orxonox/controllers/CommonController.cc (modified) * code/branches/AI_HS15/src/orxonox/controllers/CommonController.h (modified) * code/branches/AI_HS15/src/orxonox/controllers/DivisionController.cc (modified) * code/branches/AI_HS15/src/orxonox/controllers/DivisionController.h (modified) * code/branches/AI_HS15/src/orxonox/controllers/LeaderController.cc (modified) * code/branches/AI_HS15/src/orxonox/controllers/LeaderController.h (modified) * code/branches/AI_HS15/src/orxonox/controllers/SectionController.cc (modified) * code/branches/AI_HS15/src/orxonox/controllers/SectionController.h (modified) * code/branches/AI_HS15/src/orxonox/controllers/WingmanController.cc (modified) * code/branches/AI_HS15/src/orxonox/controllers/WingmanController.h (modified) move functions were added, everyone stays in formations Fri, 30 Oct 2015 22:07:34 GMT gania [10725] * code/branches/AI_HS15/data/levels/AITest.oxw (modified) * code/branches/AI_HS15/src/orxonox/controllers/CommonController.cc (modified) * code/branches/AI_HS15/src/orxonox/controllers/CommonController.h (modified) * code/branches/AI_HS15/src/orxonox/controllers/DivisionController.cc (modified) * code/branches/AI_HS15/src/orxonox/controllers/DivisionController.h (modified) * code/branches/AI_HS15/src/orxonox/controllers/LeaderController.h (modified) * code/branches/AI_HS15/src/orxonox/controllers/SectionController.cc (modified) * code/branches/AI_HS15/src/orxonox/controllers/SectionController.h (modified) * code/branches/AI_HS15/src/orxonox/controllers/WingmanController.cc (modified) * code/branches/AI_HS15/src/orxonox/controllers/WingmanController.h (modified) * code/branches/AI_HS15/src/orxonox/worldentities/pawns/Pawn.cc (modified) fixed pointers Fri, 30 Oct 2015 18:51:49 GMT fvultier [10724] * code/branches/fabienHS15/data/levels/includes/pickups.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsCollateral.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsEscort.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsGhost.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsH2.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsHeartAttack.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsHeavyCruiser.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsHeavyCruiserBody.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsPirate.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsRing.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsSpacecruiser.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsSwallow.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsTransporter.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsbigship.oxi (modified) * code/branches/fabienHS15/data/levels/pickups.oxw (modified) * code/branches/fabienHS15/data/levels/templates/pickupRepresentationTemplates.oxt (modified) * code/branches/fabienHS15/data/overlays/HUDTemplates3.oxo (modified) * code/branches/fabienHS15/src/modules/overlays/hud/HUDWeapon.cc (modified) * code/branches/fabienHS15/src/modules/overlays/hud/HUDWeapon.h (modified) * code/branches/fabienHS15/src/modules/overlays/hud/HUDWeaponMode.cc (modified) * code/branches/fabienHS15/src/modules/overlays/hud/HUDWeaponMode.h (modified) * code/branches/fabienHS15/src/modules/overlays/hud/HUDWeaponSystem.cc (modified) * code/branches/fabienHS15/src/modules/overlays/hud/HUDWeaponSystem.h (modified) * code/branches/fabienHS15/src/modules/pickup/items/BoostPickup.cc (added) * code/branches/fabienHS15/src/modules/pickup/items/BoostPickup.h (added) * code/branches/fabienHS15/src/modules/pickup/items/CMakeLists.txt (modified) * code/branches/fabienHS15/src/modules/pickup/items/MunitionPickup.cc (modified) * code/branches/fabienHS15/src/modules/weapons/munitions/LaserMunition.cc (modified) * code/branches/fabienHS15/src/orxonox/overlays/OrxonoxOverlay.cc (modified) * code/branches/fabienHS15/src/orxonox/overlays/OrxonoxOverlay.h (modified) * code/branches/fabienHS15/src/orxonox/weaponsystem/Munition.cc (modified) * code/branches/fabienHS15/src/orxonox/weaponsystem/Munition.h (modified) * code/branches/fabienHS15/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) * code/branches/fabienHS15/src/orxonox/worldentities/pawns/SpaceShip.h (modified) The weapon system HUD rescales properly if the window size changes. Fri, 30 Oct 2015 11:08:30 GMT gania [10722] * code/branches/AI_HS15/data/levels/AITest.oxw (modified) * code/branches/AI_HS15/src/orxonox/controllers/CommonController.cc (modified) * code/branches/AI_HS15/src/orxonox/controllers/CommonController.h (modified) * code/branches/AI_HS15/src/orxonox/controllers/DivisionController.cc (modified) * code/branches/AI_HS15/src/orxonox/controllers/DivisionController.h (modified) * code/branches/AI_HS15/src/orxonox/controllers/FleetController.cc (modified) * code/branches/AI_HS15/src/orxonox/controllers/FleetController.h (modified) * code/branches/AI_HS15/src/orxonox/controllers/LeaderController.h (modified) * code/branches/AI_HS15/src/orxonox/controllers/SectionController.cc (modified) * code/branches/AI_HS15/src/orxonox/controllers/SectionController.h (modified) * code/branches/AI_HS15/src/orxonox/controllers/WingmanController.cc (modified) * code/branches/AI_HS15/src/orxonox/controllers/WingmanController.h (modified) created destructor functions and improved findNewLeader and ... Thu, 29 Oct 2015 22:27:32 GMT fvultier [10721] * code/branches/fabienHS15/data/levels/includes/weaponSettingsRing.oxi (modified) * code/branches/fabienHS15/data/levels/templates/pickupRepresentationTemplates.oxt (modified) * code/branches/fabienHS15/data/overlays/HUDTemplates3.oxo (modified) * code/branches/fabienHS15/src/modules/overlays/hud/HUDWeapon.cc (modified) * code/branches/fabienHS15/src/modules/overlays/hud/HUDWeapon.h (modified) * code/branches/fabienHS15/src/modules/overlays/hud/HUDWeaponMode.cc (modified) * code/branches/fabienHS15/src/modules/overlays/hud/HUDWeaponMode.h (modified) * code/branches/fabienHS15/src/modules/overlays/hud/HUDWeaponSystem.cc (modified) * code/branches/fabienHS15/src/modules/overlays/hud/HUDWeaponSystem.h (modified) * code/branches/fabienHS15/src/modules/pickup/items/MunitionContainer.cc (added) * code/branches/fabienHS15/src/modules/pickup/items/MunitionContainer.h (added) * code/branches/fabienHS15/src/modules/pickup/items/MunitionPickup.cc (modified) * code/branches/fabienHS15/src/orxonox/overlays/OrxonoxOverlay.h (modified) * code/branches/fabienHS15/src/orxonox/weaponsystem/Munition.cc (modified) Thu, 29 Oct 2015 19:02:23 GMT gania [10719] * code/branches/AI_HS15/data/levels/AITest.oxw (modified) * code/branches/AI_HS15/src/orxonox/controllers/CMakeLists.txt (modified) * code/branches/AI_HS15/src/orxonox/controllers/CommonController.cc (added) * code/branches/AI_HS15/src/orxonox/controllers/CommonController.h (added) * code/branches/AI_HS15/src/orxonox/controllers/DivisionController.cc (modified) * code/branches/AI_HS15/src/orxonox/controllers/DivisionController.h (modified) * code/branches/AI_HS15/src/orxonox/controllers/FleetController.cc (modified) * code/branches/AI_HS15/src/orxonox/controllers/FleetController.h (modified) * code/branches/AI_HS15/src/orxonox/controllers/FormationController.cc (modified) * code/branches/AI_HS15/src/orxonox/controllers/LeaderController.cc (modified) * code/branches/AI_HS15/src/orxonox/controllers/LeaderController.h (modified) * code/branches/AI_HS15/src/orxonox/controllers/SectionController.cc (added) * code/branches/AI_HS15/src/orxonox/controllers/SectionController.h (added) * code/branches/AI_HS15/src/orxonox/controllers/WingmanController.cc (modified) * code/branches/AI_HS15/src/orxonox/controllers/WingmanController.h (modified) All compiling, WingmanControllers actually find LeaderControllers and ... Thu, 29 Oct 2015 12:17:02 GMT gania [10718] * code/branches/AI_HS15/src/orxonox/controllers/DivisionController.cc (modified) * code/branches/AI_HS15/src/orxonox/controllers/DivisionController.h (modified) * code/branches/AI_HS15/src/orxonox/controllers/LeaderController.cc (modified) * code/branches/AI_HS15/src/orxonox/controllers/LeaderController.h (modified) bugfix Thu, 29 Oct 2015 10:53:45 GMT gania [10717] * code/branches/AI_HS15/data/levels/AITest.oxw (modified) * code/branches/AI_HS15/src/orxonox/controllers/AIController.cc (modified) * code/branches/AI_HS15/src/orxonox/controllers/AIController.h (modified) * code/branches/AI_HS15/src/orxonox/controllers/ArtificialController.cc (modified) * code/branches/AI_HS15/src/orxonox/controllers/ArtificialController.h (modified) * code/branches/AI_HS15/src/orxonox/controllers/DivisionController.cc (modified) * code/branches/AI_HS15/src/orxonox/controllers/DivisionController.h (modified) * code/branches/AI_HS15/src/orxonox/controllers/FleetController.cc (modified) * code/branches/AI_HS15/src/orxonox/controllers/FormationController.cc (modified) * code/branches/AI_HS15/src/orxonox/controllers/FormationController.h (modified) * code/branches/AI_HS15/src/orxonox/controllers/LeaderController.cc (modified) * code/branches/AI_HS15/src/orxonox/controllers/LeaderController.h (modified) * code/branches/AI_HS15/src/orxonox/controllers/SectionController.cc (deleted) * code/branches/AI_HS15/src/orxonox/controllers/SectionController.h (deleted) * code/branches/AI_HS15/src/orxonox/controllers/WingmanController.cc (modified) * code/branches/AI_HS15/src/orxonox/controllers/WingmanController.h (modified) Wingmen and Leaders look for their leaders Tue, 27 Oct 2015 20:08:40 GMT fvultier [10715] * code/branches/fabienHS15/data/levels/templates/pickupRepresentationTemplates.oxt (modified) * code/branches/fabienHS15/src/modules/overlays/hud/HUDWeapon.cc (modified) * code/branches/fabienHS15/src/modules/pickup/PickupPrereqs.h (modified) * code/branches/fabienHS15/src/modules/pickup/items/CMakeLists.txt (modified) * code/branches/fabienHS15/src/modules/pickup/items/MunitionPickup.cc (modified) * code/branches/fabienHS15/src/modules/pickup/items/MunitionPickup.h (modified) * code/branches/fabienHS15/src/modules/weapons/munitions/IceMunition.cc (modified) * code/branches/fabienHS15/src/modules/weapons/munitions/RocketMunition.cc (modified) * code/branches/fabienHS15/src/modules/weapons/munitions/SplitMunition.cc (modified) Mon, 26 Oct 2015 22:36:27 GMT fvultier [10714] * code/branches/fabienHS15/src/orxonox/weaponsystem/Munition.cc (modified) Mon, 26 Oct 2015 22:34:23 GMT fvultier [10713] * code/branches/fabienHS15/src/modules/weapons/munitions/FusionMunition.cc (modified) * code/branches/fabienHS15/src/modules/weapons/munitions/GravityBombMunition.cc (modified) * code/branches/fabienHS15/src/modules/weapons/munitions/IceMunition.cc (modified) * code/branches/fabienHS15/src/modules/weapons/munitions/LaserMunition.cc (modified) * code/branches/fabienHS15/src/modules/weapons/munitions/LightningMunition.cc (modified) * code/branches/fabienHS15/src/modules/weapons/munitions/RocketMunition.cc (modified) * code/branches/fabienHS15/src/modules/weapons/munitions/SplitMunition.cc (modified) * code/branches/fabienHS15/src/orxonox/weaponsystem/Munition.cc (modified) * code/branches/fabienHS15/src/orxonox/weaponsystem/Munition.h (modified) Mon, 26 Oct 2015 19:30:26 GMT paulsc [10711] * code/branches/campaignHS15/data/levels/Campaign1.oxw (modified) * code/branches/campaignHS15/data/levels/missionOne.oxw (modified) Fixed some errors, fixed teams. @bhatiab: Commenting out lua tags in ... Mon, 26 Oct 2015 16:49:01 GMT paulsc [10710] * code/branches/campaignHS15/data/levels/Campaign1.oxw (modified) Started work on docking. Needs work tho. Mon, 26 Oct 2015 16:44:31 GMT gania [10709] * code/branches/AI_HS15/data/levels/AITest.oxw (modified) * code/branches/AI_HS15/src/orxonox/controllers/CMakeLists.txt (modified) * code/branches/AI_HS15/src/orxonox/controllers/DivisionController.cc (modified) * code/branches/AI_HS15/src/orxonox/controllers/DivisionController.h (modified) * code/branches/AI_HS15/src/orxonox/controllers/FleetController.cc (modified) * code/branches/AI_HS15/src/orxonox/controllers/FleetController.h (modified) * code/branches/AI_HS15/src/orxonox/controllers/LeaderController.cc (modified) * code/branches/AI_HS15/src/orxonox/controllers/LeaderController.h (modified) * code/branches/AI_HS15/src/orxonox/controllers/WingmanController.cc (modified) * code/branches/AI_HS15/src/orxonox/controllers/WingmanController.h (modified) Restructured Mon, 26 Oct 2015 15:07:58 GMT meierman [10708] * code/branches/hoverHS15/data/levels/Hover.oxw (modified) * code/branches/hoverHS15/src/modules/hover/CMakeLists.txt (modified) * code/branches/hoverHS15/src/modules/hover/Hover.cc (modified) * code/branches/hoverHS15/src/modules/hover/HoverPrereqs.h (modified) HoverWall introduced Mon, 26 Oct 2015 15:07:58 GMT hzuellig [10707] * code/branches/planetLevelHS15/data/levels/betterearth.oxw (modified) Changing the thexture of the earth. Mon, 26 Oct 2015 15:03:57 GMT holzerj [10706] * code/branches/particleEffectsHS15/data/levels/emptyLevel.oxw (modified) * code/branches/particleEffectsHS15/data/levels/templates/spaceshipEscort.oxt (modified) * code/branches/particleEffectsHS15/data/particle/engine.particle (added) New engine effect Mon, 26 Oct 2015 14:49:14 GMT bhatiab [10705] * code/branches/campaignHS15/data/levels/Campaign1.oxw (modified) Started Work on includes/fog.lua Mon, 26 Oct 2015 14:48:10 GMT luhug [10704] * code/branches/planetLevelHS15/data/levels/flightTest.oxw (modified) Added Portals to flightTest.oxw Mon, 26 Oct 2015 14:41:25 GMT bhatiab [10703] * code/branches/campaignHS15/data/levels/Campaign1.oxw (modified) added asteroids Mon, 26 Oct 2015 13:35:28 GMT luhug [10702] * code/branches/planetLevelHS15/data/levels/flightTest.oxw (modified) dito Mon, 26 Oct 2015 13:04:42 GMT luhug [10701] * code/branches/planetLevelHS15/data/levels/flightTest.oxw (modified) Updated flightTest.oxw Mon, 26 Oct 2015 13:02:31 GMT meierman [10700] * code/branches/hoverHS15/data/levels/Hover.oxw (modified) Hover level update Mon, 26 Oct 2015 12:58:52 GMT bhatiab [10699] * code/branches/campaignHS15/data/levels/Campaign1.oxw (modified) changed the waypoints for the transporter... Mon, 26 Oct 2015 12:50:28 GMT hzuellig [10698] * code/branches/planetLevelHS15/data/levels/betterearth.oxw (added) testing better earth SVN Mon, 26 Oct 2015 12:49:40 GMT meierman [10697] * code/branches/hoverHS15/data/levels/Hover.oxw (modified) First time with HoverShip Mon, 26 Oct 2015 12:47:15 GMT bhatiab [10696] * code/branches/campaignHS15/data/levels/Campaign1.oxw (modified) Changed position of Station c Mon, 26 Oct 2015 12:45:50 GMT bhatiab [10695] * code/branches/campaignHS15/data/levels/Campaign1.oxw (modified) changed health and position of stations Mon, 26 Oct 2015 12:36:43 GMT bucyril [10694] * code/branches/hoverHS15/src/modules/hover/HoverShip.cc (modified) * code/branches/hoverHS15/src/modules/hover/HoverShip.h (modified) Made the code compile Sun, 25 Oct 2015 18:09:11 GMT fvultier [10692] * code/branches/fabienHS15/data/levels/includes/pickups.oxi (modified) * code/branches/fabienHS15/data/levels/pickups.oxw (modified) * code/branches/fabienHS15/data/levels/templates/pickupRepresentationTemplates.oxt (modified) * code/branches/fabienHS15/src/modules/pickup/PickupRepresentation.cc (modified) * code/branches/fabienHS15/src/modules/pickup/items/CMakeLists.txt (modified) * code/branches/fabienHS15/src/modules/pickup/items/DronePickup.h (modified) * code/branches/fabienHS15/src/modules/pickup/items/MunitionPickup.cc (added) * code/branches/fabienHS15/src/modules/pickup/items/MunitionPickup.h (added) * code/branches/fabienHS15/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/branches/fabienHS15/src/orxonox/worldentities/pawns/Pawn.h (modified) Sun, 25 Oct 2015 10:13:49 GMT paulsc [10690] * code/branches/campaignHS15/data/levels/Campaign1.oxw (modified) Replaced shuttle Waypoints with Billboards and started work on ... Sat, 24 Oct 2015 23:26:44 GMT paulsc [10689] * code/branches/campaignHS15/data/levels/Campaign1.oxw (modified) Made further improvements to events and quests. Some things need ... Sat, 24 Oct 2015 20:51:18 GMT fvultier [10688] * code/branches/fabienHS15/data/levels/includes/weaponSettingsAssff.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsAssff2.oxi (modified) * code/branches/fabienHS15/data/levels/includes/weaponSettingsSwallow.oxi (modified) * code/branches/fabienHS15/data/overlays/HUDTemplates3.oxo (modified) * code/branches/fabienHS15/src/modules/overlays/hud/CMakeLists.txt (modified) * code/branches/fabienHS15/src/modules/overlays/hud/HUDWeapon.cc (added) * code/branches/fabienHS15/src/modules/overlays/hud/HUDWeapon.h (added) * code/branches/fabienHS15/src/modules/overlays/hud/HUDWeaponMode.cc (added) * code/branches/fabienHS15/src/modules/overlays/hud/HUDWeaponMode.h (added) * code/branches/fabienHS15/src/modules/overlays/hud/HUDWeaponSystem.cc (added) * code/branches/fabienHS15/src/modules/overlays/hud/HUDWeaponSystem.h (added) * code/branches/fabienHS15/src/modules/weapons/munitions/CMakeLists.txt (modified) * code/branches/fabienHS15/src/modules/weapons/munitions/FusionMunition.cc (modified) * code/branches/fabienHS15/src/modules/weapons/munitions/GravityBombMunition.cc (modified) * code/branches/fabienHS15/src/modules/weapons/munitions/IceMunition.cc (modified) * code/branches/fabienHS15/src/modules/weapons/munitions/LaserMunition.cc (modified) * code/branches/fabienHS15/src/modules/weapons/munitions/LaserMunition.h (modified) * code/branches/fabienHS15/src/modules/weapons/munitions/LightningMunition.cc (added) * code/branches/fabienHS15/src/modules/weapons/munitions/LightningMunition.h (added) * code/branches/fabienHS15/src/modules/weapons/munitions/ReplenishingMunition.cc (deleted) * code/branches/fabienHS15/src/modules/weapons/munitions/ReplenishingMunition.h (deleted) * code/branches/fabienHS15/src/modules/weapons/munitions/RocketMunition.cc (modified) * code/branches/fabienHS15/src/modules/weapons/munitions/SplitMunition.cc (modified) * code/branches/fabienHS15/src/modules/weapons/projectiles/GravityBombField.cc (modified) * code/branches/fabienHS15/src/modules/weapons/weaponmodes/EnergyDrink.cc (modified) * code/branches/fabienHS15/src/modules/weapons/weaponmodes/FusionFire.cc (modified) * code/branches/fabienHS15/src/modules/weapons/weaponmodes/GravityBombFire.cc (modified) * code/branches/fabienHS15/src/modules/weapons/weaponmodes/HsW01.cc (modified) * code/branches/fabienHS15/src/modules/weapons/weaponmodes/IceGun.cc (modified) * code/branches/fabienHS15/src/modules/weapons/weaponmodes/LaserFire.cc (modified) * code/branches/fabienHS15/src/modules/weapons/weaponmodes/LightningGun.cc (modified) * code/branches/fabienHS15/src/modules/weapons/weaponmodes/RocketFire.cc (modified) * code/branches/fabienHS15/src/modules/weapons/weaponmodes/RocketFireOld.cc (modified) * code/branches/fabienHS15/src/modules/weapons/weaponmodes/SimpleRocketFire.cc (modified) * code/branches/fabienHS15/src/modules/weapons/weaponmodes/SplitGun.cc (modified) * code/branches/fabienHS15/src/orxonox/weaponsystem/CMakeLists.txt (modified) * code/branches/fabienHS15/src/orxonox/weaponsystem/Munition.cc (modified) * code/branches/fabienHS15/src/orxonox/weaponsystem/Munition.h (modified) * code/branches/fabienHS15/src/orxonox/weaponsystem/ReplenishingMunition.cc (added) * code/branches/fabienHS15/src/orxonox/weaponsystem/ReplenishingMunition.h (added) * code/branches/fabienHS15/src/orxonox/weaponsystem/Weapon.cc (modified) * code/branches/fabienHS15/src/orxonox/weaponsystem/Weapon.h (modified) * code/branches/fabienHS15/src/orxonox/weaponsystem/WeaponMode.cc (modified) * code/branches/fabienHS15/src/orxonox/weaponsystem/WeaponMode.h (modified) * code/branches/fabienHS15/src/orxonox/weaponsystem/WeaponPack.cc (modified) * code/branches/fabienHS15/src/orxonox/weaponsystem/WeaponPack.h (modified) * code/branches/fabienHS15/src/orxonox/weaponsystem/WeaponSystem.cc (modified) * code/branches/fabienHS15/src/orxonox/weaponsystem/WeaponSystem.h (modified) * code/branches/fabienHS15/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/branches/fabienHS15/src/orxonox/worldentities/pawns/Pawn.h (modified) There is now a HUD that shows the status of the weapon system: all ... Sat, 24 Oct 2015 19:46:36 GMT fvultier [10685] * code/branches/fabienHS15 (copied) Sat, 24 Oct 2015 16:37:29 GMT paulsc [10684] * code/branches/campaignHS15/data/levels/Campaign1.oxw (modified) Started work on narrative notifications Sat, 24 Oct 2015 16:15:03 GMT paulsc [10683] * code/branches/campaignHS15/data/levels/Campaign1.oxw (modified) Added Station C, started work on events.