# # ChangeLog for / # # Generated by Trac 1.0.9 # Nov 25, 2024, 5:11:38 PM Mon, 04 Jan 2016 08:25:33 GMT fvultier [11033] * code/branches/fabienHS15/src/orxonox/weaponsystem/Munition.cc (modified) Bug in Munition.cc fixed. Sun, 03 Jan 2016 23:07:42 GMT landauf [11032] * code/branches/presentationHS15/src/orxonox/gametypes/Dynamicmatch.cc (modified) * code/branches/presentationHS15/src/orxonox/gametypes/Dynamicmatch.h (modified) fixed another situation where a timer may keep existing after the ... Sun, 03 Jan 2016 20:46:11 GMT landauf [11031] * code/branches/presentationHS15/src/modules/weapons/projectiles/IceGunProjectile.cc (modified) * code/branches/presentationHS15/src/modules/weapons/projectiles/IceGunProjectile.h (modified) bugfix: due to a limitation of the framework, timers are not ... Sun, 03 Jan 2016 20:28:44 GMT landauf [11030] * code/branches/presentationHS15/src/modules/hover/FlagHUD.cc (modified) * code/branches/presentationHS15/src/modules/hover/HoverFlag.cc (modified) * code/branches/presentationHS15/src/modules/hover/HoverWall.cc (modified) * code/branches/presentationHS15/src/orxonox/controllers/SectionController.cc (modified) * code/branches/presentationHS15/src/orxonox/controllers/WingmanController.cc (modified) * code/branches/presentationHS15/src/orxonox/weaponsystem/ReplenishingMunition.h (modified) fixed some compiler warnings (MSVC) Sun, 03 Jan 2016 19:49:23 GMT landauf [11029] * code/branches/presentationHS15/src/modules/hover/FlagHUD.h (modified) * code/branches/presentationHS15/src/modules/hover/HoverFlag.cc (modified) * code/branches/presentationHS15/src/modules/hover/HoverFlag.h (modified) * code/branches/presentationHS15/src/modules/hover/HoverWall.cc (modified) * code/branches/presentationHS15/src/modules/hover/HoverWall.h (modified) * code/branches/presentationHS15/src/orxonox/worldentities/ExplosionPart.cc (modified) fixed compiler errors (MSVC): StaticEntity has no tick() function + ... Sun, 03 Jan 2016 19:47:51 GMT landauf [11028] * code/branches/presentationHS15/src/orxonox/controllers/ArtificialController.cc (modified) * code/branches/presentationHS15/src/orxonox/controllers/CommonController.cc (modified) * code/branches/presentationHS15/src/orxonox/controllers/CommonController.h (modified) * code/branches/presentationHS15/src/orxonox/controllers/FightingController.cc (modified) * code/branches/presentationHS15/src/orxonox/controllers/FlyingController.cc (modified) * code/branches/presentationHS15/src/orxonox/controllers/FlyingController.h (modified) fixed compiler error (MSVC): static members with non-integral type ... Sun, 03 Jan 2016 16:48:18 GMT fvultier [11027] * code/branches/fabienHS15/data/levels/notifications.oxw (modified) * code/branches/fabienHS15/src/libraries/core/input/KeyBinder.cc (modified) * code/branches/fabienHS15/src/libraries/core/input/KeyBinder.h (modified) * code/branches/fabienHS15/src/modules/notifications/dispatchers/CommandNotification.cc (modified) * code/branches/fabienHS15/src/modules/notifications/dispatchers/CommandNotification.h (modified) * code/branches/fabienHS15/src/orxonox/weaponsystem/WeaponMode.cc (modified) * code/branches/fabienHS15/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/branches/fabienHS15/src/orxonox/worldentities/pawns/Pawn.h (modified) Implemented a feature that was requested during PPS: Vulnerability ... Sun, 03 Jan 2016 13:57:42 GMT landauf [11026] * code/branches/presentationHS15/data/levels/AITest.oxw (modified) * code/branches/presentationHS15/data/levels/Hover.oxw (modified) * code/branches/presentationHS15/data/levels/expeditionSector.oxw (modified) * code/branches/presentationHS15/data/levels/includes/weaponSettingsEscortMine.oxi (modified) * code/branches/presentationHS15/data/levels/includes/weaponSettingsHover.oxi (modified) * code/branches/presentationHS15/data/levels/mineLevel.oxw (modified) * code/branches/presentationHS15/data/levels/planetLevelHS15.oxw (modified) * code/branches/presentationHS15/data/levels/shuttleAttack.oxw (modified) * code/branches/presentationHS15/data/levels/shuttleRetaliation.oxw (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipEscortMine.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipHover.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipShuttle.oxt (modified) * code/branches/presentationHS15/data/overlays/HoverHUD.oxo (modified) * code/branches/presentationHS15/data/particle/MineExpl.particle (modified) * code/branches/presentationHS15/data/particle/MineExpl1.particle (modified) * code/branches/presentationHS15/data/particle/MineExpl2.particle (modified) * code/branches/presentationHS15/data/particle/engine.particle (modified) * code/branches/presentationHS15/data/particle/ice.particle (modified) * code/branches/presentationHS15/data/particle/mineparticle.particle (modified) * code/branches/presentationHS15/data/particle/psygun.particle (modified) * code/branches/presentationHS15/src/libraries/core/CoreConfig.cc (modified) * code/branches/presentationHS15/src/libraries/core/CoreConfig.h (modified) * code/branches/presentationHS15/src/libraries/core/GameConfig.cc (modified) * code/branches/presentationHS15/src/libraries/core/GameConfig.h (modified) * code/branches/presentationHS15/src/libraries/core/command/ConsoleCommandIncludes.cc (modified) * code/branches/presentationHS15/src/libraries/core/command/ConsoleCommandManager.cc (modified) * code/branches/presentationHS15/src/libraries/core/commandline/CMakeLists.txt (modified) * code/branches/presentationHS15/src/libraries/core/singleton/ScopedSingletonIncludes.cc (modified) * code/branches/presentationHS15/src/libraries/core/singleton/ScopedSingletonIncludes.h (modified) * code/branches/presentationHS15/src/libraries/network/NetworkFunctionIncludes.cc (modified) * code/branches/presentationHS15/src/libraries/network/NetworkFunctionIncludes.h (modified) * code/branches/presentationHS15/src/libraries/network/NetworkFunctionManager.cc (modified) * code/branches/presentationHS15/src/libraries/network/NetworkFunctionManager.h (modified) * code/branches/presentationHS15/src/modules/hover/CMakeLists.txt (modified) * code/branches/presentationHS15/src/modules/hover/FlagHUD.cc (modified) * code/branches/presentationHS15/src/modules/hover/FlagHUD.h (modified) * code/branches/presentationHS15/src/modules/hover/Hover.cc (modified) * code/branches/presentationHS15/src/modules/hover/Hover.h (modified) * code/branches/presentationHS15/src/modules/hover/HoverFlag.cc (modified) * code/branches/presentationHS15/src/modules/hover/HoverFlag.h (modified) * code/branches/presentationHS15/src/modules/hover/HoverOrigin.cc (modified) * code/branches/presentationHS15/src/modules/hover/HoverOrigin.h (modified) * code/branches/presentationHS15/src/modules/hover/HoverPrereqs.h (modified) * code/branches/presentationHS15/src/modules/hover/HoverShip.cc (modified) * code/branches/presentationHS15/src/modules/hover/HoverShip.h (modified) * code/branches/presentationHS15/src/modules/hover/HoverWall.cc (modified) * code/branches/presentationHS15/src/modules/hover/HoverWall.h (modified) * code/branches/presentationHS15/src/modules/hover/TimeHUD.cc (modified) * code/branches/presentationHS15/src/modules/hover/TimeHUD.h (modified) * code/branches/presentationHS15/src/modules/overlays/hud/HUDEnemyShieldBar.cc (modified) * code/branches/presentationHS15/src/modules/overlays/hud/HUDEnemyShieldBar.h (modified) * code/branches/presentationHS15/src/modules/overlays/hud/HUDRocketFuelBar.cc (modified) * code/branches/presentationHS15/src/modules/overlays/hud/HUDRocketFuelBar.h (modified) * code/branches/presentationHS15/src/modules/overlays/hud/HUDShieldBar.cc (modified) * code/branches/presentationHS15/src/modules/overlays/hud/HUDShieldBar.h (modified) * code/branches/presentationHS15/src/modules/overlays/hud/HUDWeapon.cc (modified) * code/branches/presentationHS15/src/modules/overlays/hud/HUDWeapon.h (modified) * code/branches/presentationHS15/src/modules/overlays/hud/HUDWeaponMode.cc (modified) * code/branches/presentationHS15/src/modules/overlays/hud/HUDWeaponMode.h (modified) * code/branches/presentationHS15/src/modules/overlays/hud/HUDWeaponSystem.cc (modified) * code/branches/presentationHS15/src/modules/overlays/hud/HUDWeaponSystem.h (modified) * code/branches/presentationHS15/src/modules/pickup/items/BoostPickup.cc (modified) * code/branches/presentationHS15/src/modules/pickup/items/BoostPickup.h (modified) * code/branches/presentationHS15/src/modules/pickup/items/MunitionContainer.cc (modified) * code/branches/presentationHS15/src/modules/pickup/items/MunitionContainer.h (modified) * code/branches/presentationHS15/src/modules/pickup/items/MunitionPickup.cc (modified) * code/branches/presentationHS15/src/modules/pickup/items/MunitionPickup.h (modified) * code/branches/presentationHS15/src/modules/towerdefense/TowerDefenseField.cc (modified) * code/branches/presentationHS15/src/modules/towerdefense/TowerDefenseField.h (modified) * code/branches/presentationHS15/src/modules/weapons/IceGunFreezer.cc (modified) * code/branches/presentationHS15/src/modules/weapons/IceGunFreezer.h (modified) * code/branches/presentationHS15/src/modules/weapons/munitions/IceMunition.cc (modified) * code/branches/presentationHS15/src/modules/weapons/munitions/IceMunition.h (modified) * code/branches/presentationHS15/src/modules/weapons/munitions/LightningMunition.cc (modified) * code/branches/presentationHS15/src/modules/weapons/munitions/LightningMunition.h (modified) * code/branches/presentationHS15/src/modules/weapons/munitions/MineMunition.cc (modified) * code/branches/presentationHS15/src/modules/weapons/munitions/MineMunition.h (modified) * code/branches/presentationHS15/src/modules/weapons/munitions/SplitMunition.cc (modified) * code/branches/presentationHS15/src/modules/weapons/munitions/SplitMunition.h (modified) * code/branches/presentationHS15/src/modules/weapons/projectiles/IceGunProjectile.cc (modified) * code/branches/presentationHS15/src/modules/weapons/projectiles/IceGunProjectile.h (modified) * code/branches/presentationHS15/src/modules/weapons/projectiles/MineProjectile.cc (modified) * code/branches/presentationHS15/src/modules/weapons/projectiles/MineProjectile.h (modified) * code/branches/presentationHS15/src/modules/weapons/projectiles/SplitGunProjectile.cc (modified) * code/branches/presentationHS15/src/modules/weapons/projectiles/SplitGunProjectile.h (modified) * code/branches/presentationHS15/src/modules/weapons/weaponmodes/IceGun.cc (modified) * code/branches/presentationHS15/src/modules/weapons/weaponmodes/IceGun.h (modified) * code/branches/presentationHS15/src/modules/weapons/weaponmodes/MineGun.cc (modified) * code/branches/presentationHS15/src/modules/weapons/weaponmodes/MineGun.h (modified) * code/branches/presentationHS15/src/modules/weapons/weaponmodes/SplitGun.cc (modified) * code/branches/presentationHS15/src/modules/weapons/weaponmodes/SplitGun.h (modified) * code/branches/presentationHS15/src/orxonox/controllers/ActionpointController.cc (modified) * code/branches/presentationHS15/src/orxonox/controllers/ActionpointController.h (modified) * code/branches/presentationHS15/src/orxonox/controllers/CommonController.cc (modified) * code/branches/presentationHS15/src/orxonox/controllers/CommonController.h (modified) * code/branches/presentationHS15/src/orxonox/controllers/DivisionController.cc (modified) * code/branches/presentationHS15/src/orxonox/controllers/DivisionController.h (modified) * code/branches/presentationHS15/src/orxonox/controllers/FightingController.cc (modified) * code/branches/presentationHS15/src/orxonox/controllers/FightingController.h (modified) * code/branches/presentationHS15/src/orxonox/controllers/FlyingController.cc (modified) * code/branches/presentationHS15/src/orxonox/controllers/FlyingController.h (modified) * code/branches/presentationHS15/src/orxonox/controllers/MasterController.cc (modified) * code/branches/presentationHS15/src/orxonox/controllers/MasterController.h (modified) * code/branches/presentationHS15/src/orxonox/controllers/SectionController.cc (modified) * code/branches/presentationHS15/src/orxonox/controllers/SectionController.h (modified) * code/branches/presentationHS15/src/orxonox/controllers/WingmanController.cc (modified) * code/branches/presentationHS15/src/orxonox/controllers/WingmanController.h (modified) * code/branches/presentationHS15/src/orxonox/weaponsystem/ReplenishingMunition.cc (modified) * code/branches/presentationHS15/src/orxonox/weaponsystem/ReplenishingMunition.h (modified) * code/branches/presentationHS15/src/orxonox/worldentities/Actionpoint.cc (modified) * code/branches/presentationHS15/src/orxonox/worldentities/Actionpoint.h (modified) * code/branches/presentationHS15/src/orxonox/worldentities/ExplosionPart.cc (modified) * code/branches/presentationHS15/src/orxonox/worldentities/ExplosionPart.h (modified) * code/branches/presentationHS15/test/core/class/IdentifierNestedClassHierarchyTest.cc (modified) eol-style:native Sun, 03 Jan 2016 13:39:10 GMT landauf [11025] * code/branches/presentationHS15/src/modules/hover/CMakeLists.txt (modified) * code/branches/presentationHS15/src/modules/hover/FlagHUD.h (modified) * code/branches/presentationHS15/src/modules/hover/HoverShip.h (modified) * code/branches/presentationHS15/src/modules/objects/Turret.h (modified) * code/branches/presentationHS15/src/modules/towerdefense/TowerDefenseSelecter.cc (modified) * code/branches/presentationHS15/src/orxonox/controllers/DivisionController.h (modified) * code/branches/presentationHS15/src/orxonox/controllers/FightingController.cc (modified) * code/branches/presentationHS15/src/orxonox/worldentities/ExplosionPart.cc (modified) * code/branches/presentationHS15/src/orxonox/worldentities/ExplosionPart.h (modified) tabs -> spaces Sat, 02 Jan 2016 22:49:25 GMT landauf [11024] * code/branches/SpaceshipNavigation2 (deleted) * code/branches/core6 (deleted) * code/branches/core7 (deleted) * code/branches/cpp11 (deleted) * code/branches/soundEffects (deleted) removed old branches Sat, 02 Jan 2016 22:07:26 GMT landauf [11023] * code/trunk/src/modules/overlays/hud/HUDNavigation.cc (modified) bugfix: use orxonox_cast instead of c-style-cast and check if the ... Sat, 02 Jan 2016 20:50:26 GMT landauf [11022] * code/trunk/src/modules/portals/PortalEndPoint.cc (modified) tweaked portal sound a bit Sat, 02 Jan 2016 20:24:40 GMT landauf [11021] * code/trunk (modified) * code/trunk/src/modules/portals/PortalEndPoint.cc (modified) merged branch soundEffects back to trunk. for some reason it was ... Sat, 02 Jan 2016 20:08:54 GMT landauf [11020] * code/trunk/src/libraries/core/CoreIncludes.h (modified) * code/trunk/src/modules/objects/triggers/MultiTrigger.cc (modified) * code/trunk/src/modules/portals/PortalEndPoint.cc (modified) * code/trunk/src/orxonox/LevelManager.cc (modified) fixed some cases where 'delete' was used instead of destroy() Sat, 02 Jan 2016 20:08:12 GMT landauf [11019] * code/trunk/src/libraries/core/object/Destroyable.cc (modified) (re-)added warning when a destroyable gets deleted without using ... Sat, 02 Jan 2016 19:59:12 GMT landauf [11018] * code/trunk/src/libraries/tools/Timer.cc (modified) * code/trunk/src/libraries/tools/Timer.h (modified) * code/trunk/src/modules/pong/PongAI.cc (modified) * code/trunk/src/orxonox/worldentities/MovableEntity.cc (modified) I think it's sufficient if Timer is a Listable. A timer is often used ... Sat, 02 Jan 2016 17:13:28 GMT landauf [11017] * code/trunk/src/libraries/core/module/PluginManager.cc (modified) * code/trunk/src/libraries/core/module/PluginManager.h (modified) write warning to console if unloading of plugins is disabled Sat, 02 Jan 2016 15:06:30 GMT landauf [11016] * code/trunk/cmake/LibraryConfigTardis.cmake (modified) * code/trunk/src/SpecialConfig.h.in (modified) * code/trunk/src/libraries/core/module/PluginManager.cc (modified) * code/trunk/src/libraries/core/module/PluginManager.h (modified) Added config value to PluginManager to define whether a dereferenced ... Sat, 02 Jan 2016 14:36:10 GMT landauf [11015] * code/trunk/src/libraries/core/module/Plugin.cc (modified) * code/trunk/src/libraries/core/module/Plugin.h (modified) * code/trunk/src/libraries/core/module/PluginManager.cc (modified) added option to merely deactivate a plugin when its reference count ... Sat, 02 Jan 2016 14:15:04 GMT landauf [11014] * code/trunk/src/libraries/core/module/Plugin.cc (modified) * code/trunk/src/libraries/core/module/Plugin.h (modified) * code/trunk/src/libraries/core/module/PluginManager.cc (modified) moved code for loading/unloading a plugin into separate functions Sat, 02 Jan 2016 10:48:40 GMT landauf [11013] * code/trunk/test/core_plugin/PluginTest.cc (modified) make sure the plugin is always unloaded after a test Sat, 02 Jan 2016 10:15:18 GMT landauf [11012] * code/trunk/src/libraries/core/Core.h (modified) * code/trunk/src/libraries/core/singleton/ScopeManager.h (modified) * code/trunk/test/CMakeLists.txt (modified) * code/trunk/test/core_plugin (added) * code/trunk/test/core_plugin/CMakeLists.txt (added) * code/trunk/test/core_plugin/PluginTest.cc (added) * code/trunk/test/core_plugin/Testclass.cc (added) * code/trunk/test/core_plugin/Testclass.h (added) * code/trunk/test/core_plugin/Testcommandlineargument.cc (added) * code/trunk/test/core_plugin/Testconsolecommand.cc (added) * code/trunk/test/core_plugin/Testsingleton.cc (added) * code/trunk/test/core_plugin/Testsingleton.h (added) added unittest for plugin loading and unloading Sat, 02 Jan 2016 10:04:55 GMT landauf [11011] * code/trunk/src/libraries/core/Core.cc (modified) * code/trunk/src/orxonox/Main.cc (modified) moved command line argument from Main to Core because it is used there Thu, 31 Dec 2015 16:11:22 GMT muemart [11010] * code/branches/cpp11_v2/src/OrxonoxConfig.h.in (modified) * code/branches/cpp11_v2/src/libraries/core/CorePrereqs.h (modified) * code/branches/cpp11_v2/src/libraries/core/config/ConfigFileSection.h (modified) * code/branches/cpp11_v2/src/libraries/util/UtilPrereqs.h (modified) * code/branches/cpp11_v2/src/modules/overlays/stats/CreateLines.h (modified) * code/branches/cpp11_v2/src/orxonox/Main.h (modified) Remove std::string forward declaration, conflicted with new libstdc++ Thu, 31 Dec 2015 13:23:59 GMT landauf [11009] * code/trunk (modified) * code/trunk/src/libraries/network/LANDiscoverable.cc (modified) merged single revision from cpp11_v2 to trunk to fix multiplayer Thu, 31 Dec 2015 00:04:04 GMT landauf [11008] * code/branches/cpp11_v2/src/libraries/util/MultiType.cc (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/SubString.cc (modified) * code/branches/cpp11_v2/src/libraries/util/SubString.h (modified) and finally some strongly typed enums in util. Wed, 30 Dec 2015 23:43:34 GMT landauf [11007] * code/branches/cpp11_v2/src/libraries/core/XMLPort.h (modified) * code/branches/cpp11_v2/src/libraries/core/command/ConsoleCommand.h (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/IOConsoleWindows.cc (modified) * code/branches/cpp11_v2/src/libraries/core/command/Shell.cc (modified) * code/branches/cpp11_v2/src/libraries/core/command/Shell.h (modified) * code/branches/cpp11_v2/src/orxonox/overlays/InGameConsole.cc (modified) made some enums in core library strongly typed. for other enums in ... Wed, 30 Dec 2015 22:34:25 GMT landauf [11006] * code/branches/cpp11_v2/src/libraries/network/Connection.cc (modified) * code/branches/cpp11_v2/src/libraries/network/Connection.h (modified) * code/branches/cpp11_v2/src/libraries/network/NetworkPrereqs.h (modified) * code/branches/cpp11_v2/src/libraries/network/packet/Acknowledgement.cc (modified) * code/branches/cpp11_v2/src/libraries/network/packet/Chat.cc (modified) * code/branches/cpp11_v2/src/libraries/network/packet/ClassID.cc (modified) * code/branches/cpp11_v2/src/libraries/network/packet/DeleteObjects.cc (modified) * code/branches/cpp11_v2/src/libraries/network/packet/FunctionCalls.cc (modified) * code/branches/cpp11_v2/src/libraries/network/packet/FunctionIDs.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/packet/Packet.h (modified) * code/branches/cpp11_v2/src/libraries/network/packet/Welcome.cc (modified) made some enums in network library strongly typed. for most other ... Wed, 30 Dec 2015 21:31:43 GMT landauf [11005] * code/branches/cpp11_v2/src/modules/overlays/OverlayText.cc (modified) * code/branches/cpp11_v2/src/orxonox/gametypes/Gametype.h (modified) * code/branches/cpp11_v2/src/orxonox/items/MultiStateEngine.cc (modified) * code/branches/cpp11_v2/src/orxonox/items/MultiStateEngine.h (modified) * code/branches/cpp11_v2/src/orxonox/items/PartDestructionEvent.cc (modified) * code/branches/cpp11_v2/src/orxonox/items/PartDestructionEvent.h (modified) * code/branches/cpp11_v2/src/orxonox/overlays/OrxonoxOverlay.cc (modified) * code/branches/cpp11_v2/src/orxonox/overlays/OrxonoxOverlay.h (modified) * code/branches/cpp11_v2/src/orxonox/sound/BaseSound.cc (modified) * code/branches/cpp11_v2/src/orxonox/sound/BaseSound.h (modified) * code/branches/cpp11_v2/src/orxonox/sound/WorldSound.cc (modified) * code/branches/cpp11_v2/src/orxonox/worldentities/pawns/TeamBaseMatchBase.h (modified) using strongly typed enum in various classes in orxonox-library Wed, 30 Dec 2015 21:07:09 GMT landauf [11004] * code/branches/cpp11_v2/src/modules/objects/Turret.cc (modified) * code/branches/cpp11_v2/src/modules/towerdefense/TowerDefenseEnemy.cc (modified) * code/branches/cpp11_v2/src/modules/towerdefense/TowerDefenseTower.cc (modified) * code/branches/cpp11_v2/src/modules/weapons/projectiles/GravityBomb.cc (modified) * code/branches/cpp11_v2/src/modules/weapons/projectiles/IceGunProjectile.cc (modified) * code/branches/cpp11_v2/src/modules/weapons/projectiles/LightningGunProjectile.cc (modified) * code/branches/cpp11_v2/src/modules/weapons/projectiles/Projectile.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/modules/weapons/projectiles/SimpleRocket.cc (modified) * code/branches/cpp11_v2/src/orxonox/worldentities/Drone.cc (modified) * code/branches/cpp11_v2/src/orxonox/worldentities/MobileEntity.cc (modified) * code/branches/cpp11_v2/src/orxonox/worldentities/StaticEntity.cc (modified) * code/branches/cpp11_v2/src/orxonox/worldentities/WorldEntity.cc (modified) * code/branches/cpp11_v2/src/orxonox/worldentities/WorldEntity.h (modified) * code/branches/cpp11_v2/src/orxonox/worldentities/pawns/FpsPlayer.cc (modified) * code/branches/cpp11_v2/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) using strongly typed enum class in WorldEntity Wed, 30 Dec 2015 20:24:39 GMT landauf [11003] * 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/NotificationManager.h (modified) * code/branches/cpp11_v2/src/modules/questsystem/QuestDescription.cc (modified) * code/branches/cpp11_v2/src/orxonox/infos/GametypeInfo.cc (modified) * code/branches/cpp11_v2/src/orxonox/interfaces/NotificationListener.cc (modified) * code/branches/cpp11_v2/src/orxonox/interfaces/NotificationListener.h (modified) using strongly typed enum class in notifications. ... Wed, 30 Dec 2015 20:13:14 GMT landauf [11002] * code/branches/cpp11_v2/src/libraries/network/synchronisable/Synchronisable.h (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/test/util/MultiTypeTest.cc (modified) MultiType now supports strongly typed enum classes. Their values are ... Wed, 30 Dec 2015 19:53:54 GMT landauf [11001] * code/branches/cpp11_v2/src/libraries/util/MultiType.h (modified) removed spezializations for MultiType::get<>(), using type-traits ... Wed, 30 Dec 2015 14:17:35 GMT landauf [11000] * code/branches/cpp11_v2/src/modules/gametypes/OldRaceCheckPoint.cc (modified) * code/branches/cpp11_v2/src/modules/gametypes/RaceCheckPoint.cc (modified) * code/branches/cpp11_v2/src/modules/objects/triggers/CheckPoint.cc (modified) * code/branches/cpp11_v2/src/modules/overlays/hud/HUDRadar.cc (modified) * code/branches/cpp11_v2/src/modules/portals/PortalEndPoint.cc (modified) * code/branches/cpp11_v2/src/modules/weapons/projectiles/GravityBombField.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/modules/weapons/projectiles/SimpleRocket.cc (modified) * code/branches/cpp11_v2/src/orxonox/Radar.cc (modified) * code/branches/cpp11_v2/src/orxonox/interfaces/RadarViewable.cc (modified) * code/branches/cpp11_v2/src/orxonox/interfaces/RadarViewable.h (modified) * code/branches/cpp11_v2/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/branches/cpp11_v2/src/orxonox/worldentities/pawns/TeamBaseMatchBase.cc (modified) using strongly typed enum classes for RadarViewable::Shape Wed, 30 Dec 2015 13:31:14 GMT landauf [10999] * code/branches/cpp11_v2/src/modules/jump/Jump.cc (modified) * code/branches/cpp11_v2/src/modules/mini4dgame/Mini4Dgame.h (modified) * code/branches/cpp11_v2/src/modules/mini4dgame/Mini4DgameAI.cc (modified) * code/branches/cpp11_v2/src/modules/mini4dgame/Mini4DgameAI.h (modified) * code/branches/cpp11_v2/src/modules/mini4dgame/Mini4DgameBoard.cc (modified) * code/branches/cpp11_v2/src/modules/mini4dgame/Mini4DgameBoard.h (modified) * code/branches/cpp11_v2/src/modules/objects/ForceField.cc (modified) * code/branches/cpp11_v2/src/modules/objects/ForceField.h (modified) * code/branches/cpp11_v2/src/modules/objects/Script.h (modified) * code/branches/cpp11_v2/src/modules/overlays/OverlayText.cc (modified) * code/branches/cpp11_v2/src/modules/overlays/OverlayText.h (modified) * code/branches/cpp11_v2/src/modules/towerdefense/TowerDefense.cc (modified) * code/branches/cpp11_v2/src/modules/towerdefense/TowerDefenseField.cc (modified) * code/branches/cpp11_v2/src/modules/towerdefense/TowerDefenseField.h (modified) using strongly typed enum classes in various modules Wed, 30 Dec 2015 12:59:38 GMT landauf [10998] * 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/DistanceTrigger.cc (modified) * code/branches/cpp11_v2/src/modules/objects/triggers/DistanceTrigger.h (modified) * code/branches/cpp11_v2/src/modules/objects/triggers/EventTrigger.cc (modified) * code/branches/cpp11_v2/src/modules/objects/triggers/EventTrigger.h (modified) * code/branches/cpp11_v2/src/modules/objects/triggers/Trigger.cc (modified) * code/branches/cpp11_v2/src/modules/objects/triggers/Trigger.h (modified) * code/branches/cpp11_v2/src/modules/objects/triggers/TriggerBase.h (modified) * code/branches/cpp11_v2/src/modules/pickup/Pickup.cc (modified) * code/branches/cpp11_v2/src/modules/pickup/Pickup.h (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/HealthPickup.h (modified) * code/branches/cpp11_v2/src/modules/pickup/items/MetaPickup.cc (modified) * code/branches/cpp11_v2/src/modules/pickup/items/MetaPickup.h (modified) using strongly typed enum class in pickups and triggers. Wed, 30 Dec 2015 11:21:18 GMT landauf [10997] * code/branches/cpp11_v2/src/modules/questsystem/GlobalQuest.cc (modified) * code/branches/cpp11_v2/src/modules/questsystem/GlobalQuest.h (modified) * code/branches/cpp11_v2/src/modules/questsystem/LocalQuest.cc (modified) * code/branches/cpp11_v2/src/modules/questsystem/LocalQuest.h (modified) * code/branches/cpp11_v2/src/modules/questsystem/Quest.h (modified) * code/branches/cpp11_v2/src/modules/questsystem/QuestEffectBeacon.h (modified) * code/branches/cpp11_v2/src/modules/questsystem/QuestHint.cc (modified) * code/branches/cpp11_v2/src/modules/questsystem/QuestHint.h (modified) * code/branches/cpp11_v2/src/modules/questsystem/QuestListener.h (modified) using strongly typed enum class in questsystem. this also revealed a ... Wed, 30 Dec 2015 10:59:18 GMT landauf [10996] * code/branches/cpp11_v2/src/libraries/network/synchronisable/Synchronisable.h (modified) * code/branches/cpp11_v2/src/orxonox/graphics/Light.cc (modified) * code/branches/cpp11_v2/src/orxonox/graphics/Light.h (modified) using a strongly typed enum class for Light-Type. added support for ... Wed, 30 Dec 2015 10:41:01 GMT landauf [10995] * code/branches/cpp11_v2/src/libraries/network/LANDiscoverable.cc (modified) bugfix: LANDiscoverable was not registered (and thus it wasn't ... Tue, 29 Dec 2015 16:36:14 GMT landauf [10994] * code/branches/cpp11_v2/src/libraries/core/CorePrereqs.h (modified) * code/branches/cpp11_v2/src/libraries/core/command/CommandExecutor.h (modified) * code/branches/cpp11_v2/src/libraries/core/command/IRC.cc (modified) * code/branches/cpp11_v2/src/libraries/core/input/InputPrereqs.h (modified) * code/branches/cpp11_v2/src/libraries/network/NetworkFunction.h (modified) * code/branches/cpp11_v2/src/libraries/network/NetworkPrereqs.h (modified) * code/branches/cpp11_v2/src/libraries/network/TrafficControl.cc (modified) * code/branches/cpp11_v2/src/libraries/network/packet/Gamestate.h (modified) * code/branches/cpp11_v2/src/libraries/util/output/LogWriter.cc (modified) * code/branches/cpp11_v2/src/libraries/util/output/OutputDefinitions.h (modified) * code/branches/cpp11_v2/src/orxonox/controllers/FormationController.cc (modified) using some constexpr Tue, 29 Dec 2015 16:18:23 GMT landauf [10993] * code/branches/cpp11_v2/src/libraries/core/command/ConsoleCommand.cc (modified) * code/branches/cpp11_v2/src/libraries/core/object/Listable.cc (modified) * code/branches/cpp11_v2/src/libraries/util/output/OutputStream.cc (modified) using constructor delegation Tue, 29 Dec 2015 16:16:28 GMT landauf [10992] * code/branches/cpp11_v2/src/libraries/core/ApplicationPaths.h (modified) * code/branches/cpp11_v2/src/libraries/core/ConfigurablePaths.h (modified) * code/branches/cpp11_v2/src/libraries/core/Core.h (modified) * code/branches/cpp11_v2/src/libraries/core/GUIManager.h (modified) * code/branches/cpp11_v2/src/libraries/core/Game.h (modified) * code/branches/cpp11_v2/src/libraries/core/GameMode.h (modified) * code/branches/cpp11_v2/src/libraries/core/GraphicsManager.h (modified) * code/branches/cpp11_v2/src/libraries/core/Language.h (modified) * code/branches/cpp11_v2/src/libraries/core/Resource.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/CommandExecutor.h (modified) * code/branches/cpp11_v2/src/libraries/core/command/IRC.h (modified) * code/branches/cpp11_v2/src/libraries/core/command/Shell.h (modified) * code/branches/cpp11_v2/src/libraries/core/command/TclBind.h (modified) * code/branches/cpp11_v2/src/libraries/core/commandline/CommandLineParser.h (modified) * code/branches/cpp11_v2/src/libraries/core/config/ConfigFileManager.h (modified) * code/branches/cpp11_v2/src/libraries/core/input/InputDevice.h (modified) * code/branches/cpp11_v2/src/libraries/core/input/InputManager.h (modified) * code/branches/cpp11_v2/src/libraries/core/input/KeyBinderManager.h (modified) * code/branches/cpp11_v2/src/libraries/core/input/KeyDetector.h (modified) * code/branches/cpp11_v2/src/libraries/tools/ResourceCollection.h (modified) * code/branches/cpp11_v2/src/libraries/tools/ResourceLocation.h (modified) * code/branches/cpp11_v2/src/libraries/tools/TextureGenerator.h (modified) * code/branches/cpp11_v2/src/libraries/util/Clock.h (modified) * code/branches/cpp11_v2/src/libraries/util/DestructionHelper.h (modified) * code/branches/cpp11_v2/src/libraries/util/ImplicitConversion.h (modified) * code/branches/cpp11_v2/src/libraries/util/Singleton.h (modified) * code/branches/cpp11_v2/src/libraries/util/output/ConsoleWriter.h (modified) * code/branches/cpp11_v2/src/libraries/util/output/LogWriter.h (modified) * code/branches/cpp11_v2/src/libraries/util/output/MemoryWriter.h (modified) * code/branches/cpp11_v2/src/libraries/util/output/OutputManager.h (modified) * code/branches/cpp11_v2/src/orxonox/CameraManager.h (modified) * code/branches/cpp11_v2/src/orxonox/LevelManager.h (modified) * code/branches/cpp11_v2/src/orxonox/chat/ChatManager.h (modified) for all non-copyable classes (i.e. those with deleted copy- ... Tue, 29 Dec 2015 15:59:35 GMT landauf [10991] * code/branches/cpp11_v2/src/libraries/core/object/ObjectListBase.h (modified) fix for the previous commit Tue, 29 Dec 2015 15:47:42 GMT landauf [10990] * code/branches/cpp11_v2/src/libraries/core/ApplicationPaths.h (modified) * code/branches/cpp11_v2/src/libraries/core/ClassTreeMask.h (modified) * code/branches/cpp11_v2/src/libraries/core/ConfigurablePaths.h (modified) * code/branches/cpp11_v2/src/libraries/core/Core.h (modified) * code/branches/cpp11_v2/src/libraries/core/CoreConfig.h (modified) * code/branches/cpp11_v2/src/libraries/core/GUIManager.h (modified) * code/branches/cpp11_v2/src/libraries/core/Game.h (modified) * code/branches/cpp11_v2/src/libraries/core/GameMode.h (modified) * code/branches/cpp11_v2/src/libraries/core/GraphicsManager.h (modified) * code/branches/cpp11_v2/src/libraries/core/Language.h (modified) * code/branches/cpp11_v2/src/libraries/core/Resource.h (modified) * code/branches/cpp11_v2/src/libraries/core/ViewportEventListener.h (modified) * code/branches/cpp11_v2/src/libraries/core/WindowEventListener.h (modified) * code/branches/cpp11_v2/src/libraries/core/XMLNameListener.h (modified) * code/branches/cpp11_v2/src/libraries/core/XMLPort.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/CommandExecutor.h (modified) * code/branches/cpp11_v2/src/libraries/core/command/Executor.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/IRC.h (modified) * code/branches/cpp11_v2/src/libraries/core/command/Shell.h (modified) * code/branches/cpp11_v2/src/libraries/core/command/TclBind.h (modified) * code/branches/cpp11_v2/src/libraries/core/commandline/CommandLineParser.h (modified) * code/branches/cpp11_v2/src/libraries/core/config/ConfigFileEntry.h (modified) * code/branches/cpp11_v2/src/libraries/core/config/ConfigFileEntryComment.h (modified) * code/branches/cpp11_v2/src/libraries/core/config/ConfigFileEntryValue.h (modified) * code/branches/cpp11_v2/src/libraries/core/config/ConfigFileEntryVectorValue.h (modified) * code/branches/cpp11_v2/src/libraries/core/config/ConfigFileManager.h (modified) * code/branches/cpp11_v2/src/libraries/core/config/ConfigValueContainer.h (modified) * code/branches/cpp11_v2/src/libraries/core/input/InputBuffer.h (modified) * code/branches/cpp11_v2/src/libraries/core/input/InputCommands.h (modified) * code/branches/cpp11_v2/src/libraries/core/input/InputDevice.h (modified) * code/branches/cpp11_v2/src/libraries/core/input/InputHandler.h (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/core/input/JoyStick.h (modified) * code/branches/cpp11_v2/src/libraries/core/input/JoyStickQuantityListener.h (modified) * code/branches/cpp11_v2/src/libraries/core/input/KeyBinderManager.h (modified) * code/branches/cpp11_v2/src/libraries/core/input/KeyDetector.h (modified) * code/branches/cpp11_v2/src/libraries/core/input/Keyboard.h (modified) * code/branches/cpp11_v2/src/libraries/core/module/StaticInitializationHandler.h (modified) * code/branches/cpp11_v2/src/libraries/core/module/StaticInitializationManager.h (modified) * code/branches/cpp11_v2/src/libraries/core/object/ClassFactory.h (modified) * code/branches/cpp11_v2/src/libraries/core/object/ObjectListBase.h (modified) * code/branches/cpp11_v2/src/libraries/core/singleton/Scope.h (modified) * code/branches/cpp11_v2/src/libraries/core/singleton/ScopedSingletonWrapper.h (modified) * code/branches/cpp11_v2/src/libraries/tools/ResourceCollection.cc (modified) * code/branches/cpp11_v2/src/libraries/tools/ResourceCollection.h (modified) * code/branches/cpp11_v2/src/libraries/tools/ResourceLocation.cc (modified) * code/branches/cpp11_v2/src/libraries/tools/ResourceLocation.h (modified) * code/branches/cpp11_v2/src/libraries/tools/TextureGenerator.h (modified) * code/branches/cpp11_v2/src/libraries/tools/interfaces/TimeFactorListener.h (modified) * code/branches/cpp11_v2/src/libraries/util/Clock.h (modified) * code/branches/cpp11_v2/src/libraries/util/DestructionHelper.h (modified) * code/branches/cpp11_v2/src/libraries/util/ImplicitConversion.h (modified) * code/branches/cpp11_v2/src/libraries/util/Singleton.h (modified) * code/branches/cpp11_v2/src/libraries/util/output/ConsoleWriter.h (modified) * code/branches/cpp11_v2/src/libraries/util/output/LogWriter.h (modified) * code/branches/cpp11_v2/src/libraries/util/output/MemoryWriter.h (modified) * code/branches/cpp11_v2/src/libraries/util/output/OutputManager.h (modified) * code/branches/cpp11_v2/src/orxonox/CameraManager.h (modified) * code/branches/cpp11_v2/src/orxonox/LevelManager.h (modified) * code/branches/cpp11_v2/src/orxonox/chat/ChatManager.h (modified) use '= delete' to explicitly delete unimplemented copy-constructors ... Tue, 29 Dec 2015 10:35:49 GMT landauf [10989] * code/branches/cpp11_v2/src/libraries/util/output/LogWriter.cc (modified) * code/branches/cpp11_v2/test/util/output/LogWriterTest.cc (modified) using the c++11 chrono library to add milliseconds to the timestamp ... Mon, 28 Dec 2015 22:22:21 GMT landauf [10988] * code/branches/cpp11_v2/src/libraries/core/class/IdentifierManager.cc (modified) * code/branches/cpp11_v2/src/libraries/core/class/IdentifierManager.h (modified) use an unordered map and type_index to store identifiers by typeid Mon, 28 Dec 2015 21:17:50 GMT landauf [10987] * code/branches/cpp11_v2/src/libraries/core/command/Functor.h (modified) now it also works with MSVC to wrap an std::function in a Functor Mon, 28 Dec 2015 17:57:26 GMT landauf [10986] * code/branches/cpp11_v2/src/libraries/core/command/Functor.h (modified) * code/branches/cpp11_v2/test/core/command/FunctorTest.cc (modified) use the existing class 'FunctorPointer' to store the callable object. ... Sun, 27 Dec 2015 22:43:12 GMT landauf [10985] * code/branches/cpp11_v2/src/libraries/core/command/Functor.h (modified) call function without using a touple Sun, 27 Dec 2015 22:40:47 GMT landauf [10984] * code/branches/cpp11_v2/test/core/command/FunctorTest.cc (modified) fixed warnings in test (msvc) Sun, 27 Dec 2015 22:17:12 GMT landauf [10983] * code/branches/cpp11_v2/test/core/command/FunctorTest.cc (modified) added a bunch of unit tests for Functor Sun, 27 Dec 2015 22:07:37 GMT landauf [10982] * code/branches/cpp11_v2/src/libraries/core/command/Functor.h (modified) now it's again possible to use std::type_info instead of type_index Sun, 27 Dec 2015 22:04:09 GMT landauf [10981] * code/branches/cpp11_v2/src/libraries/core/command/Functor.h (modified) not sure what's better: limiting functor to 5 arguments or having ... Sun, 27 Dec 2015 19:36:21 GMT landauf [10980] * code/branches/cpp11_v2/src/libraries/core/command/Functor.h (modified) getHeaderIdentifier(): return the typeid of the actual function ... Fri, 25 Dec 2015 23:05:20 GMT landauf [10979] * code/branches/cpp11_v2/src/libraries/core/command/Functor.h (modified) gcc doesn't allow an explicit spezialization of a function-template ... Fri, 25 Dec 2015 22:27:35 GMT landauf [10978] * code/branches/cpp11_v2/src/libraries/util/Math.h (modified) * code/branches/cpp11_v2/src/libraries/util/MultiType.h (modified) added comments Fri, 25 Dec 2015 22:22:11 GMT landauf [10977] * code/branches/cpp11_v2/src/libraries/util/Math.h (modified) fixed build (with gcc) Fri, 25 Dec 2015 20:07:12 GMT muemart [10976] * code/branches/cpp11_v2/src/libraries/util/Math.h (modified) * code/branches/cpp11_v2/src/libraries/util/MultiType.h (modified) Add some static asserts Wed, 23 Dec 2015 18:16:33 GMT muemart [10975] * code/branches/cpp11_v2/src/libraries/core/command/Functor.h (modified) * code/branches/cpp11_v2/test/core/command/FunctorTest.cc (modified) Extend Functor to handle any callable objects (lambdas!). Had to ... Mon, 14 Dec 2015 10:31:30 GMT maxima [10974] * code/branches/presentationHS15 (modified) * code/branches/presentationHS15/data/levels/AITest.oxw (modified) * code/branches/presentationHS15/src/orxonox/controllers/ActionpointController.cc (modified) * code/branches/presentationHS15/src/orxonox/controllers/ActionpointController.h (modified) * code/branches/presentationHS15/src/orxonox/controllers/CommonController.cc (modified) * code/branches/presentationHS15/src/orxonox/controllers/CommonController.h (modified) * code/branches/presentationHS15/src/orxonox/controllers/DivisionController.cc (modified) * code/branches/presentationHS15/src/orxonox/controllers/DivisionController.h (modified) * code/branches/presentationHS15/src/orxonox/controllers/FightingController.cc (modified) * code/branches/presentationHS15/src/orxonox/controllers/MasterController.cc (modified) * code/branches/presentationHS15/src/orxonox/controllers/SectionController.cc (modified) * code/branches/presentationHS15/src/orxonox/controllers/SectionController.h (modified) * code/branches/presentationHS15/src/orxonox/controllers/WingmanController.cc (modified) * code/branches/presentationHS15/src/orxonox/controllers/WingmanController.h (modified) merged campaign and presentation Mon, 14 Dec 2015 10:24:35 GMT fvultier [10973] * data/trunk/materials/101.material (modified) * data/trunk/materials/CityGround.material (modified) * data/trunk/materials/CityGroundLamps.material (added) * data/trunk/materials/Glasstower1.material (modified) * data/trunk/materials/Hausc1.material (modified) * data/trunk/materials/PrimeTower.material (modified) * data/trunk/models/101.mesh (modified) * data/trunk/models/CityGround.mesh (modified) * data/trunk/models/CityGroundLamps.mesh (modified) * data/trunk/models/Glasstower1.mesh (modified) * data/trunk/models/Hausc1.mesh (modified) * data/trunk/models/PrimeTower.mesh (modified) Converted some models to Ogre 1.4 Fri, 11 Dec 2015 21:07:29 GMT fvultier [10972] * data/contentcreation/pps/FabienVultier/JumpModelle (added) * data/contentcreation/pps/FabienVultier/JumpModelle/Jump.blend (added) * data/contentcreation/pps/FabienVultier/JumpModelle/JumpBoots.png (added) * data/contentcreation/pps/FabienVultier/JumpModelle/JumpEnemy1.png (added) * data/contentcreation/pps/FabienVultier/JumpModelle/JumpEnemy2.png (added) * data/contentcreation/pps/FabienVultier/JumpModelle/JumpEnemy2Wing.png (added) * data/contentcreation/pps/FabienVultier/JumpModelle/JumpEnemy3.png (added) * data/contentcreation/pps/FabienVultier/JumpModelle/JumpEnemy4.png (added) * data/contentcreation/pps/FabienVultier/JumpModelle/JumpFigure.png (added) * data/contentcreation/pps/FabienVultier/JumpModelle/JumpFigureLeftHand.png (added) * data/contentcreation/pps/FabienVultier/JumpModelle/JumpFigureRightHand.png (added) * data/contentcreation/pps/FabienVultier/JumpModelle/JumpPlatform01.png (added) * data/contentcreation/pps/FabienVultier/JumpModelle/JumpPlatform02.png (added) * data/contentcreation/pps/FabienVultier/JumpModelle/JumpPlatform03.png (added) * data/contentcreation/pps/FabienVultier/JumpModelle/JumpPlatform04.png (added) * data/contentcreation/pps/FabienVultier/JumpModelle/JumpPlatform05.png (added) * data/contentcreation/pps/FabienVultier/JumpModelle/JumpPlatform06.png (added) * data/contentcreation/pps/FabienVultier/JumpModelle/JumpProjectile.png (added) * data/contentcreation/pps/FabienVultier/JumpModelle/JumpPropeller.png (added) * data/contentcreation/pps/FabienVultier/JumpModelle/JumpRocket.png (added) * data/contentcreation/pps/FabienVultier/JumpModelle/JumpShield.png (added) * data/contentcreation/pps/FabienVultier/JumpModelle/JumpSpring.png (added) * data/contentcreation/pps/HendrikZuellig (added) * data/contentcreation/pps/HendrikZuellig/101.blend (added) * data/contentcreation/pps/HendrikZuellig/101.png (added) * data/contentcreation/pps/HendrikZuellig/101tryhard.blend (added) * data/contentcreation/pps/HendrikZuellig/CityGround.jpg (added) * data/contentcreation/pps/HendrikZuellig/CityGroundLights.blend (added) * data/contentcreation/pps/HendrikZuellig/CityGroundLights.jpg (added) * data/contentcreation/pps/HendrikZuellig/ETH.blend (added) * data/contentcreation/pps/HendrikZuellig/ETHNEW.png (added) * data/contentcreation/pps/HendrikZuellig/Glasstower1.jpg (added) * data/contentcreation/pps/HendrikZuellig/Prime.blend (added) * data/contentcreation/pps/HendrikZuellig/Working prime.blend (added) * data/contentcreation/pps/HendrikZuellig/citylamps.jpg (added) * data/contentcreation/pps/HendrikZuellig/ctg.jpg (added) * data/contentcreation/pps/HendrikZuellig/eth.png (added) * data/contentcreation/pps/HendrikZuellig/glasstower1.blend (added) * data/contentcreation/pps/HendrikZuellig/glasstower2.blend (added) * data/contentcreation/pps/HendrikZuellig/hausc1.blend (added) * data/contentcreation/pps/HendrikZuellig/hausc1.png (added) * data/contentcreation/pps/HendrikZuellig/hausc1tryhard.blend (added) * data/contentcreation/pps/HendrikZuellig/hausc2.blend (added) * data/contentcreation/pps/HendrikZuellig/hausc2.png (added) * data/contentcreation/pps/HendrikZuellig/hausc2tryhard.blend (added) * data/contentcreation/pps/HendrikZuellig/hausc3.blend (added) * data/contentcreation/pps/HendrikZuellig/hausc3.png (added) * data/contentcreation/pps/HendrikZuellig/lamps.png (added) * data/contentcreation/pps/HendrikZuellig/plane.blend (added) * data/contentcreation/pps/HendrikZuellig/prim.png (added) * data/contentcreation/pps/JannisHolzer (added) * data/contentcreation/pps/JannisHolzer/Mine (added) * data/contentcreation/pps/JannisHolzer/Mine/Mine.material (added) * data/contentcreation/pps/JannisHolzer/Mine/Mine.png (added) * data/contentcreation/pps/JannisHolzer/Mine/Mine_Core.mesh (added) * data/contentcreation/pps/JannisHolzer/Mine/Mine_Core.mesh.xml (added) * data/contentcreation/pps/JannisHolzer/Mine/Mine_Ring.mesh (added) * data/contentcreation/pps/JannisHolzer/Mine/Mine_Ring.mesh.xml (added) * data/contentcreation/pps/JannisHolzer/Mine/mine.blend (added) * data/contentcreation/pps/JannisHolzer/Sounds (added) * data/contentcreation/pps/JannisHolzer/Sounds/mineactivate.ogg (added) * data/contentcreation/pps/JannisHolzer/Sounds/minesound.ogg (added) * data/contentcreation/pps/SpaceStation (added) * data/contentcreation/pps/SpaceStation/Renders (added) * data/contentcreation/pps/SpaceStation/barrel_1.blend (added) * data/contentcreation/pps/SpaceStation/barrel_1.blend1 (added) * data/contentcreation/pps/SpaceStation/barrel_1.blend2 (added) * data/contentcreation/pps/SpaceStation/barrel_1.jpg (added) * data/contentcreation/pps/SpaceStation/barrel_1.png (added) * data/contentcreation/pps/SpaceStation/barrel_1.psd (added) * data/contentcreation/pps/SpaceStation/box_2_lowpoly.blend (added) * data/contentcreation/pps/SpaceStation/box_2_lowpoly.blend1 (added) * data/contentcreation/pps/SpaceStation/box_2_lowpoly.blend2 (added) * data/contentcreation/pps/SpaceStation/box_2_lowpoly.png (added) * data/contentcreation/pps/SpaceStation/box_2_lowpoly_ad1.blend (added) * data/contentcreation/pps/SpaceStation/box_2_lowpoly_ad1.blend1 (added) * data/contentcreation/pps/SpaceStation/box_2_lowpoly_ad2.blend (added) * data/contentcreation/pps/SpaceStation/box_2_lowpoly_ad3.blend (added) * data/contentcreation/pps/SpaceStation/box_2_lowpoly_ad4.blend (added) * data/contentcreation/pps/SpaceStation/box_2_lowpoly_ad4.blend1 (added) * data/contentcreation/pps/SpaceStation/can.blend (added) * data/contentcreation/pps/SpaceStation/can.jpg (added) * data/contentcreation/pps/SpaceStation/can.png (added) * data/contentcreation/pps/SpaceStation/can_a.jpg (added) * data/contentcreation/pps/SpaceStation/chair_2.blend (added) * data/contentcreation/pps/SpaceStation/chair_2.jpg (added) * data/contentcreation/pps/SpaceStation/chair_2.psd (added) * data/contentcreation/pps/SpaceStation/chair_2_bump.jpg (added) * data/contentcreation/pps/SpaceStation/char_1.blend (added) * data/contentcreation/pps/SpaceStation/companys (added) * data/contentcreation/pps/SpaceStation/companys/Ganymed.jpg (added) * data/contentcreation/pps/SpaceStation/companys/Ganymed.psd (added) * data/contentcreation/pps/SpaceStation/companys/can.psd (added) * data/contentcreation/pps/SpaceStation/companys/orxnet.jpg (added) * data/contentcreation/pps/SpaceStation/companys/orxnet.psd (added) * data/contentcreation/pps/SpaceStation/companys/redgas.jpg (added) * data/contentcreation/pps/SpaceStation/companys/redgas.psd (added) * data/contentcreation/pps/SpaceStation/cylinder_1.blend (added) * data/contentcreation/pps/SpaceStation/cylinder_1.blend1 (added) * data/contentcreation/pps/SpaceStation/cylinder_1.jpg (added) * data/contentcreation/pps/SpaceStation/cylinder_1.psd (added) * data/contentcreation/pps/SpaceStation/door.blend (added) * data/contentcreation/pps/SpaceStation/door_1.blend (added) * data/contentcreation/pps/SpaceStation/door_1.blend1 (added) * data/contentcreation/pps/SpaceStation/door_1.jpg (added) * data/contentcreation/pps/SpaceStation/door_1.psd (added) * data/contentcreation/pps/SpaceStation/explosa.psd (added) * data/contentcreation/pps/SpaceStation/flag.blend (added) * data/contentcreation/pps/SpaceStation/flag.png (added) * data/contentcreation/pps/SpaceStation/flag_AEAN.blend (added) * data/contentcreation/pps/SpaceStation/flag_AEAN.blend1 (added) * data/contentcreation/pps/SpaceStation/flag_AEAN.jpg (added) * data/contentcreation/pps/SpaceStation/flag_cau.blend (added) * data/contentcreation/pps/SpaceStation/flag_cau.jpg (added) * data/contentcreation/pps/SpaceStation/flag_csa.blend (added) * data/contentcreation/pps/SpaceStation/flag_csa.jpg (added) * data/contentcreation/pps/SpaceStation/flag_eu.blend (added) * data/contentcreation/pps/SpaceStation/flag_eu.blend1 (added) * data/contentcreation/pps/SpaceStation/flag_eu.jpg (added) * data/contentcreation/pps/SpaceStation/flag_room_1.blend (added) * data/contentcreation/pps/SpaceStation/flag_room_1.blend1 (added) * data/contentcreation/pps/SpaceStation/flag_room_1.blend2 (added) * data/contentcreation/pps/SpaceStation/flag_room_1.jpg (added) * data/contentcreation/pps/SpaceStation/flag_room_1.png (added) * data/contentcreation/pps/SpaceStation/flag_room_1.psd (added) * data/contentcreation/pps/SpaceStation/flag_room_2.jpg (added) * data/contentcreation/pps/SpaceStation/flag_room_3.jpg (added) * data/contentcreation/pps/SpaceStation/flag_room_4.jpg (added) * data/contentcreation/pps/SpaceStation/flag_uca.jpg (added) * data/contentcreation/pps/SpaceStation/flags (added) * data/contentcreation/pps/SpaceStation/flags/AEAN_flag.png (added) * data/contentcreation/pps/SpaceStation/flags/AEAN_flag.psd (added) * data/contentcreation/pps/SpaceStation/flags/cau flag.png (added) * data/contentcreation/pps/SpaceStation/flags/cau flag.psd (added) * data/contentcreation/pps/SpaceStation/flags/csa.png (added) * data/contentcreation/pps/SpaceStation/flags/csa.psd (added) * data/contentcreation/pps/SpaceStation/flags/eu_flag.png (added) * data/contentcreation/pps/SpaceStation/flags/eu_flag.psd (added) * data/contentcreation/pps/SpaceStation/flags/uca_flag.png (added) * data/contentcreation/pps/SpaceStation/flags/uca_flag.psd (added) * data/contentcreation/pps/SpaceStation/machine.blend (added) * data/contentcreation/pps/SpaceStation/mauer.blend (added) * data/contentcreation/pps/SpaceStation/mauer.blend1 (added) * data/contentcreation/pps/SpaceStation/mauer.blend2 (added) * data/contentcreation/pps/SpaceStation/mauer.png (added) * data/contentcreation/pps/SpaceStation/mauer_ad2.blend (added) * data/contentcreation/pps/SpaceStation/presentation (added) * data/contentcreation/pps/SpaceStation/presentation/Ganymed.png (added) * data/contentcreation/pps/SpaceStation/presentation/Ganymed.psd (added) * data/contentcreation/pps/SpaceStation/presentation/Renders (added) * data/contentcreation/pps/SpaceStation/presentation/attachment.ashx.blend1 (added) * data/contentcreation/pps/SpaceStation/presentation/box_2_lowpoly_ad2.3ds (added) * data/contentcreation/pps/SpaceStation/presentation/flag_room_1_1.blend (added) * data/contentcreation/pps/SpaceStation/presentation/flag_room_1_1.blend1 (added) * data/contentcreation/pps/SpaceStation/presentation/pic.blend (added) * data/contentcreation/pps/SpaceStation/presentation/presentation.blend (added) * data/contentcreation/pps/SpaceStation/presentation/presentation2.blend (added) * data/contentcreation/pps/SpaceStation/sleep_capsule.blend (added) * data/contentcreation/pps/SpaceStation/soda.jpg (added) * data/contentcreation/pps/SpaceStation/soda.psd (added) * data/contentcreation/pps/SpaceStation/spind_1.blend (added) * data/contentcreation/pps/SpaceStation/spind_1.blend2 (added) * data/contentcreation/pps/SpaceStation/spind_1.jpg (added) * data/contentcreation/pps/SpaceStation/spind_1.psd (added) * data/contentcreation/pps/SpaceStation/spind_1_bump.jpg (added) * data/contentcreation/pps/SpaceStation/spind_2.jpg (added) * data/contentcreation/pps/SpaceStation/ss_box_2.jpg (added) * data/contentcreation/pps/SpaceStation/ss_box_2.psd (added) * data/contentcreation/pps/SpaceStation/ss_box_2_ad1.jpg (added) * data/contentcreation/pps/SpaceStation/ss_box_2_ad2.jpg (added) * data/contentcreation/pps/SpaceStation/ss_box_2_bump.jpg (added) * data/contentcreation/pps/SpaceStation/ss_box_2_bump.psd (added) * data/contentcreation/pps/SpaceStation/ss_box_2_ganymede.jpg (added) * data/contentcreation/pps/SpaceStation/ss_box_2_ganymede.psd (added) * data/contentcreation/pps/SpaceStation/ss_box_2_none.jpg (added) * data/contentcreation/pps/SpaceStation/ss_box_2_none.psd (added) * data/contentcreation/pps/SpaceStation/ss_box_2_redgas.jpg (added) * data/contentcreation/pps/SpaceStation/ss_box_2_redgas.psd (added) * data/contentcreation/pps/SpaceStation/ss_mauer.jpg (added) * data/contentcreation/pps/SpaceStation/ss_mauer.psd (added) * data/contentcreation/pps/SpaceStation/ss_mauer_ad2.jpg (added) * data/contentcreation/pps/SpaceStation/ss_mauer_bump.jpg (added) * data/contentcreation/pps/SpaceStation/table_1.blend (added) * data/contentcreation/pps/SpaceStation/table_1.jpg (added) * data/contentcreation/pps/SpaceStation/table_1.png (added) * data/contentcreation/pps/SpaceStation/table_1.psd (added) * data/contentcreation/pps/SpaceStation/table_crack.blend (added) * data/contentcreation/pps/SpaceStation/table_crack.blend1 (added) * data/contentcreation/pps/SpaceStation/table_crack.blend2 (added) * data/contentcreation/pps/SpaceStation/table_crack.jpg (added) * data/contentcreation/pps/SpaceStation/table_crack.psd (added) * data/contentcreation/pps/SpaceStation/textures (added) * data/contentcreation/pps/SpaceStation/textures/AluminumBrush.png (added) * data/contentcreation/pps/SpaceStation/textures/Broken_Laptop_Screen.jpg (added) * data/contentcreation/pps/SpaceStation/textures/Bubble Grip.jpg (added) * data/contentcreation/pps/SpaceStation/textures/Clover Steel.jpg (added) * data/contentcreation/pps/SpaceStation/textures/Coated Metal.jpg (added) * data/contentcreation/pps/SpaceStation/textures/Heat Phase.jpg (added) * data/contentcreation/pps/SpaceStation/textures/Heated Metal.jpg (added) * data/contentcreation/pps/SpaceStation/textures/Imprinted Metal.jpg (added) * data/contentcreation/pps/SpaceStation/textures/Jupiter's Alloy.jpg (added) * data/contentcreation/pps/SpaceStation/textures/Kirk's Entry.jpg (added) * data/contentcreation/pps/SpaceStation/textures/Needlepoint Steel.jpg (added) * data/contentcreation/pps/SpaceStation/textures/Plastic-2923d.jpg (added) * data/contentcreation/pps/SpaceStation/textures/Qwerty.svg.png (added) * data/contentcreation/pps/SpaceStation/textures/Red_Mahogany_Wood_Texture_by_SweetSoulSister.jpg (added) * data/contentcreation/pps/SpaceStation/textures/Scratch_Texture_Brushes (added) * data/contentcreation/pps/SpaceStation/textures/Scratch_Texture_Brushes/ScratchTextures-ImagePack (added) * data/contentcreation/pps/SpaceStation/textures/Scratch_Texture_Brushes/ScratchTextures-ImagePack/01.jpg (added) * data/contentcreation/pps/SpaceStation/textures/Scratch_Texture_Brushes/ScratchTextures-ImagePack/02.jpg (added) * data/contentcreation/pps/SpaceStation/textures/Scratch_Texture_Brushes/ScratchTextures-ImagePack/03.jpg (added) * data/contentcreation/pps/SpaceStation/textures/Scratch_Texture_Brushes/ScratchTextures-ImagePack/04.jpg (added) * data/contentcreation/pps/SpaceStation/textures/Scratch_Texture_Brushes/ScratchTextures-ImagePack/05.jpg (added) * data/contentcreation/pps/SpaceStation/textures/Scratch_Texture_Brushes/ScratchTextures-ImagePack/06.jpg (added) * data/contentcreation/pps/SpaceStation/textures/Scratch_Texture_Brushes/ScratchTextures-ImagePack/07.jpg (added) * data/contentcreation/pps/SpaceStation/textures/Scratch_Texture_Brushes/ScratchTextures-ImagePack/08.jpg (added) * data/contentcreation/pps/SpaceStation/textures/Scratch_Texture_Brushes/ScratchTextures-ImagePack/09.jpg (added) * data/contentcreation/pps/SpaceStation/textures/Scratch_Texture_Brushes/ScratchTextures-ImagePack/10.jpg (added) * data/contentcreation/pps/SpaceStation/textures/Scratch_Texture_Brushes/ScratchTextures-ImagePack/11.jpg (added) * data/contentcreation/pps/SpaceStation/textures/Scratch_Texture_Brushes/ScratchTextures-ImagePack/12.jpg (added) * data/contentcreation/pps/SpaceStation/textures/Scratch_Texture_Brushes/ScratchTextures-ImagePack/13.jpg (added) * data/contentcreation/pps/SpaceStation/textures/Scratch_Texture_Brushes/ScratchTextures-ImagePack/14.jpg (added) * data/contentcreation/pps/SpaceStation/textures/Scratch_Texture_Brushes/ScratchTextures-ImagePack/15.jpg (added) * data/contentcreation/pps/SpaceStation/textures/Scratch_Texture_Brushes/ScratchTextures-ImagePack/16.jpg (added) * data/contentcreation/pps/SpaceStation/textures/Scratch_Texture_Brushes/ScratchTextures-ImagePack/17.jpg (added) * data/contentcreation/pps/SpaceStation/textures/Scratch_Texture_Brushes/ScratchTextures-daughterofsnape.abr (added) * data/contentcreation/pps/SpaceStation/textures/Seamless_Wood_Planks_Texture_by_cfrevoir.jpg (added) * data/contentcreation/pps/SpaceStation/textures/Star_Wars_Galaxy_Map_KOTOR_Quest.jpg (added) * data/contentcreation/pps/SpaceStation/textures/Steel Vault.jpg (added) * data/contentcreation/pps/SpaceStation/textures/Stressed Tin.jpg (added) * data/contentcreation/pps/SpaceStation/textures/Tileable metal scratch rust texture (3).jpg (added) * data/contentcreation/pps/SpaceStation/textures/brushed-metal-texture.jpg (added) * data/contentcreation/pps/SpaceStation/textures/chessboard_display_large.jpg (added) * data/contentcreation/pps/SpaceStation/textures/plastic_0050_01.jpg (added) * data/contentcreation/pps/SpaceStation/textures/seamless_carpet_dark_by_hhh316-d30v2ul.jpg (added) * data/contentcreation/pps/SpaceStation/textures/seamless_rough_plastic_texture_gb_by_blueamnesiac-d4mxpuj.png (added) * data/contentcreation/pps/SpaceStation/textures/sources.txt (added) * data/contentcreation/pps/SpaceStation/tube curve.jpg (added) * data/contentcreation/pps/SpaceStation/tube curve.psd (added) * data/contentcreation/pps/SpaceStation/tube curve_bump.jpg (added) * data/contentcreation/pps/SpaceStation/tube.blend (added) * data/contentcreation/pps/SpaceStation/tube.jpg (added) * data/contentcreation/pps/SpaceStation/tube.psd (added) * data/contentcreation/pps/SpaceStation/tube_bump.jpg (added) * data/contentcreation/pps/SpaceStation/tube_curve.blend (added) * data/contentcreation/pps/SpaceStation/tube_curve.blend1 (added) * data/contentcreation/pps/SpaceStation/tube_curve.blend2 (added) * data/contentcreation/pps/SpaceStation/tube_f.blend (added) * data/contentcreation/pps/SpaceStation/tube_t without.jpg (added) * data/contentcreation/pps/SpaceStation/tube_t_with_door.blend (added) * data/contentcreation/pps/SpaceStation/tube_t_without_door.blend (added) * data/contentcreation/pps/SpaceStation/tube_x.blend (added) * data/contentcreation/pps/SpaceStation/tube_x.jpg (added) * data/contentcreation/pps/SpaceStation/tube_x.psd (added) * data/contentcreation/pps/SpaceStation/tube_x_bump.jpg (added) * data/contentcreation/pps/SpaceStation/wall.jpg (added) * data/contentcreation/pps/SpaceStation/wall.psd (added) * data/contentcreation/pps/TobiasGatschet (added) * data/contentcreation/pps/TobiasGatschet/SpaceShipTransporter068.blend (added) * data/contentcreation/pps/TobiasGatschet/orbitalstation14.blend (added) * data/contentcreation/pps/TobiasGatschet/spaceshiptransporter.png (added) New content from PPS HS15 Fri, 11 Dec 2015 14:32:33 GMT gania [10971] * code/branches/campaignHS15/data/levels/AITest.oxw (modified) * code/branches/campaignHS15/src/orxonox/controllers/ActionpointController.h (modified) * code/branches/campaignHS15/src/orxonox/controllers/DivisionController.h (modified) * code/branches/campaignHS15/src/orxonox/controllers/SectionController.h (modified) * code/branches/campaignHS15/src/orxonox/controllers/WingmanController.h (modified) referenced the testing level in headers of child classes Fri, 11 Dec 2015 14:26:20 GMT maxima [10970] * code/branches/presentationHS15 (modified) * code/branches/presentationHS15/data/defaultConfig/orxonox.ini (modified) * code/branches/presentationHS15/data/gui/layouts/CampaignMenu.layout (modified) * code/branches/presentationHS15/data/gui/scripts/CampaignMenu.lua (modified) * code/branches/presentationHS15/data/levels/AITest.oxw (copied) * code/branches/presentationHS15/data/levels/expeditionSector.oxw (copied) * code/branches/presentationHS15/data/levels/missionOne.oxw (modified) * code/branches/presentationHS15/data/levels/shuttleAttack.oxw (copied) * code/branches/presentationHS15/data/levels/shuttleRetaliation.oxw (copied) * code/branches/presentationHS15/data/levels/templates/spaceshipShuttle.oxt (copied) * code/branches/presentationHS15/src/libraries/util/Math.cc (modified) * code/branches/presentationHS15/src/libraries/util/Math.h (modified) * code/branches/presentationHS15/src/modules/docking/DockingController.cc (modified) * code/branches/presentationHS15/src/modules/overlays/hud/HUDRadar.cc (modified) * code/branches/presentationHS15/src/modules/weapons/weaponmodes/MineGun.cc (modified) * code/branches/presentationHS15/src/orxonox/controllers/ActionpointController.cc (copied) * code/branches/presentationHS15/src/orxonox/controllers/ActionpointController.h (copied) * code/branches/presentationHS15/src/orxonox/controllers/CMakeLists.txt (modified) * code/branches/presentationHS15/src/orxonox/controllers/CommonController.cc (copied) * code/branches/presentationHS15/src/orxonox/controllers/CommonController.h (copied) * code/branches/presentationHS15/src/orxonox/controllers/DivisionController.cc (copied) * code/branches/presentationHS15/src/orxonox/controllers/DivisionController.h (copied) * code/branches/presentationHS15/src/orxonox/controllers/FightingController.cc (copied) * code/branches/presentationHS15/src/orxonox/controllers/FightingController.h (copied) * code/branches/presentationHS15/src/orxonox/controllers/FlyingController.cc (copied) * code/branches/presentationHS15/src/orxonox/controllers/FlyingController.h (copied) * code/branches/presentationHS15/src/orxonox/controllers/FormationController.cc (modified) * code/branches/presentationHS15/src/orxonox/controllers/MasterController.cc (copied) * code/branches/presentationHS15/src/orxonox/controllers/MasterController.h (copied) * code/branches/presentationHS15/src/orxonox/controllers/SectionController.cc (copied) * code/branches/presentationHS15/src/orxonox/controllers/SectionController.h (copied) * code/branches/presentationHS15/src/orxonox/controllers/WingmanController.cc (copied) * code/branches/presentationHS15/src/orxonox/controllers/WingmanController.h (copied) * code/branches/presentationHS15/src/orxonox/worldentities/Actionpoint.cc (copied) * code/branches/presentationHS15/src/orxonox/worldentities/Actionpoint.h (copied) * code/branches/presentationHS15/src/orxonox/worldentities/CMakeLists.txt (modified) * code/branches/presentationHS15/src/orxonox/worldentities/SpawnPoint.h (modified) * code/branches/presentationHS15/src/orxonox/worldentities/TeamSpawnPoint.cc (modified) * code/branches/presentationHS15/src/orxonox/worldentities/TeamSpawnPoint.h (modified) * code/branches/presentationHS15/src/orxonox/worldentities/pawns/Pawn.h (modified) * code/branches/presentationHS15/test/util/MathTest.cc (modified) Merged campaign and presentation. Everything seems to work fine. Fri, 11 Dec 2015 14:20:17 GMT gania [10969] * code/branches/campaignHS15/src/orxonox/controllers/FightingController.cc (modified) follow-up commit Fri, 11 Dec 2015 14:16:48 GMT gania [10968] * code/branches/campaignHS15/src/orxonox/controllers/ActionpointController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/ActionpointController.h (modified) * code/branches/campaignHS15/src/orxonox/controllers/CommonController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/CommonController.h (modified) * code/branches/campaignHS15/src/orxonox/controllers/DivisionController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/MasterController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/SectionController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/SectionController.h (modified) * code/branches/campaignHS15/src/orxonox/controllers/WingmanController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/WingmanController.h (modified) a little clean up Fri, 11 Dec 2015 13:21:20 GMT maxima [10967] * code/branches/presentationHS15 (modified) * code/branches/presentationHS15/data/levels/planetLevelHS15.oxw (copied) Added planetLevel to presentation. This level does not yet work on ... Thu, 10 Dec 2015 20:07:29 GMT luhug [10966] * data/trunk/images/textures/101.png (added) * data/trunk/images/textures/CityGround.jpg (added) * data/trunk/images/textures/ctg.jpg (added) * data/trunk/images/textures/hausc2.png (added) * data/trunk/images/textures/hausc3.jpg (added) * data/trunk/images/textures/hausc3.png (added) * data/trunk/materials/101.material (added) * data/trunk/materials/CityGround.material (added) * data/trunk/materials/Example.material (modified) * data/trunk/materials/Example.material~ (added) * data/trunk/materials/Glasstower1Material.material (added) * data/trunk/materials/Hausc2.material (added) * data/trunk/materials/Sky.material (added) * data/trunk/materials/cgt.material (added) * data/trunk/materials/hausc3.material (added) * data/trunk/models/101.mesh (added) * data/trunk/models/CityGround.mesh (added) * data/trunk/models/CityGroundLamps.mesh (added) * data/trunk/models/ETH.mesh (modified) * data/trunk/models/Hausc2.mesh (added) * data/trunk/models/PrimeTower.mesh (modified) * data/trunk/models/hausc3.mesh (added) Added all models for Planet/City level Thu, 10 Dec 2015 19:59:23 GMT luhug [10965] * code/branches/planetLevelHS15/data/levels/planetLevelHS15.oxw (modified) Finished! Wed, 09 Dec 2015 16:50:50 GMT fvultier [10964] * data/trunk/images/overlay/WSHUD_WM_MineGun.png (added) * data/trunk/materials/Orxonox.material (modified) Image of the MineGun for the weapon HUD. Wed, 09 Dec 2015 15:56:39 GMT maxima [10963] * code/branches/presentationHS15 (modified) * code/branches/presentationHS15/data/levels/emptyLevel.oxw (modified) * code/branches/presentationHS15/data/levels/includes/weaponSettingsAssff2.oxi (modified) * code/branches/presentationHS15/data/levels/includes/weaponSettingsEscortMine.oxi (added) * code/branches/presentationHS15/data/levels/mineLevel.oxw (added) * code/branches/presentationHS15/data/levels/pong.oxw (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipEscort.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipEscortMine.oxt (added) * code/branches/presentationHS15/data/particle/MineExpl.particle (copied) * code/branches/presentationHS15/data/particle/MineExpl1.particle (copied) * code/branches/presentationHS15/data/particle/MineExpl2.particle (copied) * code/branches/presentationHS15/data/particle/engine.particle (copied) * code/branches/presentationHS15/data/particle/engineglow.particle (modified) * code/branches/presentationHS15/data/particle/ice.particle (copied) * code/branches/presentationHS15/data/particle/mineparticle.particle (copied) * code/branches/presentationHS15/data/particle/psygun.particle (copied) * code/branches/presentationHS15/data/particle/rocketfire.particle (modified) * code/branches/presentationHS15/src/modules/weapons/WeaponsPrereqs.h (modified) * code/branches/presentationHS15/src/modules/weapons/munitions/CMakeLists.txt (modified) * code/branches/presentationHS15/src/modules/weapons/munitions/MineMunition.cc (copied) * code/branches/presentationHS15/src/modules/weapons/munitions/MineMunition.h (copied) * code/branches/presentationHS15/src/modules/weapons/projectiles/CMakeLists.txt (modified) * code/branches/presentationHS15/src/modules/weapons/projectiles/IceGunProjectile.cc (modified) * code/branches/presentationHS15/src/modules/weapons/projectiles/IceGunProjectile.h (modified) * code/branches/presentationHS15/src/modules/weapons/projectiles/MineProjectile.cc (copied) * code/branches/presentationHS15/src/modules/weapons/projectiles/MineProjectile.h (copied) * code/branches/presentationHS15/src/modules/weapons/projectiles/Projectile.h (modified) * code/branches/presentationHS15/src/modules/weapons/weaponmodes/CMakeLists.txt (modified) * code/branches/presentationHS15/src/modules/weapons/weaponmodes/MineGun.cc (copied) * code/branches/presentationHS15/src/modules/weapons/weaponmodes/MineGun.h (copied) * code/branches/presentationHS15/src/orxonox/weaponsystem/WeaponMode.cc (modified) Merged presentation and particleEffects branches. Added a new level, ... Wed, 09 Dec 2015 15:03:59 GMT maxima [10962] * code/branches/presentationHS15 (modified) * code/branches/presentationHS15/data/levels/HeavyCruiser.oxw (modified) * code/branches/presentationHS15/data/levels/emptyLevel.oxw (modified) * code/branches/presentationHS15/data/levels/iiiJohnVane_EscapeTheBastards.oxw (modified) * code/branches/presentationHS15/data/levels/kecks.oxw (modified) * code/branches/presentationHS15/data/levels/missionOne.oxw (modified) * code/branches/presentationHS15/data/levels/templates/FPS.oxt (modified) * code/branches/presentationHS15/data/levels/templates/FPS_HS14.oxt (modified) * code/branches/presentationHS15/data/levels/templates/HeavyCruiser.oxt (modified) * code/branches/presentationHS15/data/levels/templates/HeavyCruiserBody.oxt (modified) * code/branches/presentationHS15/data/levels/templates/ModularSpaceShipTest.oxt (modified) * code/branches/presentationHS15/data/levels/templates/bigship.oxt (modified) * code/branches/presentationHS15/data/levels/templates/enemyInvader.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipAssff.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipAssff2.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipCollateralDamage.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipDodgeRace.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipEscort.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipGhost.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipH2.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipHXY.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipHXYSL.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipHeartAttack.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipHover.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipInvader.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipPirate.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipRace.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipRing.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipSpacecruiser.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipSwallow.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipTransporter.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipTransporterSL.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipTurret.oxt (modified) * code/branches/presentationHS15/src/libraries/tools/ParticleInterface.cc (modified) * code/branches/presentationHS15/src/libraries/tools/ParticleInterface.h (modified) * code/branches/presentationHS15/src/modules/dodgerace/DodgeRace.cc (modified) * code/branches/presentationHS15/src/modules/dodgerace/DodgeRace.h (modified) * code/branches/presentationHS15/src/modules/invader/Invader.cc (modified) * code/branches/presentationHS15/src/orxonox/OrxonoxPrereqs.h (modified) * code/branches/presentationHS15/src/orxonox/items/ShipPart.cc (modified) * code/branches/presentationHS15/src/orxonox/worldentities/BigExplosion.cc (deleted) * code/branches/presentationHS15/src/orxonox/worldentities/BigExplosion.h (deleted) * code/branches/presentationHS15/src/orxonox/worldentities/CMakeLists.txt (modified) * code/branches/presentationHS15/src/orxonox/worldentities/ExplosionPart.cc (copied) * code/branches/presentationHS15/src/orxonox/worldentities/ExplosionPart.h (copied) * code/branches/presentationHS15/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/branches/presentationHS15/src/orxonox/worldentities/pawns/Pawn.h (modified) * code/branches/presentationHS15/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) Merged presentation and exlposionChunks branches. Works fine. Added ... Wed, 09 Dec 2015 13:45:58 GMT maxima [10961] * code/branches/presentationHS15 (modified) * code/branches/presentationHS15/data/gui/layouts/InGameMenu.layout (modified) * code/branches/presentationHS15/data/gui/scripts/InGameMenu.lua (modified) * code/branches/presentationHS15/data/levels/FPS_Level_HS14.oxw (modified) * code/branches/presentationHS15/data/levels/iJohnVane_TriptoArea51.oxw (modified) * code/branches/presentationHS15/data/levels/includes/invaderWeapon.oxi (modified) * code/branches/presentationHS15/data/levels/includes/invaderWeaponEnemy.oxi (modified) * code/branches/presentationHS15/data/levels/includes/pickups.oxi (modified) * code/branches/presentationHS15/data/levels/includes/towerWeaponSettings.oxi (deleted) * code/branches/presentationHS15/data/levels/includes/weaponSettingsAssff.oxi (modified) * code/branches/presentationHS15/data/levels/includes/weaponSettingsAssff2.oxi (modified) * code/branches/presentationHS15/data/levels/includes/weaponSettingsCollateral.oxi (modified) * code/branches/presentationHS15/data/levels/includes/weaponSettingsEscort.oxi (modified) * code/branches/presentationHS15/data/levels/includes/weaponSettingsFPS.oxi (modified) * code/branches/presentationHS15/data/levels/includes/weaponSettingsFPS_HS14.oxi (modified) * code/branches/presentationHS15/data/levels/includes/weaponSettingsFS15.oxi (modified) * code/branches/presentationHS15/data/levels/includes/weaponSettingsGhost.oxi (modified) * code/branches/presentationHS15/data/levels/includes/weaponSettingsH2.oxi (modified) * code/branches/presentationHS15/data/levels/includes/weaponSettingsHXY.oxi (modified) * code/branches/presentationHS15/data/levels/includes/weaponSettingsHeartAttack.oxi (modified) * code/branches/presentationHS15/data/levels/includes/weaponSettingsHeavyCruiser.oxi (modified) * code/branches/presentationHS15/data/levels/includes/weaponSettingsHeavyCruiserBody.oxi (modified) * code/branches/presentationHS15/data/levels/includes/weaponSettingsHover.oxi (modified) * code/branches/presentationHS15/data/levels/includes/weaponSettingsImmTest.oxi (modified) * code/branches/presentationHS15/data/levels/includes/weaponSettingsPirate.oxi (modified) * code/branches/presentationHS15/data/levels/includes/weaponSettingsRing.oxi (modified) * code/branches/presentationHS15/data/levels/includes/weaponSettingsSpacecruiser.oxi (modified) * code/branches/presentationHS15/data/levels/includes/weaponSettingsSwallow.oxi (modified) * code/branches/presentationHS15/data/levels/includes/weaponSettingsTransporter.oxi (modified) * code/branches/presentationHS15/data/levels/includes/weaponSettingsTurret.oxi (modified) * code/branches/presentationHS15/data/levels/includes/weaponSettingsTurret1.oxi (modified) * code/branches/presentationHS15/data/levels/includes/weaponSettingsbigship.oxi (modified) * code/branches/presentationHS15/data/levels/missionOne.oxw (modified) * code/branches/presentationHS15/data/levels/pickups.oxw (modified) * code/branches/presentationHS15/data/levels/presentationHS13.oxw (modified) * code/branches/presentationHS15/data/levels/shieldTest.oxw (modified) * code/branches/presentationHS15/data/levels/templates/HeavyCruiser.oxt (modified) * code/branches/presentationHS15/data/levels/templates/HeavyCruiserBody.oxt (modified) * code/branches/presentationHS15/data/levels/templates/ModularSpaceShipTest.oxt (modified) * code/branches/presentationHS15/data/levels/templates/bigship.oxt (modified) * code/branches/presentationHS15/data/levels/templates/enemyInvader.oxt (modified) * code/branches/presentationHS15/data/levels/templates/pickupRepresentationTemplates.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipAssff.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipAssff2.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipCollateralDamage.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipDodgeRace.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipEscort.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipGhost.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipHeartAttack.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipInvader.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipPirate.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipRace.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipRing.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipSpacecruiser.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipSwallow.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipTurret.oxt (modified) * code/branches/presentationHS15/data/levels/templates/towerdefensetower.oxt (modified) * code/branches/presentationHS15/data/levels/towerDefense.oxw (modified) * code/branches/presentationHS15/data/overlays/HUDTemplates3.oxo (modified) * code/branches/presentationHS15/data/overlays/HoverHUD.oxo (modified) * code/branches/presentationHS15/data/overlays/InvaderHUD.oxo (modified) * code/branches/presentationHS15/data/overlays/jumpHUD.oxo (modified) * code/branches/presentationHS15/src/modules/overlays/CMakeLists.txt (modified) * code/branches/presentationHS15/src/modules/overlays/OverlaysPrereqs.h (modified) * code/branches/presentationHS15/src/modules/overlays/hud/CMakeLists.txt (modified) * code/branches/presentationHS15/src/modules/overlays/hud/HUDBar.cc (modified) * code/branches/presentationHS15/src/modules/overlays/hud/HUDBar.h (modified) * code/branches/presentationHS15/src/modules/overlays/hud/HUDBoostBar.cc (modified) * code/branches/presentationHS15/src/modules/overlays/hud/HUDEnemyShieldBar.cc (copied) * code/branches/presentationHS15/src/modules/overlays/hud/HUDEnemyShieldBar.h (copied) * code/branches/presentationHS15/src/modules/overlays/hud/HUDHealthBar.cc (modified) * code/branches/presentationHS15/src/modules/overlays/hud/HUDHealthBar.h (modified) * code/branches/presentationHS15/src/modules/overlays/hud/HUDRocketFuelBar.cc (copied) * code/branches/presentationHS15/src/modules/overlays/hud/HUDRocketFuelBar.h (copied) * code/branches/presentationHS15/src/modules/overlays/hud/HUDShieldBar.cc (copied) * code/branches/presentationHS15/src/modules/overlays/hud/HUDShieldBar.h (copied) * code/branches/presentationHS15/src/modules/overlays/hud/HUDWeapon.cc (copied) * code/branches/presentationHS15/src/modules/overlays/hud/HUDWeapon.h (copied) * code/branches/presentationHS15/src/modules/overlays/hud/HUDWeaponMode.cc (copied) * code/branches/presentationHS15/src/modules/overlays/hud/HUDWeaponMode.h (copied) * code/branches/presentationHS15/src/modules/overlays/hud/HUDWeaponSystem.cc (copied) * code/branches/presentationHS15/src/modules/overlays/hud/HUDWeaponSystem.h (copied) * code/branches/presentationHS15/src/modules/pickup/PickupPrereqs.h (modified) * code/branches/presentationHS15/src/modules/pickup/PickupRepresentation.cc (modified) * code/branches/presentationHS15/src/modules/pickup/items/BoostPickup.cc (copied) * code/branches/presentationHS15/src/modules/pickup/items/BoostPickup.h (copied) * code/branches/presentationHS15/src/modules/pickup/items/CMakeLists.txt (modified) * code/branches/presentationHS15/src/modules/pickup/items/DronePickup.h (modified) * code/branches/presentationHS15/src/modules/pickup/items/MunitionContainer.cc (copied) * code/branches/presentationHS15/src/modules/pickup/items/MunitionContainer.h (copied) * code/branches/presentationHS15/src/modules/pickup/items/MunitionPickup.cc (copied) * code/branches/presentationHS15/src/modules/pickup/items/MunitionPickup.h (copied) * code/branches/presentationHS15/src/modules/towerdefense/TowerDefenseTower.cc (modified) * code/branches/presentationHS15/src/modules/weapons/WeaponsPrereqs.h (modified) * code/branches/presentationHS15/src/modules/weapons/munitions/CMakeLists.txt (modified) * code/branches/presentationHS15/src/modules/weapons/munitions/FusionMunition.cc (modified) * code/branches/presentationHS15/src/modules/weapons/munitions/FusionMunition.h (modified) * code/branches/presentationHS15/src/modules/weapons/munitions/GravityBombMunition.cc (modified) * code/branches/presentationHS15/src/modules/weapons/munitions/GravityBombMunition.h (modified) * code/branches/presentationHS15/src/modules/weapons/munitions/IceMunition.cc (modified) * code/branches/presentationHS15/src/modules/weapons/munitions/IceMunition.h (modified) * code/branches/presentationHS15/src/modules/weapons/munitions/LaserMunition.cc (modified) * code/branches/presentationHS15/src/modules/weapons/munitions/LaserMunition.h (modified) * code/branches/presentationHS15/src/modules/weapons/munitions/LightningMunition.cc (copied) * code/branches/presentationHS15/src/modules/weapons/munitions/LightningMunition.h (copied) * code/branches/presentationHS15/src/modules/weapons/munitions/ReplenishingMunition.cc (deleted) * code/branches/presentationHS15/src/modules/weapons/munitions/ReplenishingMunition.h (deleted) * code/branches/presentationHS15/src/modules/weapons/munitions/RocketMunition.cc (modified) * code/branches/presentationHS15/src/modules/weapons/munitions/RocketMunition.h (modified) * code/branches/presentationHS15/src/modules/weapons/munitions/SplitMunition.cc (modified) * code/branches/presentationHS15/src/modules/weapons/munitions/SplitMunition.h (modified) * code/branches/presentationHS15/src/modules/weapons/projectiles/BasicProjectile.cc (modified) * code/branches/presentationHS15/src/modules/weapons/projectiles/GravityBombField.cc (modified) * code/branches/presentationHS15/src/modules/weapons/projectiles/Rocket.cc (modified) * code/branches/presentationHS15/src/modules/weapons/projectiles/Rocket.h (modified) * code/branches/presentationHS15/src/modules/weapons/projectiles/SimpleRocket.cc (modified) * code/branches/presentationHS15/src/modules/weapons/weaponmodes/EnergyDrink.cc (modified) * code/branches/presentationHS15/src/modules/weapons/weaponmodes/FusionFire.cc (modified) * code/branches/presentationHS15/src/modules/weapons/weaponmodes/GravityBombFire.cc (modified) * code/branches/presentationHS15/src/modules/weapons/weaponmodes/HsW01.cc (modified) * code/branches/presentationHS15/src/modules/weapons/weaponmodes/IceGun.cc (modified) * code/branches/presentationHS15/src/modules/weapons/weaponmodes/LaserFire.cc (modified) * code/branches/presentationHS15/src/modules/weapons/weaponmodes/LightningGun.cc (modified) * code/branches/presentationHS15/src/modules/weapons/weaponmodes/RocketFire.cc (modified) * code/branches/presentationHS15/src/modules/weapons/weaponmodes/RocketFire.h (modified) * code/branches/presentationHS15/src/modules/weapons/weaponmodes/RocketFireOld.cc (modified) * code/branches/presentationHS15/src/modules/weapons/weaponmodes/SimpleRocketFire.cc (modified) * code/branches/presentationHS15/src/modules/weapons/weaponmodes/SplitGun.cc (modified) * code/branches/presentationHS15/src/orxonox/OrxonoxPrereqs.h (modified) * code/branches/presentationHS15/src/orxonox/controllers/HumanController.cc (modified) * code/branches/presentationHS15/src/orxonox/infos/PlayerInfo.cc (modified) * code/branches/presentationHS15/src/orxonox/overlays/OrxonoxOverlay.cc (modified) * code/branches/presentationHS15/src/orxonox/overlays/OrxonoxOverlay.h (modified) * code/branches/presentationHS15/src/orxonox/weaponsystem/CMakeLists.txt (modified) * code/branches/presentationHS15/src/orxonox/weaponsystem/Munition.cc (modified) * code/branches/presentationHS15/src/orxonox/weaponsystem/Munition.h (modified) * code/branches/presentationHS15/src/orxonox/weaponsystem/ReplenishingMunition.cc (copied) * code/branches/presentationHS15/src/orxonox/weaponsystem/ReplenishingMunition.h (copied) * code/branches/presentationHS15/src/orxonox/weaponsystem/Weapon.cc (modified) * code/branches/presentationHS15/src/orxonox/weaponsystem/Weapon.h (modified) * code/branches/presentationHS15/src/orxonox/weaponsystem/WeaponMode.cc (modified) * code/branches/presentationHS15/src/orxonox/weaponsystem/WeaponMode.h (modified) * code/branches/presentationHS15/src/orxonox/weaponsystem/WeaponPack.cc (modified) * code/branches/presentationHS15/src/orxonox/weaponsystem/WeaponPack.h (modified) * code/branches/presentationHS15/src/orxonox/weaponsystem/WeaponSystem.cc (modified) * code/branches/presentationHS15/src/orxonox/weaponsystem/WeaponSystem.h (modified) * code/branches/presentationHS15/src/orxonox/worldentities/MobileEntity.h (modified) * code/branches/presentationHS15/src/orxonox/worldentities/StaticEntity.h (modified) * code/branches/presentationHS15/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/branches/presentationHS15/src/orxonox/worldentities/pawns/Pawn.h (modified) * code/branches/presentationHS15/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) * code/branches/presentationHS15/src/orxonox/worldentities/pawns/SpaceShip.h (modified) Merged presentation and fabiens branch. Had to modify hoverHUD and ... Wed, 09 Dec 2015 11:47:30 GMT maxima [10960] * code/branches/presentationHS15 (modified) * code/branches/presentationHS15/data/levels/Hover.oxw (copied) * code/branches/presentationHS15/data/levels/includes/weaponSettingsHover.oxi (copied) * code/branches/presentationHS15/data/levels/templates/spaceshipHover.oxt (copied) * code/branches/presentationHS15/data/overlays/HoverHUD.oxo (copied) * code/branches/presentationHS15/src/modules/CMakeLists.txt (modified) * code/branches/presentationHS15/src/modules/hover (copied) * code/branches/presentationHS15/src/modules/hover/CMakeLists.txt (copied) * code/branches/presentationHS15/src/modules/hover/FlagHUD.cc (copied) * code/branches/presentationHS15/src/modules/hover/FlagHUD.h (copied) * code/branches/presentationHS15/src/modules/hover/Hover.cc (copied) * code/branches/presentationHS15/src/modules/hover/Hover.h (copied) * code/branches/presentationHS15/src/modules/hover/HoverFlag.cc (copied) * code/branches/presentationHS15/src/modules/hover/HoverFlag.h (copied) * code/branches/presentationHS15/src/modules/hover/HoverOrigin.cc (copied) * code/branches/presentationHS15/src/modules/hover/HoverOrigin.h (copied) * code/branches/presentationHS15/src/modules/hover/HoverPrereqs.h (copied) * code/branches/presentationHS15/src/modules/hover/HoverShip.cc (copied) * code/branches/presentationHS15/src/modules/hover/HoverShip.h (copied) * code/branches/presentationHS15/src/modules/hover/HoverWall.cc (copied) * code/branches/presentationHS15/src/modules/hover/HoverWall.h (copied) * code/branches/presentationHS15/src/modules/hover/TimeHUD.cc (copied) * code/branches/presentationHS15/src/modules/hover/TimeHUD.h (copied) Merged presentation and hover branches. Hover minigame works fine. Wed, 09 Dec 2015 11:14:46 GMT maxima [10959] * code/branches/presentationHS15 (copied) New branch for PPS-presentation Tue, 08 Dec 2015 12:02:25 GMT gania [10958] * code/branches/campaignHS15/data/levels/AITest.oxw (modified) * code/branches/campaignHS15/src/orxonox/controllers/ActionpointController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/FightingController.h (modified) * code/branches/campaignHS15/src/orxonox/controllers/FlyingController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/FlyingController.h (modified) * code/branches/campaignHS15/src/orxonox/controllers/MasterController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/MasterController.h (modified) separated MasterController from my hierarchy Tue, 08 Dec 2015 10:15:47 GMT bhatiab [10957] * code/branches/campaignHS15/data/levels/templates/spaceshipShuttle.oxt (modified) Fixed collisionshapes and camera angles for the spaceshuttle Tue, 08 Dec 2015 09:32:07 GMT bhatiab [10956] * code/branches/campaignHS15/data/levels/templates/spaceshipShuttle.oxt (modified) Fixed Lighteffects for moving and breaking as well as the direction ... Mon, 07 Dec 2015 21:24:20 GMT gania [10955] * code/branches/campaignHS15/src/orxonox/controllers/ActionpointController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/ActionpointController.h (modified) * code/branches/campaignHS15/src/orxonox/controllers/CommonController.h (modified) * code/branches/campaignHS15/src/orxonox/controllers/DivisionController.h (modified) * code/branches/campaignHS15/src/orxonox/controllers/FightingController.h (modified) * code/branches/campaignHS15/src/orxonox/controllers/MasterController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/MasterController.h (modified) * code/branches/campaignHS15/src/orxonox/controllers/SectionController.h (modified) * code/branches/campaignHS15/src/orxonox/controllers/WingmanController.h (modified) cleaned up a bit Mon, 07 Dec 2015 19:45:07 GMT gania [10954] * code/branches/campaignHS15/src/orxonox/controllers/MasterController.cc (added) * code/branches/campaignHS15/src/orxonox/controllers/MasterController.h (added) added Master Mon, 07 Dec 2015 19:42:03 GMT gania [10953] * code/branches/campaignHS15/data/levels/AITest.oxw (modified) * code/branches/campaignHS15/data/levels/shuttleRetaliation.oxw (modified) * code/branches/campaignHS15/src/orxonox/controllers/ActionpointController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/ActionpointController.h (modified) * code/branches/campaignHS15/src/orxonox/controllers/CMakeLists.txt (modified) * code/branches/campaignHS15/src/orxonox/controllers/CommonController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/CommonController.h (modified) * code/branches/campaignHS15/src/orxonox/controllers/DivisionController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/FightingController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/FightingController.h (modified) * code/branches/campaignHS15/src/orxonox/controllers/FormationController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/WingmanController.cc (modified) converted hack to a legal class Mon, 07 Dec 2015 16:29:43 GMT fvultier [10952] * code/branches/hoverHS15/data/levels/includes/weaponSettingsHover.oxi (added) * code/branches/hoverHS15/data/levels/templates/spaceshipHover.oxt (modified) Missing include added. Mon, 07 Dec 2015 16:04:44 GMT luhug [10951] * code/branches/planetLevelHS15/data/levels/luaTest.oxw (modified) * code/branches/planetLevelHS15/data/levels/planetLevelHS15.oxw (added) Put together the elements of our project in a new Level, ... Mon, 07 Dec 2015 15:42:46 GMT paulsc [10950] * code/branches/campaignHS15/data/defaultConfig/orxonox.ini (modified) * code/branches/campaignHS15/data/gui/layouts/CampaignMenu.layout (modified) * code/branches/campaignHS15/data/gui/scripts/CampaignMenu.lua (modified) Improved campaign menu Mon, 07 Dec 2015 15:18:39 GMT holzerj [10949] * data/trunk/audio/sounds/mineactivate.ogg (added) Activation sound effect for mine Mon, 07 Dec 2015 15:15:07 GMT holzerj [10948] * code/branches/particleEffectsHS15/src/modules/weapons/projectiles/MineProjectile.cc (modified) * code/branches/particleEffectsHS15/src/modules/weapons/weaponmodes/MineGun.cc (modified) Mine activation sound effect Mon, 07 Dec 2015 15:09:39 GMT gstalder [10947] * code/branches/hoverHS15/data/levels/templates/spaceshipHover.oxt (modified) hover weapon template added Mon, 07 Dec 2015 15:06:37 GMT gania [10946] * code/branches/campaignHS15/src/orxonox/controllers/ActionpointController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/ActionpointController.h (modified) * code/branches/campaignHS15/src/orxonox/controllers/CommonController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/CommonController.h (modified) * code/branches/campaignHS15/src/orxonox/controllers/DivisionController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/FlyingController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/FlyingController.h (modified) * code/branches/campaignHS15/src/orxonox/controllers/SectionController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/WingmanController.cc (modified) fix for sigsegv? Mon, 07 Dec 2015 15:03:07 GMT holzerj [10945] * data/trunk/audio/sounds/minesound.ogg (added) Added Mine Explosion Sound Effect Mon, 07 Dec 2015 15:01:06 GMT holzerj [10944] * code/branches/particleEffectsHS15/data/particle/MineExpl.particle (modified) * code/branches/particleEffectsHS15/data/particle/MineExpl1.particle (modified) * code/branches/particleEffectsHS15/data/particle/MineExpl2.particle (modified) * code/branches/particleEffectsHS15/src/modules/weapons/projectiles/MineProjectile.cc (modified) * code/branches/particleEffectsHS15/src/modules/weapons/weaponmodes/MineGun.h (modified) Polished Mine Mon, 07 Dec 2015 14:49:51 GMT gstalder [10943] * code/branches/hoverHS15/data/levels/templates/spaceshipHover.oxt (modified) Added model and collision shapes to hover ship template Mon, 07 Dec 2015 14:48:07 GMT vaydin [10942] * code/branches/explosionChunksHS15/src/orxonox/worldentities/ExplosionPart.cc (modified) added comments to the file Mon, 07 Dec 2015 14:47:59 GMT bucyril [10941] * data/trunk/images/textures/hovership_body.png (added) * data/trunk/images/textures/hovership_gun.png (added) * data/trunk/images/textures/hvoership_engine.png (added) * data/trunk/materials/hovership_body.material (added) * data/trunk/materials/hovership_engine.material (added) * data/trunk/materials/hovership_gun.material (added) * data/trunk/models/hovership_body.mesh (added) * data/trunk/models/hovership_engine.mesh (added) * data/trunk/models/hovership_gun.mesh (added) Added hovership model Mon, 07 Dec 2015 14:34:58 GMT meierman [10940] * code/branches/hoverHS15/data/levels/Hover.oxw (modified) Invisible plate over the level Mon, 07 Dec 2015 14:34:08 GMT vaydin [10939] * code/branches/explosionChunksHS15/src/orxonox/worldentities/BigExplosion.cc (deleted) * code/branches/explosionChunksHS15/src/orxonox/worldentities/BigExplosion.h (deleted) forgot to delete bigexplosion Mon, 07 Dec 2015 14:32:10 GMT meierman [10938] * code/branches/hoverHS15/src/modules/hover/Hover.cc (modified) Removed some warnings Mon, 07 Dec 2015 14:32:07 GMT vaydin [10937] * code/branches/explosionChunksHS15/data/levels/HeavyCruiser.oxw (modified) * code/branches/explosionChunksHS15/data/levels/templates/spaceshipAssff.oxt (modified) * code/branches/explosionChunksHS15/data/levels/templates/spaceshipPirate.oxt (modified) * code/branches/explosionChunksHS15/src/libraries/tools/ParticleInterface.cc (modified) * code/branches/explosionChunksHS15/src/libraries/tools/ParticleInterface.h (modified) * code/branches/explosionChunksHS15/src/modules/dodgerace/DodgeRace.cc (modified) * code/branches/explosionChunksHS15/src/modules/dodgerace/DodgeRace.h (modified) * code/branches/explosionChunksHS15/src/modules/invader/Invader.cc (modified) * code/branches/explosionChunksHS15/src/orxonox/OrxonoxPrereqs.h (modified) * code/branches/explosionChunksHS15/src/orxonox/items/ShipPart.cc (modified) * code/branches/explosionChunksHS15/src/orxonox/worldentities/CMakeLists.txt (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) Finalized everything deleted now unnecessary BigExplosion Mon, 07 Dec 2015 14:21:41 GMT bucyril [10936] * data/trunk/images/overlay/flag.png (added) * data/trunk/materials/hover_wall.jpg (added) Added flag overlay image and material Mon, 07 Dec 2015 14:14:40 GMT gania [10935] * code/branches/campaignHS15/src/orxonox/controllers/ActionpointController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/ActionpointController.h (modified) * code/branches/campaignHS15/src/orxonox/controllers/DivisionController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/FightingController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/SectionController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/SectionController.h (modified) * code/branches/campaignHS15/src/orxonox/controllers/WingmanController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/WingmanController.h (modified) cleaned source up a bit Mon, 07 Dec 2015 13:49:46 GMT gania [10934] * code/branches/campaignHS15/src/orxonox/controllers/ActionpointController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/ActionpointController.h (modified) * code/branches/campaignHS15/src/orxonox/controllers/FightingController.cc (modified) * code/branches/campaignHS15/src/orxonox/controllers/FightingController.h (modified) fixed bugs that are not supposed to even exist by initializing a ...