# # ChangeLog for code/trunk/src/modules # # Generated by Trac 1.0.9 # Nov 27, 2024, 6:34:08 AM Mon, 19 Feb 2018 23:14:40 GMT landauf [11783] * code/trunk (modified) * code/trunk/data/gui/layouts/Dialog.layout (copied) * code/trunk/data/gui/layouts/Dialogue.layout (deleted) * code/trunk/data/gui/layouts/HighscoreMenu.layout (modified) * code/trunk/data/gui/scripts/Dialog.lua (copied) * code/trunk/data/gui/scripts/Dialogue.lua (deleted) * code/trunk/data/gui/scripts/HighscoreMenu.lua (modified) * code/trunk/data/gui/scripts/TestDialogButttons.lua (modified) * code/trunk/data/levels/ArrowLevel.oxw (copied) * code/trunk/data/levels/AsteroidFarming.oxw (copied) * code/trunk/data/levels/Asteroids2D.oxw (copied) * code/trunk/data/levels/DialogShowcase.oxw (copied) * code/trunk/data/levels/DialogueShowcase.oxw (deleted) * code/trunk/data/levels/Endurancefinal.oxw (modified) * code/trunk/data/levels/FlappyOrx.oxw (copied) * code/trunk/data/levels/MilleniumFalconTest.oxw (modified) * code/trunk/data/levels/NC_StoryModeLevel.oxw (copied) * code/trunk/data/levels/ProtectBoss.oxw (copied) * code/trunk/data/levels/SOB.oxw (modified) * code/trunk/data/levels/StoryModeMap.oxw (modified) * code/trunk/data/levels/includes/MFalconWeapon.oxi (modified) * code/trunk/data/levels/includes/asteroids2DWeapon.oxi (copied) * code/trunk/data/levels/newnewnewspacerace.oxw (modified) * code/trunk/data/levels/templates/MFalcon.oxt (modified) * code/trunk/data/levels/templates/StoryMode.oxt (modified) * code/trunk/data/levels/templates/StoryModeEscort.oxt (copied) * code/trunk/data/levels/templates/asteroidsAsteroids2D.oxt (copied) * code/trunk/data/levels/templates/endurancetest_template.oxt (modified) * code/trunk/data/levels/templates/enemyFlappyOrx.oxt (copied) * code/trunk/data/levels/templates/fastship.oxt (modified) * code/trunk/data/levels/templates/spaceshipAsteroids2D.oxt (copied) * code/trunk/data/levels/templates/spaceshipFlappyOrx.oxt (copied) * code/trunk/data/overlays/Asteroids2DHUD.oxo (copied) * code/trunk/data/overlays/FlappyOrxHUD.oxo (copied) * code/trunk/data/overlays/HUDTemplates3.oxo (modified) * code/trunk/data/overlays/HUDTemplatesFPS.oxo (modified) * code/trunk/data/overlays/SOBHUD.oxo (modified) * code/trunk/data/overlays/StoryModeHUD.oxo (modified) * code/trunk/data/overlays/StoryModeHUD2.oxo (copied) * code/trunk/data/particle/fire3.particle (modified) * code/trunk/src/libraries/tools/Mesh.cc (modified) * code/trunk/src/libraries/tools/Mesh.h (modified) * code/trunk/src/modules/CMakeLists.txt (modified) * code/trunk/src/modules/asteroidmining (copied) * code/trunk/src/modules/asteroids2D (copied) * code/trunk/src/modules/dialog (copied) * code/trunk/src/modules/dialogue (deleted) * code/trunk/src/modules/dodgerace/DodgeRace.cc (modified) * code/trunk/src/modules/dodgerace/DodgeRace.h (modified) * code/trunk/src/modules/flappyorx (copied) * code/trunk/src/modules/overlays/hud/CMakeLists.txt (modified) * code/trunk/src/modules/overlays/hud/HUDPickupSystem.cc (modified) * code/trunk/src/modules/overlays/hud/HUDPickupSystem.h (modified) * code/trunk/src/modules/overlays/hud/StoryModeHUD.cc (copied) * code/trunk/src/modules/overlays/hud/StoryModeHUD.h (copied) * code/trunk/src/modules/pickup/PickupPrereqs.h (modified) * code/trunk/src/modules/pickup/PickupSpawner.cc (modified) * code/trunk/src/modules/pickup/PickupSpawner.h (modified) * code/trunk/src/modules/superorxobros/CMakeLists.txt (modified) * code/trunk/src/modules/superorxobros/Orxo.cc (deleted) * code/trunk/src/modules/superorxobros/Orxo.h (deleted) * code/trunk/src/modules/superorxobros/SOB.cc (modified) * code/trunk/src/modules/superorxobros/SOB.h (modified) * code/trunk/src/modules/superorxobros/SOBCastlestone.cc (modified) * code/trunk/src/modules/superorxobros/SOBCastlestone.h (modified) * code/trunk/src/modules/superorxobros/SOBCenterpoint.cc (modified) * code/trunk/src/modules/superorxobros/SOBCenterpoint.h (modified) * code/trunk/src/modules/superorxobros/SOBCoin.cc (modified) * code/trunk/src/modules/superorxobros/SOBCoin.h (modified) * code/trunk/src/modules/superorxobros/SOBFigure.cc (modified) * code/trunk/src/modules/superorxobros/SOBFigure.h (modified) * code/trunk/src/modules/superorxobros/SOBFireball.cc (copied) * code/trunk/src/modules/superorxobros/SOBFireball.h (copied) * code/trunk/src/modules/superorxobros/SOBFlagstone.cc (modified) * code/trunk/src/modules/superorxobros/SOBFlagstone.h (modified) * code/trunk/src/modules/superorxobros/SOBGumba.cc (modified) * code/trunk/src/modules/superorxobros/SOBGumba.h (modified) * code/trunk/src/modules/superorxobros/SOBGumbaBoss.cc (copied) * code/trunk/src/modules/superorxobros/SOBGumbaBoss.h (copied) * code/trunk/src/modules/superorxobros/SOBHUDInfo.cc (modified) * code/trunk/src/modules/superorxobros/SOBHUDInfo.h (modified) * code/trunk/src/modules/superorxobros/SOBItem.cc (modified) * code/trunk/src/modules/superorxobros/SOBItem.h (modified) * code/trunk/src/modules/superorxobros/SOBMushroom.cc (modified) * code/trunk/src/modules/superorxobros/SOBMushroom.h (modified) * code/trunk/src/modules/superorxobros/SOBPrereqs.h (modified) * code/trunk/src/modules/superorxobros/SOBQBlock.cc (modified) * code/trunk/src/modules/superorxobros/SOBQBlock.h (modified) * code/trunk/src/modules/weapons/munitions/FlameMunition.cc (modified) * code/trunk/src/modules/weapons/munitions/FlameMunition.h (modified) * code/trunk/src/modules/weapons/projectiles/FlameGunProjectile.cc (modified) * code/trunk/src/modules/weapons/projectiles/FlameGunProjectile.h (modified) * code/trunk/src/modules/weapons/weaponmodes/FlameGun.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/FlameGun.h (modified) * code/trunk/src/orxonox/Highscore.cc (modified) * code/trunk/src/orxonox/Highscore.h (modified) * code/trunk/src/orxonox/OrxonoxPrereqs.h (modified) * code/trunk/src/orxonox/controllers/ArrowController.cc (copied) * code/trunk/src/orxonox/controllers/ArrowController.h (copied) * code/trunk/src/orxonox/controllers/CMakeLists.txt (modified) * code/trunk/src/orxonox/controllers/DroneController.cc (modified) * code/trunk/src/orxonox/controllers/HumanController.h (modified) * code/trunk/src/orxonox/gametypes/StoryMode.cc (modified) * code/trunk/src/orxonox/gametypes/StoryMode.h (modified) * code/trunk/src/orxonox/graphics/Model.cc (modified) * code/trunk/src/orxonox/graphics/Model.h (modified) * code/trunk/src/orxonox/interfaces/RadarViewable.h (modified) * code/trunk/src/orxonox/worldentities/Arrow.cc (copied) * code/trunk/src/orxonox/worldentities/Arrow.h (copied) * code/trunk/src/orxonox/worldentities/CMakeLists.txt (modified) * code/trunk/src/orxonox/worldentities/NameableStaticEntity.cc (copied) * code/trunk/src/orxonox/worldentities/NameableStaticEntity.h (copied) * code/trunk/src/orxonox/worldentities/pawns/CMakeLists.txt (modified) * code/trunk/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/Pawn.h (modified) * code/trunk/src/orxonox/worldentities/pawns/ShootableObstacle.cc (copied) * code/trunk/src/orxonox/worldentities/pawns/ShootableObstacle.h (copied) * code/trunk/src/orxonox/worldentities/pawns/StoryModePawn.cc (copied) * code/trunk/src/orxonox/worldentities/pawns/StoryModePawn.h (copied) merged Presentation_HS17_merge back to trunk Sat, 10 Feb 2018 00:01:38 GMT landauf [11721] * code/trunk/src/modules/gametypes/SpaceRace.cc (modified) [SpaceRace_HS16] fixed warning with MSVC Sun, 04 Feb 2018 15:58:37 GMT landauf [11720] * code/trunk/src/modules/gametypes/SpaceRace.cc (modified) * code/trunk/src/modules/gametypes/SpaceRace.h (modified) * code/trunk/src/modules/gametypes/SpaceRaceBot.cc (modified) * code/trunk/src/modules/gametypes/SpaceRaceBot.h (modified) * code/trunk/src/modules/gametypes/SpaceRaceController.cc (modified) * code/trunk/src/orxonox/controllers/HumanController.h (modified) * code/trunk/src/orxonox/infos/Bot.cc (modified) * code/trunk/src/orxonox/infos/GametypeInfo.h (modified) [SpaceRace_HS16] reverted some unwanted changes and fixed formatting ... Sun, 07 Jan 2018 21:34:30 GMT landauf [11718] * code/trunk/data/gui/layouts/Dialogue.layout (modified) * code/trunk/data/gui/layouts/SingleplayerMenu.layout (modified) * code/trunk/data/gui/scripts/HighscoreMenu.lua (modified) * code/trunk/data/overlays/HUDTemplates3.oxo (modified) * code/trunk/data/overlays/towerdefenseHUD.oxo (modified) * code/trunk/src/modules/dialogue/DialogueManager.cc (modified) * code/trunk/src/modules/dialogue/DialogueManager.h (modified) * code/trunk/src/modules/dialogue/NextQuestion.cc (modified) * code/trunk/src/modules/dialogue/NextQuestion.h (modified) * code/trunk/src/modules/gametypes/SpaceRaceBot.h (modified) tabs -> spaces Sun, 07 Jan 2018 20:48:58 GMT landauf [11716] * code/trunk/src/modules/dodgerace/DodgeRace.cc (modified) * code/trunk/src/modules/invader/Invader.cc (modified) * code/trunk/src/modules/jump/Jump.cc (modified) * code/trunk/src/modules/tetris/Tetris.cc (modified) * code/trunk/src/modules/towerdefense/TowerDefense.cc (modified) * code/trunk/src/orxonox/Highscore.cc (modified) * code/trunk/src/orxonox/Highscore.h (modified) [Highscore_HS16] moved logic to compare old an new score to ... Sun, 07 Jan 2018 20:16:52 GMT landauf [11715] * code/trunk/src/modules/dodgerace/DodgeRace.cc (modified) * code/trunk/src/modules/invader/Invader.cc (modified) * code/trunk/src/modules/jump/Jump.cc (modified) * code/trunk/src/modules/tetris/Tetris.cc (modified) * code/trunk/src/modules/towerdefense/TowerDefense.cc (modified) * code/trunk/src/orxonox/Highscore.cc (modified) * code/trunk/src/orxonox/Highscore.h (modified) [Highscore_HS16] removed playerName from Highscore because the player ... Sat, 06 Jan 2018 23:46:52 GMT landauf [11709] * code/trunk/src/modules/overlays/hud/HUDPickupSystem.cc (modified) * code/trunk/src/modules/overlays/hud/HUDPickupSystem.h (modified) [HUD_HS16] removed unused function Sat, 06 Jan 2018 17:07:53 GMT landauf [11708] * code/trunk/src/modules/overlays/hud/HUDPickupSystem.cc (modified) * code/trunk/src/modules/overlays/hud/HUDPickupSystem.h (modified) * code/trunk/src/modules/pickup/PickupManager.cc (modified) * code/trunk/src/modules/pickup/PickupManager.h (modified) * code/trunk/src/modules/pickup/PickupPrereqs.h (modified) * code/trunk/src/orxonox/controllers/ActionpointController.h (modified) [HUD_HS16] fixed issue that the hud shows pickups of ALL players/bots ... Sat, 06 Jan 2018 15:34:18 GMT landauf [11707] * code/trunk/src/modules/pickup/PickupSpawner.cc (modified) fixed nullptr access when two pawns trigger a pickup-spawner at the ... Sat, 06 Jan 2018 14:13:26 GMT landauf [11705] * code/trunk/data/overlays/HUDPickupTemplate.oxo (modified) * code/trunk/data/overlays/HUDTemplates3.oxo (modified) * code/trunk/src/modules/overlays/OverlaysPrereqs.h (modified) * code/trunk/src/modules/overlays/hud/CMakeLists.txt (modified) * code/trunk/src/modules/overlays/hud/HUDPickupItem.cc (deleted) * code/trunk/src/modules/overlays/hud/HUDPickupItem.h (deleted) * code/trunk/src/modules/overlays/hud/HUDPickupSystem.cc (modified) * code/trunk/src/modules/overlays/hud/HUDPickupSystem.h (modified) [HUD_HS16] removed HUDPickupItem as it is not really necessary (it's ... Sat, 06 Jan 2018 02:16:00 GMT landauf [11704] * code/trunk/data/defaultConfig/keybindings.ini (modified) * code/trunk/data/gui/scripts/KeyBindMenu.lua (modified) * code/trunk/src/modules/overlays/CMakeLists.txt (modified) * code/trunk/src/modules/overlays/hud/HUDPickupSystem.cc (modified) * code/trunk/src/modules/overlays/hud/HUDPickupSystem.h (modified) * code/trunk/src/modules/pickup/CMakeLists.txt (modified) * code/trunk/src/modules/pickup/PickupManager.cc (modified) * code/trunk/src/modules/pickup/PickupManager.h (modified) * code/trunk/src/orxonox/CMakeLists.txt (modified) * code/trunk/src/orxonox/interfaces/Pickupable.h (modified) [HUD_HS16] fixed wrong dependency between overlays and pickup module: ... Sat, 06 Jan 2018 01:11:17 GMT landauf [11703] * code/trunk/src/modules/overlays/hud/HUDPickupSystem.cc (modified) [HUD_HS16] fixed bug with the position of the hud pickup items Sat, 06 Jan 2018 01:01:20 GMT landauf [11702] * code/trunk/src/modules/overlays/hud/HUDPickupItem.cc (modified) * code/trunk/src/modules/overlays/hud/HUDPickupItem.h (modified) * code/trunk/src/modules/overlays/hud/HUDPickupSystem.cc (modified) * code/trunk/src/modules/overlays/hud/HUDPickupSystem.h (modified) [HUD_HS16] removed a lot of unused stuff Fri, 05 Jan 2018 23:24:02 GMT landauf [11701] * code/trunk/src/modules/overlays/hud/HUDPickupItem.cc (modified) * code/trunk/src/modules/overlays/hud/HUDPickupSystem.cc (modified) * code/trunk/src/modules/pickup/PickupManager.cc (modified) * code/trunk/src/orxonox/interfaces/Pickupable.cc (modified) [HUD_HS16] removed debug output Fri, 05 Jan 2018 23:15:25 GMT landauf [11700] * code/trunk (modified) * code/trunk/src/modules/overlays/hud/HUDPickupItem.cc (modified) * code/trunk/src/modules/overlays/hud/HUDPickupSystem.cc (modified) * code/trunk/src/modules/overlays/hud/HUDPickupSystem.h (modified) * code/trunk/src/modules/pickup/PickupManager.cc (modified) * code/trunk/src/orxonox/interfaces/Pickupable.cc (modified) merged the remaining commits of HUD_HS16 branch back to trunk (except ... Thu, 04 Jan 2018 00:08:43 GMT landauf [11699] * code/trunk/src/libraries/core/module/DynLib.cc (modified) * code/trunk/src/modules/dialogue/DialogueManager.h (modified) * code/trunk/src/modules/dialogue/DialoguePrereqs.h (modified) * code/trunk/src/modules/dialogue/NextQuestion.h (modified) * code/trunk/src/modules/superorxobros/SOBPrereqs.h (modified) * code/trunk/src/orxonox/worldentities/Actionpoint.cc (modified) trying to fix build for MSVC but still having trouble with the ... Sun, 22 Oct 2017 22:23:21 GMT patricwi [11495] * code/trunk (modified) * code/trunk/data/levels/Hover.oxw (modified) * code/trunk/data/levels/includes/weaponSettingsHover.oxi (modified) * code/trunk/data/levels/templates/spaceshipHover.oxt (modified) * code/trunk/data/overlays/HoverHUD.oxo (modified) * code/trunk/src/modules/hover/CMakeLists.txt (modified) * code/trunk/src/modules/hover/Hover.cc (modified) * code/trunk/src/modules/hover/Hover.h (modified) * code/trunk/src/modules/hover/HoverFlag.cc (modified) * code/trunk/src/modules/hover/HoverOrigin.cc (modified) * code/trunk/src/modules/hover/HoverOrigin.h (modified) * code/trunk/src/modules/hover/HoverShip.cc (modified) * code/trunk/src/modules/hover/HoverShip.h (modified) * code/trunk/src/modules/hover/TFlagsLivesLevelHUD.cc (deleted) * code/trunk/src/modules/hover/TFlagsLivesLevelHUD.h (deleted) * code/trunk/src/modules/weapons/weaponmodes/HsW01.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/HsW01.h (modified) reverted commit from merge with tgidronFS16 because failed to compile Mon, 16 Oct 2017 14:07:37 GMT patricwi [11493] * code/trunk (modified) * code/trunk/data/levels/Hover.oxw (modified) * code/trunk/data/levels/includes/weaponSettingsHover.oxi (modified) * code/trunk/data/levels/templates/spaceshipHover.oxt (modified) * code/trunk/data/overlays/HoverHUD.oxo (modified) * code/trunk/src/modules/hover/CMakeLists.txt (modified) * code/trunk/src/modules/hover/Hover.cc (modified) * code/trunk/src/modules/hover/Hover.h (modified) * code/trunk/src/modules/hover/HoverFlag.cc (modified) * code/trunk/src/modules/hover/HoverOrigin.cc (modified) * code/trunk/src/modules/hover/HoverOrigin.h (modified) * code/trunk/src/modules/hover/HoverShip.cc (modified) * code/trunk/src/modules/hover/HoverShip.h (modified) * code/trunk/src/modules/hover/TFlagsLivesLevelHUD.cc (copied) * code/trunk/src/modules/hover/TFlagsLivesLevelHUD.h (copied) * code/trunk/src/modules/weapons/weaponmodes/HsW01.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/HsW01.h (modified) Merged tgidronFS16 Wed, 11 Oct 2017 14:11:29 GMT patricwi [11451] * code/trunk (modified) * code/trunk/data/gui/layouts/Dialogue.layout (copied) * code/trunk/data/gui/scripts/Dialogue.lua (copied) * code/trunk/data/gui/scripts/TestDialogButttons.lua (copied) * code/trunk/data/levels/DialogueShowcase.oxw (copied) * code/trunk/data/levels/events.oxw (modified) * code/trunk/data/overlays/HUDTemplates3.oxo (modified) * code/trunk/src/modules/CMakeLists.txt (modified) * code/trunk/src/modules/dialogue (copied) Dialogue merged without core modifications Wed, 11 Oct 2017 14:07:20 GMT patricwi [11450] * code/trunk (modified) * code/trunk/data/gui/layouts/Dialogue.layout (deleted) * code/trunk/data/gui/scripts/Dialogue.lua (deleted) * code/trunk/data/gui/scripts/TestDialogButttons.lua (deleted) * code/trunk/data/levels/DialogueShowcase.oxw (deleted) * code/trunk/data/levels/events.oxw (modified) * code/trunk/data/overlays/HUDTemplates3.oxo (modified) * code/trunk/data/tcl/core (deleted) * code/trunk/src/modules/CMakeLists.txt (modified) * code/trunk/src/modules/dialogue (deleted) reverted merge Dialogue Mon, 02 Oct 2017 13:04:31 GMT patricwi [11449] * code/trunk (modified) * code/trunk/data/levels/SOB.oxw (added) * code/trunk/data/overlays/SOBHUD.oxo (copied) * code/trunk/src/modules/CMakeLists.txt (modified) * code/trunk/src/modules/superorxobros (copied) SuperOrxoBros added Mon, 02 Oct 2017 12:32:11 GMT patricwi [11447] * code/trunk (modified) * code/trunk/data/gui/layouts/Dialogue.layout (copied) * code/trunk/data/gui/scripts/Dialogue.lua (copied) * code/trunk/data/gui/scripts/TestDialogButttons.lua (copied) * code/trunk/data/levels/DialogueShowcase.oxw (copied) * code/trunk/data/levels/events.oxw (modified) * code/trunk/data/overlays/HUDTemplates3.oxo (modified) * code/trunk/data/tcl/core (copied) * code/trunk/src/modules/CMakeLists.txt (modified) * code/trunk/src/modules/dialogue (copied) Dialogue merged Thu, 09 Mar 2017 15:22:19 GMT patricwi [11358] * code/trunk (modified) * code/trunk/data/levels/Spacerace2.oxw (deleted) * code/trunk/data/levels/SurfaceRacePresentation.oxw (deleted) * code/trunk/data/levels/newnewnewspacerace.oxw (copied) * code/trunk/data/levels/spaceRace.oxw (deleted) * code/trunk/data/levels/surfaceRace.oxw (deleted) * code/trunk/data/levels/templates/fastship.oxt (copied) * code/trunk/src/modules/gametypes/CMakeLists.txt (modified) * code/trunk/src/modules/gametypes/OldRaceCheckPoint.cc (deleted) * code/trunk/src/modules/gametypes/OldRaceCheckPoint.h (deleted) * code/trunk/src/modules/gametypes/OldSpaceRace.cc (deleted) * code/trunk/src/modules/gametypes/OldSpaceRace.h (deleted) * code/trunk/src/modules/gametypes/SpaceRace.cc (modified) * code/trunk/src/modules/gametypes/SpaceRace.h (modified) * code/trunk/src/modules/gametypes/SpaceRaceBot.cc (modified) * code/trunk/src/modules/gametypes/SpaceRaceBot.h (modified) * code/trunk/src/modules/gametypes/SpaceRaceController.cc (modified) * code/trunk/src/orxonox/controllers/HumanController.h (modified) * code/trunk/src/orxonox/gametypes/Gametype.cc (modified) * code/trunk/src/orxonox/infos/Bot.cc (modified) * code/trunk/src/orxonox/infos/GametypeInfo.h (modified) * code/trunk/src/orxonox/sound/WorldAmbientSound.cc (modified) space race merged Thu, 09 Mar 2017 14:38:58 GMT patricwi [11356] * code/trunk (modified) * code/trunk/data/gui/layouts/HighscoreMenu.layout (copied) * code/trunk/data/gui/layouts/MainMenu.layout (modified) * code/trunk/data/gui/scripts/HighscoreMenu.lua (copied) * code/trunk/data/gui/scripts/MainMenu.lua (modified) * code/trunk/data/gui/scripts/MiscConfigMenu.lua (modified) * code/trunk/src/modules/dodgerace/DodgeRace.cc (modified) * code/trunk/src/modules/invader/Invader.cc (modified) * code/trunk/src/modules/jump/Jump.cc (modified) * code/trunk/src/modules/tetris/Tetris.cc (modified) * code/trunk/src/modules/towerdefense/TowerDefense.cc (modified) * code/trunk/src/orxonox/CMakeLists.txt (modified) * code/trunk/src/orxonox/Highscore.cc (copied) * code/trunk/src/orxonox/Highscore.h (copied) * code/trunk/src/orxonox/LevelInfo.cc (modified) * code/trunk/src/orxonox/LevelInfo.h (modified) merged space race with trunk Thu, 09 Mar 2017 13:50:27 GMT patricwi [11354] * code/trunk (modified) * code/trunk/data/levels/pickups.oxw (modified) * code/trunk/data/overlays/HUDPickupTemplate.oxo (copied) * code/trunk/data/overlays/HUDTemplates3.oxo (modified) * code/trunk/src/modules/overlays/hud/HUDPickupSystem.cc (modified) * code/trunk/src/modules/overlays/hud/HUDPickupSystem.h (modified) merged updated HUD branch to trunk Thu, 09 Mar 2017 13:46:20 GMT patricwi [11353] * code/trunk (modified) * code/trunk/README (modified) * code/trunk/data/defaultConfig/keybindings.ini (modified) * code/trunk/data/gui/scripts/KeyBindMenu.lua (modified) * code/trunk/data/overlays/HUDTemplates3.oxo (modified) * code/trunk/data/overlays/HUDTemplatesFPS.oxo (modified) * code/trunk/src/modules/overlays/OverlaysPrereqs.h (modified) * code/trunk/src/modules/overlays/hud/CMakeLists.txt (modified) * code/trunk/src/modules/overlays/hud/HUDPickupItem.cc (copied) * code/trunk/src/modules/overlays/hud/HUDPickupItem.h (copied) * code/trunk/src/modules/overlays/hud/HUDPickupSystem.cc (copied) * code/trunk/src/modules/overlays/hud/HUDPickupSystem.h (copied) * code/trunk/src/modules/pickup/CMakeLists.txt (modified) * code/trunk/src/modules/pickup/PickupManager.cc (modified) * code/trunk/src/modules/pickup/PickupManager.h (modified) * code/trunk/src/modules/pickup/items/SpeedPickup.h (modified) * code/trunk/src/orxonox/CMakeLists.txt (modified) * code/trunk/src/orxonox/controllers/HumanController.h (modified) * code/trunk/src/orxonox/gamestates/GSLevel.cc (modified) * code/trunk/src/orxonox/gamestates/GSLevel.h (modified) * code/trunk/src/orxonox/interfaces/Pickupable.h (modified) merged HUD branch to trunk Sun, 14 Feb 2016 17:08:13 GMT landauf [11115] * code/trunk/src/external/bullet/LinearMath/btAlignedAllocator.cpp (modified) * code/trunk/src/external/bullet/LinearMath/btSerializer.h (modified) * code/trunk/src/libraries/core/Core.cc (modified) * code/trunk/src/libraries/core/GraphicsManager.cc (modified) * code/trunk/src/libraries/util/SignalHandler.cc (modified) * code/trunk/src/libraries/util/SignalHandler.h (modified) * code/trunk/src/modules/overlays/GUIOverlay.cc (modified) fixed code to compile in 64bit mode Thu, 04 Feb 2016 22:54:04 GMT fvultier [11108] * code/trunk/data/levels/includes/weaponSettingsFPS.oxi (modified) * code/trunk/data/levels/includes/weaponSettingsGhost.oxi (modified) * code/trunk/data/levels/templates/pickupRepresentationTemplates.oxt (modified) * code/trunk/src/modules/weapons/munitions/CMakeLists.txt (modified) * code/trunk/src/modules/weapons/munitions/FlameMunition.cc (added) * code/trunk/src/modules/weapons/munitions/FlameMunition.h (added) * code/trunk/src/modules/weapons/munitions/LaserMunition.cc (modified) * code/trunk/src/modules/weapons/projectiles/BasicProjectile.cc (modified) * code/trunk/src/modules/weapons/projectiles/BasicProjectile.h (modified) * code/trunk/src/modules/weapons/projectiles/CMakeLists.txt (modified) * code/trunk/src/modules/weapons/projectiles/FlameGunProjectile.cc (added) * code/trunk/src/modules/weapons/projectiles/FlameGunProjectile.h (added) * code/trunk/src/modules/weapons/projectiles/LightningGunProjectile.cc (modified) * code/trunk/src/modules/weapons/projectiles/ParticleProjectile.cc (modified) * code/trunk/src/modules/weapons/projectiles/ParticleProjectile.h (modified) * code/trunk/src/modules/weapons/projectiles/Projectile.cc (modified) * code/trunk/src/modules/weapons/projectiles/SplitGunProjectile.cc (modified) * code/trunk/src/modules/weapons/projectiles/SplitGunProjectile.h (modified) * code/trunk/src/modules/weapons/weaponmodes/CMakeLists.txt (modified) * code/trunk/src/modules/weapons/weaponmodes/EnergyDrink.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/EnergyDrink.h (modified) * code/trunk/src/modules/weapons/weaponmodes/FlameGun.cc (added) * code/trunk/src/modules/weapons/weaponmodes/FlameGun.h (added) * code/trunk/src/modules/weapons/weaponmodes/FusionFire.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/GravityBombFire.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/HsW01.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/IceGun.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/LaserFire.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/LightningGun.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/MineGun.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/SimpleRocketFire.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/SplitGun.cc (modified) * code/trunk/src/orxonox/weaponsystem/WeaponMode.cc (modified) * code/trunk/src/orxonox/weaponsystem/WeaponMode.h (modified) A few modifications in the weapon system: WeaponModes may play a ... Mon, 01 Feb 2016 16:27:49 GMT fvultier [11105] * code/trunk/src/modules/jump/JumpCenterpoint.h (modified) * code/trunk/src/modules/jump/JumpFigure.h (modified) * code/trunk/src/modules/objects/SpaceBoundaries.cc (modified) Removed wrong comments in Jump minigame. These comments were ... Sun, 31 Jan 2016 19:43:10 GMT landauf [11103] * code/trunk/src/libraries/core/BaseObject.cc (modified) * code/trunk/src/libraries/network/Server.cc (modified) * code/trunk/src/libraries/network/synchronisable/Synchronisable.cc (modified) * code/trunk/src/modules/pickup/PickupSpawner.cc (modified) * code/trunk/src/modules/weapons/projectiles/GravityBombField.cc (modified) fixed warnings (release build). fixed error in GravityBombField Wed, 27 Jan 2016 17:50:51 GMT muemart [11099] * code/trunk/doc/api/doxy.config.in (modified) * code/trunk/doc/api/groups/Pickup.dox (modified) * code/trunk/doc/api/groups/Portals.dox (modified) * code/trunk/src/libraries/core/CoreIncludes.h (modified) * code/trunk/src/libraries/core/GUIManager.cc (modified) * code/trunk/src/libraries/core/class/IdentifierManager.cc (modified) * code/trunk/src/libraries/core/command/CommandExecutor.cc (modified) * code/trunk/src/libraries/core/command/ConsoleCommandCompilation.cc (modified) * code/trunk/src/libraries/core/commandline/CommandLineIncludes.h (modified) * code/trunk/src/libraries/core/commandline/CommandLineParser.cc (modified) * code/trunk/src/libraries/core/commandline/CommandLineParser.h (modified) * code/trunk/src/libraries/core/config/ConfigValueContainer.h (modified) * code/trunk/src/libraries/core/object/IteratorBase.h (modified) * code/trunk/src/libraries/core/object/ObjectListBase.h (modified) * code/trunk/src/libraries/network/MasterServerComm.h (modified) * code/trunk/src/libraries/network/ServerList.h (modified) * code/trunk/src/libraries/tools/BulletDebugDrawer.cc (modified) * code/trunk/src/libraries/tools/BulletDebugDrawer.h (modified) * code/trunk/src/libraries/tools/DebugDrawer.cc (modified) * code/trunk/src/libraries/tools/DebugDrawer.h (modified) * code/trunk/src/libraries/tools/IcoSphere.cc (modified) * code/trunk/src/libraries/tools/IcoSphere.h (modified) * code/trunk/src/libraries/tools/OgreBulletUtils.h (modified) * code/trunk/src/libraries/util/Clock.h (modified) * code/trunk/src/libraries/util/Math.cc (modified) * code/trunk/src/modules/docking/DockingAnimation.h (modified) * code/trunk/src/modules/docking/DockingEffect.h (modified) * code/trunk/src/modules/docking/DockingTarget.h (modified) * code/trunk/src/modules/docking/MoveToDockingTarget.h (modified) * code/trunk/src/modules/gametypes/SpaceRaceController.cc (modified) * code/trunk/src/modules/gametypes/SpaceRaceController.h (modified) * code/trunk/src/modules/hover/HoverFlag.cc (modified) * code/trunk/src/modules/hover/HoverOrigin.h (modified) * code/trunk/src/modules/hover/HoverWall.cc (modified) * code/trunk/src/modules/jump/JumpEnemy.cc (modified) * code/trunk/src/modules/mini4dgame/Mini4DgameBoard.cc (modified) * code/trunk/src/modules/notifications/NotificationDispatcher.h (modified) * code/trunk/src/modules/notifications/NotificationQueue.cc (modified) * code/trunk/src/modules/objects/Script.cc (modified) * code/trunk/src/modules/objects/Turret.h (modified) * code/trunk/src/modules/objects/controllers/TurretController.h (modified) * code/trunk/src/modules/objects/triggers/DistanceTrigger.cc (modified) * code/trunk/src/modules/objects/triggers/DistanceTriggerBeacon.cc (modified) * code/trunk/src/modules/objects/triggers/EventTrigger.cc (modified) * code/trunk/src/modules/objects/triggers/MultiTrigger.cc (modified) * code/trunk/src/modules/objects/triggers/MultiTriggerContainer.cc (modified) * code/trunk/src/modules/objects/triggers/Trigger.cc (modified) * code/trunk/src/modules/pickup/Pickup.cc (modified) * code/trunk/src/modules/pickup/PickupCollection.cc (modified) * code/trunk/src/modules/pickup/PickupManager.cc (modified) * code/trunk/src/modules/pickup/PickupSpawner.cc (modified) * code/trunk/src/modules/pickup/items/DamageBoostPickup.h (modified) * code/trunk/src/modules/tetris/TetrisCenterpoint.h (modified) * code/trunk/src/modules/towerdefense/TowerDefense.h (modified) * code/trunk/src/modules/towerdefense/TowerDefenseCenterpoint.h (modified) * code/trunk/src/modules/towerdefense/TowerDefenseEnemy.cc (modified) * code/trunk/src/modules/towerdefense/TowerDefenseEnemy.h (modified) * code/trunk/src/modules/towerdefense/TowerDefenseField.h (modified) * code/trunk/src/modules/towerdefense/TowerDefenseHUDController.h (modified) * code/trunk/src/modules/towerdefense/TowerDefenseTower.h (modified) * code/trunk/src/modules/weapons/projectiles/BasicProjectile.cc (modified) * code/trunk/src/modules/weapons/projectiles/BasicProjectile.h (modified) * code/trunk/src/modules/weapons/projectiles/GravityBombField.h (modified) * code/trunk/src/modules/weapons/projectiles/SplitGunProjectile.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/HsW01.h (modified) * code/trunk/src/orxonox/LevelInfo.cc (modified) * code/trunk/src/orxonox/LevelInfo.h (modified) * code/trunk/src/orxonox/chat/ChatHistory.h (modified) * code/trunk/src/orxonox/chat/ChatInputHandler.h (modified) * code/trunk/src/orxonox/controllers/ActionpointController.h (modified) * code/trunk/src/orxonox/controllers/ArtificialController.cc (modified) * code/trunk/src/orxonox/controllers/MasterController.h (modified) * code/trunk/src/orxonox/gametypes/Dynamicmatch.cc (modified) * code/trunk/src/orxonox/gametypes/Dynamicmatch.h (modified) * code/trunk/src/orxonox/infos/GametypeInfo.cc (modified) * code/trunk/src/orxonox/interfaces/NotificationListener.cc (modified) * code/trunk/src/orxonox/interfaces/PlayerTrigger.h (modified) * code/trunk/src/orxonox/items/Engine.h (modified) * code/trunk/src/orxonox/items/PartDestructionEvent.cc (modified) * code/trunk/src/orxonox/items/PartDestructionEvent.h (modified) * code/trunk/src/orxonox/items/ShipPart.cc (modified) * code/trunk/src/orxonox/overlays/OrxonoxOverlay.cc (modified) * code/trunk/src/orxonox/overlays/OverlayGroup.cc (modified) * code/trunk/src/orxonox/weaponsystem/WeaponSlot.h (modified) * code/trunk/src/orxonox/weaponsystem/WeaponSystem.cc (modified) * code/trunk/src/orxonox/worldentities/Actionpoint.h (modified) * code/trunk/src/orxonox/worldentities/WorldEntity.h (modified) * code/trunk/src/orxonox/worldentities/pawns/ModularSpaceShip.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/ModularSpaceShip.h (modified) * code/trunk/src/orxonox/worldentities/pawns/Pawn.cc (modified) Fix loads of doxygen warnings and other documentation issues Thu, 21 Jan 2016 12:59:04 GMT muemart [11083] * code/trunk/src/libraries/core/GUIManager.cc (modified) * code/trunk/src/libraries/core/class/SubclassIdentifier.h (modified) * code/trunk/src/libraries/core/input/KeyBinder.cc (modified) * code/trunk/src/libraries/network/MasterServer.cc (modified) * code/trunk/src/libraries/network/packet/Gamestate.cc (modified) * code/trunk/src/libraries/network/packet/ServerInformation.cc (modified) * code/trunk/src/libraries/util/Serialise.h (modified) * code/trunk/src/modules/gametypes/SpaceRaceController.cc (modified) * code/trunk/src/modules/hover/TimeHUD.cc (modified) * code/trunk/src/modules/invader/Invader.cc (modified) * code/trunk/src/modules/invader/InvaderEnemy.cc (modified) * code/trunk/src/modules/invader/InvaderEnemy.h (modified) * code/trunk/src/modules/invader/InvaderEnemyShooter.cc (modified) * code/trunk/src/modules/objects/ForceField.cc (modified) * code/trunk/src/modules/objects/ForceField.h (modified) * code/trunk/src/modules/objects/SpaceBoundaries.cc (modified) * code/trunk/src/modules/objects/triggers/DistanceTrigger.h (modified) * code/trunk/src/modules/objects/triggers/EventTrigger.h (modified) * code/trunk/src/modules/overlays/hud/ChatOverlay.cc (modified) * code/trunk/src/modules/pickup/items/ShrinkPickup.cc (modified) * code/trunk/src/modules/pong/Pong.cc (modified) * code/trunk/src/modules/questsystem/QuestListener.cc (modified) * code/trunk/src/modules/questsystem/effects/ChangeQuestStatus.h (modified) * code/trunk/src/modules/tetris/Tetris.cc (modified) * code/trunk/src/modules/tetris/TetrisBrick.cc (modified) * code/trunk/src/modules/tetris/TetrisStone.cc (modified) * code/trunk/src/modules/towerdefense/TDCoordinate.cc (modified) * code/trunk/src/modules/towerdefense/TowerDefense.cc (modified) * code/trunk/src/modules/weapons/projectiles/GravityBombField.cc (modified) * code/trunk/src/orxonox/chat/ChatInputHandler.cc (modified) * code/trunk/src/orxonox/controllers/ActionpointController.cc (modified) * code/trunk/src/orxonox/controllers/DivisionController.cc (modified) * code/trunk/src/orxonox/controllers/FightingController.cc (modified) * code/trunk/src/orxonox/controllers/ScriptController.cc (modified) * code/trunk/src/orxonox/controllers/SectionController.cc (modified) * code/trunk/src/orxonox/controllers/WingmanController.cc (modified) * code/trunk/src/orxonox/gametypes/LastManStanding.cc (modified) * code/trunk/src/orxonox/gametypes/LastTeamStanding.cc (modified) * code/trunk/src/orxonox/graphics/LensFlare.cc (modified) * code/trunk/src/orxonox/graphics/LensFlare.h (modified) * code/trunk/src/orxonox/weaponsystem/Munition.cc (modified) * code/trunk/src/orxonox/worldentities/StaticEntity.cc (modified) * code/trunk/src/orxonox/worldentities/WorldEntity.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/FpsPlayer.h (modified) * code/trunk/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) Fix some clang-tidy warnings. Also, Serialise.h was doing some ... Sun, 17 Jan 2016 21:29:21 GMT landauf [11071] * code/trunk (modified) * code/trunk/cmake/CompilerConfigGCC.cmake (modified) * code/trunk/src/OrxonoxConfig.h.in (modified) * code/trunk/src/external/cpptcl/cpptcl.cc (modified) * code/trunk/src/external/cpptcl/cpptcl.h (modified) * code/trunk/src/external/cpptcl/details/methods.h (modified) * code/trunk/src/external/cpptcl/details/methods_v.h (modified) * code/trunk/src/external/ois/linux/LinuxJoyStickEvents.cpp (modified) * code/trunk/src/external/tinyxml/ticpp.cpp (modified) * code/trunk/src/external/tinyxml/ticpp.h (modified) * code/trunk/src/external/tolua/lua/package.lua (modified) * code/trunk/src/libraries/core/ApplicationPaths.cc (modified) * code/trunk/src/libraries/core/ApplicationPaths.h (modified) * code/trunk/src/libraries/core/BaseObject.cc (modified) * code/trunk/src/libraries/core/BaseObject.h (modified) * code/trunk/src/libraries/core/ClassTreeMask.cc (modified) * code/trunk/src/libraries/core/ClassTreeMask.h (modified) * code/trunk/src/libraries/core/ConfigurablePaths.cc (modified) * code/trunk/src/libraries/core/ConfigurablePaths.h (modified) * code/trunk/src/libraries/core/Core.cc (modified) * code/trunk/src/libraries/core/Core.h (modified) * code/trunk/src/libraries/core/CoreConfig.cc (modified) * code/trunk/src/libraries/core/CoreConfig.h (modified) * code/trunk/src/libraries/core/CoreIncludes.h (modified) * code/trunk/src/libraries/core/CorePrecompiledHeaders.h (modified) * code/trunk/src/libraries/core/CorePrereqs.h (modified) * code/trunk/src/libraries/core/CoreStaticInitializationHandler.cc (modified) * code/trunk/src/libraries/core/CoreStaticInitializationHandler.h (modified) * code/trunk/src/libraries/core/EventIncludes.h (modified) * code/trunk/src/libraries/core/GUIManager.cc (modified) * code/trunk/src/libraries/core/GUIManager.h (modified) * code/trunk/src/libraries/core/Game.cc (modified) * code/trunk/src/libraries/core/Game.h (modified) * code/trunk/src/libraries/core/GameMode.h (modified) * code/trunk/src/libraries/core/GraphicsManager.cc (modified) * code/trunk/src/libraries/core/GraphicsManager.h (modified) * code/trunk/src/libraries/core/Language.cc (modified) * code/trunk/src/libraries/core/Language.h (modified) * code/trunk/src/libraries/core/Loader.cc (modified) * code/trunk/src/libraries/core/Loader.h (modified) * code/trunk/src/libraries/core/LuaState.cc (modified) * code/trunk/src/libraries/core/LuaState.h (modified) * code/trunk/src/libraries/core/Namespace.cc (modified) * code/trunk/src/libraries/core/Namespace.h (modified) * code/trunk/src/libraries/core/NamespaceNode.cc (modified) * code/trunk/src/libraries/core/NamespaceNode.h (modified) * code/trunk/src/libraries/core/Resource.cc (modified) * code/trunk/src/libraries/core/Resource.h (modified) * code/trunk/src/libraries/core/Template.cc (modified) * code/trunk/src/libraries/core/Template.h (modified) * code/trunk/src/libraries/core/Thread.cc (modified) * code/trunk/src/libraries/core/ThreadPool.cc (modified) * code/trunk/src/libraries/core/ThreadWin.cc (modified) * code/trunk/src/libraries/core/ViewportEventListener.h (modified) * code/trunk/src/libraries/core/WindowEventListener.cc (modified) * code/trunk/src/libraries/core/WindowEventListener.h (modified) * code/trunk/src/libraries/core/XMLNameListener.h (modified) * code/trunk/src/libraries/core/XMLPort.h (modified) * code/trunk/src/libraries/core/class/Identifiable.cc (modified) * code/trunk/src/libraries/core/class/Identifiable.h (modified) * code/trunk/src/libraries/core/class/Identifier.cc (modified) * code/trunk/src/libraries/core/class/Identifier.h (modified) * code/trunk/src/libraries/core/class/IdentifierManager.cc (modified) * code/trunk/src/libraries/core/class/IdentifierManager.h (modified) * code/trunk/src/libraries/core/class/SubclassIdentifier.h (modified) * code/trunk/src/libraries/core/class/Super.h (modified) * code/trunk/src/libraries/core/command/ArgumentCompletionFunctions.cc (modified) * code/trunk/src/libraries/core/command/ArgumentCompletionFunctions.h (modified) * code/trunk/src/libraries/core/command/CommandEvaluation.cc (modified) * code/trunk/src/libraries/core/command/CommandEvaluation.h (modified) * code/trunk/src/libraries/core/command/CommandExecutor.cc (modified) * code/trunk/src/libraries/core/command/CommandExecutor.h (modified) * code/trunk/src/libraries/core/command/ConsoleCommand.cc (modified) * code/trunk/src/libraries/core/command/ConsoleCommand.h (modified) * code/trunk/src/libraries/core/command/ConsoleCommandIncludes.h (modified) * code/trunk/src/libraries/core/command/ConsoleCommandManager.cc (modified) * code/trunk/src/libraries/core/command/ConsoleCommandManager.h (modified) * code/trunk/src/libraries/core/command/Executor.cc (modified) * code/trunk/src/libraries/core/command/Executor.h (modified) * code/trunk/src/libraries/core/command/ExecutorPtr.h (modified) * code/trunk/src/libraries/core/command/Functor.h (modified) * code/trunk/src/libraries/core/command/FunctorPtr.h (modified) * code/trunk/src/libraries/core/command/IOConsolePOSIX.cc (modified) * code/trunk/src/libraries/core/command/IOConsolePOSIX.h (modified) * code/trunk/src/libraries/core/command/IOConsoleWindows.cc (modified) * code/trunk/src/libraries/core/command/IOConsoleWindows.h (modified) * code/trunk/src/libraries/core/command/IRC.cc (modified) * code/trunk/src/libraries/core/command/IRC.h (modified) * code/trunk/src/libraries/core/command/Shell.cc (modified) * code/trunk/src/libraries/core/command/Shell.h (modified) * code/trunk/src/libraries/core/command/TclBind.cc (modified) * code/trunk/src/libraries/core/command/TclBind.h (modified) * code/trunk/src/libraries/core/command/TclThreadList.h (modified) * code/trunk/src/libraries/core/command/TclThreadManager.cc (modified) * code/trunk/src/libraries/core/commandline/CommandLineIncludes.h (modified) * code/trunk/src/libraries/core/commandline/CommandLineParser.cc (modified) * code/trunk/src/libraries/core/commandline/CommandLineParser.h (modified) * code/trunk/src/libraries/core/config/ConfigFile.cc (modified) * code/trunk/src/libraries/core/config/ConfigFileEntry.h (modified) * code/trunk/src/libraries/core/config/ConfigFileEntryComment.h (modified) * code/trunk/src/libraries/core/config/ConfigFileEntryValue.h (modified) * code/trunk/src/libraries/core/config/ConfigFileEntryVectorValue.h (modified) * code/trunk/src/libraries/core/config/ConfigFileManager.cc (modified) * code/trunk/src/libraries/core/config/ConfigFileManager.h (modified) * code/trunk/src/libraries/core/config/ConfigFileSection.cc (modified) * code/trunk/src/libraries/core/config/ConfigFileSection.h (modified) * code/trunk/src/libraries/core/config/ConfigValueContainer.cc (modified) * code/trunk/src/libraries/core/config/ConfigValueContainer.h (modified) * code/trunk/src/libraries/core/config/SettingsConfigFile.cc (modified) * code/trunk/src/libraries/core/config/SettingsConfigFile.h (modified) * code/trunk/src/libraries/core/input/Button.cc (modified) * code/trunk/src/libraries/core/input/HalfAxis.h (modified) * code/trunk/src/libraries/core/input/InputBuffer.cc (modified) * code/trunk/src/libraries/core/input/InputBuffer.h (modified) * code/trunk/src/libraries/core/input/InputCommands.h (modified) * code/trunk/src/libraries/core/input/InputDevice.h (modified) * code/trunk/src/libraries/core/input/InputHandler.h (modified) * code/trunk/src/libraries/core/input/InputManager.cc (modified) * code/trunk/src/libraries/core/input/InputManager.h (modified) * code/trunk/src/libraries/core/input/InputPrereqs.h (modified) * code/trunk/src/libraries/core/input/InputState.cc (modified) * code/trunk/src/libraries/core/input/InputState.h (modified) * code/trunk/src/libraries/core/input/JoyStick.cc (modified) * code/trunk/src/libraries/core/input/JoyStick.h (modified) * code/trunk/src/libraries/core/input/JoyStickQuantityListener.cc (modified) * code/trunk/src/libraries/core/input/JoyStickQuantityListener.h (modified) * code/trunk/src/libraries/core/input/KeyBinder.cc (modified) * code/trunk/src/libraries/core/input/KeyBinder.h (modified) * code/trunk/src/libraries/core/input/KeyBinderManager.cc (modified) * code/trunk/src/libraries/core/input/KeyBinderManager.h (modified) * code/trunk/src/libraries/core/input/KeyDetector.cc (modified) * code/trunk/src/libraries/core/input/KeyDetector.h (modified) * code/trunk/src/libraries/core/input/Keyboard.h (modified) * code/trunk/src/libraries/core/input/Mouse.cc (modified) * code/trunk/src/libraries/core/input/Mouse.h (modified) * code/trunk/src/libraries/core/module/DynLib.cc (modified) * code/trunk/src/libraries/core/module/DynLib.h (modified) * code/trunk/src/libraries/core/module/DynLibManager.cc (modified) * code/trunk/src/libraries/core/module/ModuleInstance.cc (modified) * code/trunk/src/libraries/core/module/ModuleInstance.h (modified) * code/trunk/src/libraries/core/module/Plugin.cc (modified) * code/trunk/src/libraries/core/module/PluginManager.cc (modified) * code/trunk/src/libraries/core/module/StaticInitializationHandler.h (modified) * code/trunk/src/libraries/core/module/StaticInitializationHandlerIncludes.h (modified) * code/trunk/src/libraries/core/module/StaticInitializationManager.cc (modified) * code/trunk/src/libraries/core/module/StaticInitializationManager.h (modified) * code/trunk/src/libraries/core/object/ClassFactory.h (modified) * code/trunk/src/libraries/core/object/Context.cc (modified) * code/trunk/src/libraries/core/object/DestroyLaterManager.h (modified) * code/trunk/src/libraries/core/object/Destroyable.cc (modified) * code/trunk/src/libraries/core/object/Iterator.h (modified) * code/trunk/src/libraries/core/object/IteratorBase.h (modified) * code/trunk/src/libraries/core/object/Listable.cc (modified) * code/trunk/src/libraries/core/object/Listable.h (modified) * code/trunk/src/libraries/core/object/ObjectList.h (modified) * code/trunk/src/libraries/core/object/ObjectListBase.cc (modified) * code/trunk/src/libraries/core/object/ObjectListBase.h (modified) * code/trunk/src/libraries/core/object/ObjectListIterator.h (modified) * code/trunk/src/libraries/core/object/StrongPtr.h (modified) * code/trunk/src/libraries/core/object/WeakPtr.h (modified) * code/trunk/src/libraries/core/singleton/Scope.h (modified) * code/trunk/src/libraries/core/singleton/ScopeManager.cc (modified) * code/trunk/src/libraries/core/singleton/ScopeManager.h (modified) * code/trunk/src/libraries/core/singleton/ScopedSingletonIncludes.h (modified) * code/trunk/src/libraries/core/singleton/ScopedSingletonWrapper.h (modified) * code/trunk/src/libraries/network/Client.cc (modified) * code/trunk/src/libraries/network/Client.h (modified) * code/trunk/src/libraries/network/ClientConnection.cc (modified) * code/trunk/src/libraries/network/ClientConnection.h (modified) * code/trunk/src/libraries/network/ClientConnectionListener.cc (modified) * code/trunk/src/libraries/network/Connection.cc (modified) * code/trunk/src/libraries/network/Connection.h (modified) * code/trunk/src/libraries/network/FunctionCall.cc (modified) * code/trunk/src/libraries/network/FunctionCallManager.cc (modified) * code/trunk/src/libraries/network/FunctionCallManager.h (modified) * code/trunk/src/libraries/network/GamestateHandler.cc (modified) * code/trunk/src/libraries/network/GamestateManager.cc (modified) * code/trunk/src/libraries/network/GamestateManager.h (modified) * code/trunk/src/libraries/network/Host.cc (modified) * code/trunk/src/libraries/network/LANDiscoverable.cc (modified) * code/trunk/src/libraries/network/LANDiscovery.cc (modified) * code/trunk/src/libraries/network/MasterServer.cc (modified) * code/trunk/src/libraries/network/MasterServerComm.cc (modified) * code/trunk/src/libraries/network/NetworkFunction.h (modified) * code/trunk/src/libraries/network/NetworkFunctionIncludes.h (modified) * code/trunk/src/libraries/network/NetworkFunctionManager.cc (modified) * code/trunk/src/libraries/network/NetworkPrereqs.h (modified) * code/trunk/src/libraries/network/NetworkStaticInitializationHandler.h (modified) * code/trunk/src/libraries/network/PeerList.cc (modified) * code/trunk/src/libraries/network/Server.cc (modified) * code/trunk/src/libraries/network/Server.h (modified) * code/trunk/src/libraries/network/ServerConnection.cc (modified) * code/trunk/src/libraries/network/TrafficControl.cc (modified) * code/trunk/src/libraries/network/TrafficControl.h (modified) * code/trunk/src/libraries/network/packet/Acknowledgement.cc (modified) * code/trunk/src/libraries/network/packet/Acknowledgement.h (modified) * code/trunk/src/libraries/network/packet/Chat.cc (modified) * code/trunk/src/libraries/network/packet/Chat.h (modified) * code/trunk/src/libraries/network/packet/ClassID.cc (modified) * code/trunk/src/libraries/network/packet/ClassID.h (modified) * code/trunk/src/libraries/network/packet/DeleteObjects.cc (modified) * code/trunk/src/libraries/network/packet/DeleteObjects.h (modified) * code/trunk/src/libraries/network/packet/FunctionCalls.cc (modified) * code/trunk/src/libraries/network/packet/FunctionCalls.h (modified) * code/trunk/src/libraries/network/packet/FunctionIDs.cc (modified) * code/trunk/src/libraries/network/packet/FunctionIDs.h (modified) * code/trunk/src/libraries/network/packet/Gamestate.cc (modified) * code/trunk/src/libraries/network/packet/Gamestate.h (modified) * code/trunk/src/libraries/network/packet/Packet.cc (modified) * code/trunk/src/libraries/network/packet/Packet.h (modified) * code/trunk/src/libraries/network/packet/ServerInformation.cc (modified) * code/trunk/src/libraries/network/packet/ServerInformation.h (modified) * code/trunk/src/libraries/network/packet/Welcome.cc (modified) * code/trunk/src/libraries/network/packet/Welcome.h (modified) * code/trunk/src/libraries/network/synchronisable/NetworkCallback.h (modified) * code/trunk/src/libraries/network/synchronisable/Serialise.h (modified) * code/trunk/src/libraries/network/synchronisable/Synchronisable.cc (modified) * code/trunk/src/libraries/network/synchronisable/Synchronisable.h (modified) * code/trunk/src/libraries/network/synchronisable/SynchronisableVariable.h (modified) * code/trunk/src/libraries/tools/BillboardSet.cc (modified) * code/trunk/src/libraries/tools/BulletDebugDrawer.h (modified) * code/trunk/src/libraries/tools/DebugDrawer.cc (modified) * code/trunk/src/libraries/tools/DynamicLines.cc (modified) * code/trunk/src/libraries/tools/DynamicLines.h (modified) * code/trunk/src/libraries/tools/DynamicRenderable.h (modified) * code/trunk/src/libraries/tools/IcoSphere.cc (modified) * code/trunk/src/libraries/tools/Mesh.cc (modified) * code/trunk/src/libraries/tools/OgreBulletUtils.h (modified) * code/trunk/src/libraries/tools/ParticleInterface.cc (modified) * code/trunk/src/libraries/tools/ParticleInterface.h (modified) * code/trunk/src/libraries/tools/ResourceCollection.cc (modified) * code/trunk/src/libraries/tools/ResourceCollection.h (modified) * code/trunk/src/libraries/tools/ResourceLocation.cc (modified) * code/trunk/src/libraries/tools/ResourceLocation.h (modified) * code/trunk/src/libraries/tools/Shader.cc (modified) * code/trunk/src/libraries/tools/Shader.h (modified) * code/trunk/src/libraries/tools/TextureGenerator.cc (modified) * code/trunk/src/libraries/tools/TextureGenerator.h (modified) * code/trunk/src/libraries/tools/Timer.cc (modified) * code/trunk/src/libraries/tools/Timer.h (modified) * code/trunk/src/libraries/tools/interfaces/TimeFactorListener.h (modified) * code/trunk/src/libraries/tools/interfaces/ToolsInterfaceCompilation.cc (modified) * code/trunk/src/libraries/util/CMakeLists.txt (modified) * code/trunk/src/libraries/util/Clipboard.cc (modified) * code/trunk/src/libraries/util/Clock.h (modified) * code/trunk/src/libraries/util/DestructionHelper.h (modified) * code/trunk/src/libraries/util/DisplayStringConversions.h (modified) * code/trunk/src/libraries/util/ExprParser.cc (modified) * code/trunk/src/libraries/util/ExprParser.h (modified) * code/trunk/src/libraries/util/ImplicitConversion.h (modified) * code/trunk/src/libraries/util/Math.cc (modified) * code/trunk/src/libraries/util/Math.h (modified) * code/trunk/src/libraries/util/MultiType.cc (modified) * code/trunk/src/libraries/util/MultiType.h (modified) * code/trunk/src/libraries/util/MultiTypeValue.h (modified) * code/trunk/src/libraries/util/Serialise.h (modified) * code/trunk/src/libraries/util/SharedPtr.cc (deleted) * code/trunk/src/libraries/util/SharedPtr.h (deleted) * code/trunk/src/libraries/util/SignalHandler.cc (modified) * code/trunk/src/libraries/util/SignalHandler.h (modified) * code/trunk/src/libraries/util/Singleton.h (modified) * code/trunk/src/libraries/util/SmallObjectAllocator.cc (modified) * code/trunk/src/libraries/util/SmallObjectAllocator.h (modified) * code/trunk/src/libraries/util/StringUtils.cc (modified) * code/trunk/src/libraries/util/SubString.cc (modified) * code/trunk/src/libraries/util/SubString.h (modified) * code/trunk/src/libraries/util/UtilPrereqs.h (modified) * code/trunk/src/libraries/util/output/BaseWriter.cc (modified) * code/trunk/src/libraries/util/output/BaseWriter.h (modified) * code/trunk/src/libraries/util/output/ConsoleWriter.h (modified) * code/trunk/src/libraries/util/output/LogWriter.cc (modified) * code/trunk/src/libraries/util/output/LogWriter.h (modified) * code/trunk/src/libraries/util/output/MemoryWriter.cc (modified) * code/trunk/src/libraries/util/output/MemoryWriter.h (modified) * code/trunk/src/libraries/util/output/OutputDefinitions.h (modified) * code/trunk/src/libraries/util/output/OutputListener.cc (modified) * code/trunk/src/libraries/util/output/OutputManager.cc (modified) * code/trunk/src/libraries/util/output/OutputManager.h (modified) * code/trunk/src/libraries/util/output/OutputStream.cc (modified) * code/trunk/src/libraries/util/output/SubcontextOutputListener.cc (modified) * code/trunk/src/libraries/util/output/SubcontextOutputListener.h (modified) * code/trunk/src/modules/designtools/CreateStars.h (modified) * code/trunk/src/modules/designtools/ScreenshotManager.cc (modified) * code/trunk/src/modules/designtools/SkyboxGenerator.cc (modified) * code/trunk/src/modules/designtools/SkyboxGenerator.h (modified) * code/trunk/src/modules/docking/Dock.cc (modified) * code/trunk/src/modules/docking/Dock.h (modified) * code/trunk/src/modules/docking/DockToShip.cc (modified) * code/trunk/src/modules/docking/DockToShip.h (modified) * code/trunk/src/modules/docking/DockingAnimation.cc (modified) * code/trunk/src/modules/docking/DockingController.cc (modified) * code/trunk/src/modules/docking/DockingController.h (modified) * code/trunk/src/modules/docking/DockingEffect.cc (modified) * code/trunk/src/modules/docking/DockingTarget.cc (modified) * code/trunk/src/modules/docking/DockingTarget.h (modified) * code/trunk/src/modules/docking/MoveToDockingTarget.h (modified) * code/trunk/src/modules/dodgerace/DodgeRace.cc (modified) * code/trunk/src/modules/dodgerace/DodgeRace.h (modified) * code/trunk/src/modules/dodgerace/DodgeRaceCenterPoint.cc (modified) * code/trunk/src/modules/dodgerace/DodgeRaceCenterPoint.h (modified) * code/trunk/src/modules/dodgerace/DodgeRaceHUDinfo.cc (modified) * code/trunk/src/modules/dodgerace/DodgeRaceHUDinfo.h (modified) * code/trunk/src/modules/dodgerace/DodgeRaceShip.cc (modified) * code/trunk/src/modules/dodgerace/DodgeRaceShip.h (modified) * code/trunk/src/modules/gametypes/OldRaceCheckPoint.cc (modified) * code/trunk/src/modules/gametypes/OldRaceCheckPoint.h (modified) * code/trunk/src/modules/gametypes/OldSpaceRace.h (modified) * code/trunk/src/modules/gametypes/RaceCheckPoint.cc (modified) * code/trunk/src/modules/gametypes/RaceCheckPoint.h (modified) * code/trunk/src/modules/gametypes/SpaceRace.cc (modified) * code/trunk/src/modules/gametypes/SpaceRace.h (modified) * code/trunk/src/modules/gametypes/SpaceRaceController.cc (modified) * code/trunk/src/modules/gametypes/SpaceRaceController.h (modified) * code/trunk/src/modules/gametypes/SpaceRaceManager.cc (modified) * code/trunk/src/modules/gametypes/SpaceRaceManager.h (modified) * code/trunk/src/modules/hover/FlagHUD.cc (modified) * code/trunk/src/modules/hover/FlagHUD.h (modified) * code/trunk/src/modules/hover/Hover.cc (modified) * code/trunk/src/modules/hover/Hover.h (modified) * code/trunk/src/modules/hover/HoverFlag.cc (modified) * code/trunk/src/modules/hover/HoverFlag.h (modified) * code/trunk/src/modules/hover/HoverOrigin.cc (modified) * code/trunk/src/modules/hover/HoverOrigin.h (modified) * code/trunk/src/modules/hover/HoverShip.h (modified) * code/trunk/src/modules/hover/HoverWall.cc (modified) * code/trunk/src/modules/hover/TimeHUD.cc (modified) * code/trunk/src/modules/hover/TimeHUD.h (modified) * code/trunk/src/modules/invader/Invader.cc (modified) * code/trunk/src/modules/invader/Invader.h (modified) * code/trunk/src/modules/invader/InvaderCenterPoint.cc (modified) * code/trunk/src/modules/invader/InvaderCenterPoint.h (modified) * code/trunk/src/modules/invader/InvaderEnemy.cc (modified) * code/trunk/src/modules/invader/InvaderEnemy.h (modified) * code/trunk/src/modules/invader/InvaderEnemyShooter.cc (modified) * code/trunk/src/modules/invader/InvaderEnemyShooter.h (modified) * code/trunk/src/modules/invader/InvaderHUDinfo.cc (modified) * code/trunk/src/modules/invader/InvaderHUDinfo.h (modified) * code/trunk/src/modules/invader/InvaderShip.cc (modified) * code/trunk/src/modules/invader/InvaderShip.h (modified) * code/trunk/src/modules/invader/InvaderWeapon.h (modified) * code/trunk/src/modules/invader/InvaderWeaponEnemy.cc (modified) * code/trunk/src/modules/invader/InvaderWeaponEnemy.h (modified) * code/trunk/src/modules/jump/Jump.cc (modified) * code/trunk/src/modules/jump/Jump.h (modified) * code/trunk/src/modules/jump/JumpBoots.cc (modified) * code/trunk/src/modules/jump/JumpBoots.h (modified) * code/trunk/src/modules/jump/JumpCenterpoint.cc (modified) * code/trunk/src/modules/jump/JumpCenterpoint.h (modified) * code/trunk/src/modules/jump/JumpEnemy.cc (modified) * code/trunk/src/modules/jump/JumpEnemy.h (modified) * code/trunk/src/modules/jump/JumpFigure.cc (modified) * code/trunk/src/modules/jump/JumpFigure.h (modified) * code/trunk/src/modules/jump/JumpItem.cc (modified) * code/trunk/src/modules/jump/JumpItem.h (modified) * code/trunk/src/modules/jump/JumpPlatform.cc (modified) * code/trunk/src/modules/jump/JumpPlatform.h (modified) * code/trunk/src/modules/jump/JumpPlatformDisappear.cc (modified) * code/trunk/src/modules/jump/JumpPlatformDisappear.h (modified) * code/trunk/src/modules/jump/JumpPlatformFake.cc (modified) * code/trunk/src/modules/jump/JumpPlatformFake.h (modified) * code/trunk/src/modules/jump/JumpPlatformHMove.cc (modified) * code/trunk/src/modules/jump/JumpPlatformHMove.h (modified) * code/trunk/src/modules/jump/JumpPlatformStatic.cc (modified) * code/trunk/src/modules/jump/JumpPlatformStatic.h (modified) * code/trunk/src/modules/jump/JumpPlatformTimer.cc (modified) * code/trunk/src/modules/jump/JumpPlatformTimer.h (modified) * code/trunk/src/modules/jump/JumpPlatformVMove.cc (modified) * code/trunk/src/modules/jump/JumpPlatformVMove.h (modified) * code/trunk/src/modules/jump/JumpProjectile.cc (modified) * code/trunk/src/modules/jump/JumpProjectile.h (modified) * code/trunk/src/modules/jump/JumpPropeller.cc (modified) * code/trunk/src/modules/jump/JumpPropeller.h (modified) * code/trunk/src/modules/jump/JumpRocket.cc (modified) * code/trunk/src/modules/jump/JumpRocket.h (modified) * code/trunk/src/modules/jump/JumpScore.cc (modified) * code/trunk/src/modules/jump/JumpScore.h (modified) * code/trunk/src/modules/jump/JumpShield.cc (modified) * code/trunk/src/modules/jump/JumpShield.h (modified) * code/trunk/src/modules/jump/JumpSpring.cc (modified) * code/trunk/src/modules/jump/JumpSpring.h (modified) * code/trunk/src/modules/mini4dgame/Mini4Dgame.cc (modified) * code/trunk/src/modules/mini4dgame/Mini4Dgame.h (modified) * code/trunk/src/modules/mini4dgame/Mini4DgameAI.cc (modified) * code/trunk/src/modules/mini4dgame/Mini4DgameAI.h (modified) * code/trunk/src/modules/mini4dgame/Mini4DgameBoard.cc (modified) * code/trunk/src/modules/mini4dgame/Mini4DgameBoard.h (modified) * code/trunk/src/modules/notifications/NotificationDispatcher.cc (modified) * code/trunk/src/modules/notifications/NotificationDispatcher.h (modified) * code/trunk/src/modules/notifications/NotificationManager.cc (modified) * code/trunk/src/modules/notifications/NotificationManager.h (modified) * code/trunk/src/modules/notifications/NotificationQueue.cc (modified) * code/trunk/src/modules/notifications/NotificationQueue.h (modified) * code/trunk/src/modules/notifications/NotificationQueueCEGUI.cc (modified) * code/trunk/src/modules/notifications/NotificationQueueCEGUI.h (modified) * code/trunk/src/modules/objects/Attacher.cc (modified) * code/trunk/src/modules/objects/Attacher.h (modified) * code/trunk/src/modules/objects/ForceField.cc (modified) * code/trunk/src/modules/objects/ForceField.h (modified) * code/trunk/src/modules/objects/Planet.h (modified) * code/trunk/src/modules/objects/Script.cc (modified) * code/trunk/src/modules/objects/Script.h (modified) * code/trunk/src/modules/objects/SpaceBoundaries.cc (modified) * code/trunk/src/modules/objects/SpaceBoundaries.h (modified) * code/trunk/src/modules/objects/Turret.cc (modified) * code/trunk/src/modules/objects/Turret.h (modified) * code/trunk/src/modules/objects/controllers/TeamTargetProxy.cc (modified) * code/trunk/src/modules/objects/controllers/TurretController.cc (modified) * code/trunk/src/modules/objects/eventsystem/EventDispatcher.cc (modified) * code/trunk/src/modules/objects/eventsystem/EventFilter.cc (modified) * code/trunk/src/modules/objects/eventsystem/EventListener.cc (modified) * code/trunk/src/modules/objects/eventsystem/EventTarget.cc (modified) * code/trunk/src/modules/objects/triggers/CheckPoint.cc (modified) * code/trunk/src/modules/objects/triggers/DistanceMultiTrigger.cc (modified) * code/trunk/src/modules/objects/triggers/DistanceMultiTrigger.h (modified) * code/trunk/src/modules/objects/triggers/DistanceTrigger.cc (modified) * code/trunk/src/modules/objects/triggers/DistanceTrigger.h (modified) * code/trunk/src/modules/objects/triggers/EventMultiTrigger.cc (modified) * code/trunk/src/modules/objects/triggers/EventTrigger.cc (modified) * code/trunk/src/modules/objects/triggers/EventTrigger.h (modified) * code/trunk/src/modules/objects/triggers/MultiTrigger.cc (modified) * code/trunk/src/modules/objects/triggers/MultiTrigger.h (modified) * code/trunk/src/modules/objects/triggers/MultiTriggerContainer.cc (modified) * code/trunk/src/modules/objects/triggers/Trigger.cc (modified) * code/trunk/src/modules/objects/triggers/Trigger.h (modified) * code/trunk/src/modules/objects/triggers/TriggerBase.cc (modified) * code/trunk/src/modules/objects/triggers/TriggerBase.h (modified) * code/trunk/src/modules/overlays/FadeoutText.h (modified) * code/trunk/src/modules/overlays/GUIOverlay.cc (modified) * code/trunk/src/modules/overlays/GUIOverlay.h (modified) * code/trunk/src/modules/overlays/OverlayText.cc (modified) * code/trunk/src/modules/overlays/OverlayText.h (modified) * code/trunk/src/modules/overlays/debugging/DebugFPSText.h (modified) * code/trunk/src/modules/overlays/debugging/DebugPositionText.cc (modified) * code/trunk/src/modules/overlays/debugging/DebugPositionText.h (modified) * code/trunk/src/modules/overlays/debugging/DebugRTRText.h (modified) * code/trunk/src/modules/overlays/hud/AnnounceMessage.cc (modified) * code/trunk/src/modules/overlays/hud/AnnounceMessage.h (modified) * code/trunk/src/modules/overlays/hud/ChatOverlay.cc (modified) * code/trunk/src/modules/overlays/hud/ChatOverlay.h (modified) * code/trunk/src/modules/overlays/hud/CountDown.cc (modified) * code/trunk/src/modules/overlays/hud/CountDown.h (modified) * code/trunk/src/modules/overlays/hud/DeathMessage.cc (modified) * code/trunk/src/modules/overlays/hud/DeathMessage.h (modified) * code/trunk/src/modules/overlays/hud/GametypeFadingMessage.cc (modified) * code/trunk/src/modules/overlays/hud/GametypeFadingMessage.h (modified) * code/trunk/src/modules/overlays/hud/GametypeStaticMessage.cc (modified) * code/trunk/src/modules/overlays/hud/GametypeStaticMessage.h (modified) * code/trunk/src/modules/overlays/hud/HUDBar.cc (modified) * code/trunk/src/modules/overlays/hud/HUDBar.h (modified) * code/trunk/src/modules/overlays/hud/HUDBoostBar.cc (modified) * code/trunk/src/modules/overlays/hud/HUDBoostBar.h (modified) * code/trunk/src/modules/overlays/hud/HUDEnemyHealthBar.cc (modified) * code/trunk/src/modules/overlays/hud/HUDEnemyHealthBar.h (modified) * code/trunk/src/modules/overlays/hud/HUDEnemyShieldBar.cc (modified) * code/trunk/src/modules/overlays/hud/HUDEnemyShieldBar.h (modified) * code/trunk/src/modules/overlays/hud/HUDHealthBar.cc (modified) * code/trunk/src/modules/overlays/hud/HUDHealthBar.h (modified) * code/trunk/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/trunk/src/modules/overlays/hud/HUDNavigation.h (modified) * code/trunk/src/modules/overlays/hud/HUDRadar.cc (modified) * code/trunk/src/modules/overlays/hud/HUDRadar.h (modified) * code/trunk/src/modules/overlays/hud/HUDRocketFuelBar.cc (modified) * code/trunk/src/modules/overlays/hud/HUDRocketFuelBar.h (modified) * code/trunk/src/modules/overlays/hud/HUDShieldBar.cc (modified) * code/trunk/src/modules/overlays/hud/HUDShieldBar.h (modified) * code/trunk/src/modules/overlays/hud/HUDSpeedBar.cc (modified) * code/trunk/src/modules/overlays/hud/HUDSpeedBar.h (modified) * code/trunk/src/modules/overlays/hud/HUDTimer.cc (modified) * code/trunk/src/modules/overlays/hud/HUDTimer.h (modified) * code/trunk/src/modules/overlays/hud/HUDWeapon.cc (modified) * code/trunk/src/modules/overlays/hud/HUDWeapon.h (modified) * code/trunk/src/modules/overlays/hud/HUDWeaponMode.cc (modified) * code/trunk/src/modules/overlays/hud/HUDWeaponMode.h (modified) * code/trunk/src/modules/overlays/hud/HUDWeaponSystem.cc (modified) * code/trunk/src/modules/overlays/hud/HUDWeaponSystem.h (modified) * code/trunk/src/modules/overlays/hud/KillMessage.cc (modified) * code/trunk/src/modules/overlays/hud/KillMessage.h (modified) * code/trunk/src/modules/overlays/hud/LastManStandingInfos.cc (modified) * code/trunk/src/modules/overlays/hud/LastManStandingInfos.h (modified) * code/trunk/src/modules/overlays/hud/LastTeamStandingInfos.cc (modified) * code/trunk/src/modules/overlays/hud/LastTeamStandingInfos.h (modified) * code/trunk/src/modules/overlays/hud/PauseNotice.cc (modified) * code/trunk/src/modules/overlays/hud/PauseNotice.h (modified) * code/trunk/src/modules/overlays/hud/TeamBaseMatchScore.cc (modified) * code/trunk/src/modules/overlays/hud/TeamBaseMatchScore.h (modified) * code/trunk/src/modules/overlays/stats/CreateLines.cc (modified) * code/trunk/src/modules/overlays/stats/CreateLines.h (modified) * code/trunk/src/modules/overlays/stats/Scoreboard.cc (modified) * code/trunk/src/modules/overlays/stats/Scoreboard.h (modified) * code/trunk/src/modules/overlays/stats/Stats.cc (modified) * code/trunk/src/modules/overlays/stats/Stats.h (modified) * code/trunk/src/modules/pickup/CollectiblePickup.cc (modified) * code/trunk/src/modules/pickup/CollectiblePickup.h (modified) * code/trunk/src/modules/pickup/Pickup.cc (modified) * code/trunk/src/modules/pickup/Pickup.h (modified) * code/trunk/src/modules/pickup/PickupCollection.cc (modified) * code/trunk/src/modules/pickup/PickupCollection.h (modified) * code/trunk/src/modules/pickup/PickupManager.cc (modified) * code/trunk/src/modules/pickup/PickupManager.h (modified) * code/trunk/src/modules/pickup/PickupRepresentation.cc (modified) * code/trunk/src/modules/pickup/PickupRepresentation.h (modified) * code/trunk/src/modules/pickup/PickupSpawner.cc (modified) * code/trunk/src/modules/pickup/PickupSpawner.h (modified) * code/trunk/src/modules/pickup/items/BoostPickup.cc (modified) * code/trunk/src/modules/pickup/items/BoostPickup.h (modified) * code/trunk/src/modules/pickup/items/DamageBoostPickup.cc (modified) * code/trunk/src/modules/pickup/items/DronePickup.cc (modified) * code/trunk/src/modules/pickup/items/HealthPickup.cc (modified) * code/trunk/src/modules/pickup/items/HealthPickup.h (modified) * code/trunk/src/modules/pickup/items/InvisiblePickup.cc (modified) * code/trunk/src/modules/pickup/items/MetaPickup.cc (modified) * code/trunk/src/modules/pickup/items/MetaPickup.h (modified) * code/trunk/src/modules/pickup/items/MunitionContainer.h (modified) * code/trunk/src/modules/pickup/items/MunitionPickup.cc (modified) * code/trunk/src/modules/pickup/items/MunitionPickup.h (modified) * code/trunk/src/modules/pickup/items/ShieldPickup.cc (modified) * code/trunk/src/modules/pickup/items/ShrinkPickup.cc (modified) * code/trunk/src/modules/pickup/items/SpeedPickup.cc (modified) * code/trunk/src/modules/pong/Pong.cc (modified) * code/trunk/src/modules/pong/Pong.h (modified) * code/trunk/src/modules/pong/PongAI.cc (modified) * code/trunk/src/modules/pong/PongAI.h (modified) * code/trunk/src/modules/pong/PongBall.cc (modified) * code/trunk/src/modules/pong/PongBall.h (modified) * code/trunk/src/modules/pong/PongBat.h (modified) * code/trunk/src/modules/pong/PongCenterpoint.cc (modified) * code/trunk/src/modules/pong/PongCenterpoint.h (modified) * code/trunk/src/modules/pong/PongScore.cc (modified) * code/trunk/src/modules/pong/PongScore.h (modified) * code/trunk/src/modules/portals/PortalEndPoint.cc (modified) * code/trunk/src/modules/portals/PortalEndPoint.h (modified) * code/trunk/src/modules/portals/PortalLink.cc (modified) * code/trunk/src/modules/portals/PortalLink.h (modified) * code/trunk/src/modules/questsystem/GlobalQuest.cc (modified) * code/trunk/src/modules/questsystem/GlobalQuest.h (modified) * code/trunk/src/modules/questsystem/LocalQuest.cc (modified) * code/trunk/src/modules/questsystem/LocalQuest.h (modified) * code/trunk/src/modules/questsystem/Quest.cc (modified) * code/trunk/src/modules/questsystem/Quest.h (modified) * code/trunk/src/modules/questsystem/QuestDescription.cc (modified) * code/trunk/src/modules/questsystem/QuestDescription.h (modified) * code/trunk/src/modules/questsystem/QuestEffect.cc (modified) * code/trunk/src/modules/questsystem/QuestEffectBeacon.cc (modified) * code/trunk/src/modules/questsystem/QuestEffectBeacon.h (modified) * code/trunk/src/modules/questsystem/QuestHint.cc (modified) * code/trunk/src/modules/questsystem/QuestHint.h (modified) * code/trunk/src/modules/questsystem/QuestItem.h (modified) * code/trunk/src/modules/questsystem/QuestListener.cc (modified) * code/trunk/src/modules/questsystem/QuestListener.h (modified) * code/trunk/src/modules/questsystem/QuestManager.cc (modified) * code/trunk/src/modules/questsystem/effects/AddQuest.cc (modified) * code/trunk/src/modules/questsystem/effects/AddQuest.h (modified) * code/trunk/src/modules/questsystem/effects/AddQuestHint.cc (modified) * code/trunk/src/modules/questsystem/effects/AddQuestHint.h (modified) * code/trunk/src/modules/questsystem/effects/AddReward.cc (modified) * code/trunk/src/modules/questsystem/effects/AddReward.h (modified) * code/trunk/src/modules/questsystem/effects/ChangeQuestStatus.h (modified) * code/trunk/src/modules/questsystem/effects/CompleteQuest.cc (modified) * code/trunk/src/modules/questsystem/effects/CompleteQuest.h (modified) * code/trunk/src/modules/questsystem/effects/FailQuest.cc (modified) * code/trunk/src/modules/questsystem/effects/FailQuest.h (modified) * code/trunk/src/modules/tetris/Tetris.cc (modified) * code/trunk/src/modules/tetris/Tetris.h (modified) * code/trunk/src/modules/tetris/TetrisBrick.cc (modified) * code/trunk/src/modules/tetris/TetrisBrick.h (modified) * code/trunk/src/modules/tetris/TetrisCenterpoint.cc (modified) * code/trunk/src/modules/tetris/TetrisCenterpoint.h (modified) * code/trunk/src/modules/tetris/TetrisScore.cc (modified) * code/trunk/src/modules/tetris/TetrisScore.h (modified) * code/trunk/src/modules/towerdefense/TowerDefense.cc (modified) * code/trunk/src/modules/towerdefense/TowerDefense.h (modified) * code/trunk/src/modules/towerdefense/TowerDefenseCenterpoint.cc (modified) * code/trunk/src/modules/towerdefense/TowerDefenseCenterpoint.h (modified) * code/trunk/src/modules/towerdefense/TowerDefenseEnemy.cc (modified) * code/trunk/src/modules/towerdefense/TowerDefenseEnemy.h (modified) * code/trunk/src/modules/towerdefense/TowerDefenseField.cc (modified) * code/trunk/src/modules/towerdefense/TowerDefenseField.h (modified) * code/trunk/src/modules/towerdefense/TowerDefenseHUDController.cc (modified) * code/trunk/src/modules/towerdefense/TowerDefenseHUDController.h (modified) * code/trunk/src/modules/towerdefense/TowerDefenseSelecter.cc (modified) * code/trunk/src/modules/towerdefense/TowerDefenseSelecter.h (modified) * code/trunk/src/modules/towerdefense/TowerDefenseTower.cc (modified) * code/trunk/src/modules/weapons/IceGunFreezer.cc (modified) * code/trunk/src/modules/weapons/IceGunFreezer.h (modified) * code/trunk/src/modules/weapons/RocketController.cc (modified) * code/trunk/src/modules/weapons/RocketController.h (modified) * code/trunk/src/modules/weapons/munitions/FusionMunition.cc (modified) * code/trunk/src/modules/weapons/munitions/FusionMunition.h (modified) * code/trunk/src/modules/weapons/munitions/GravityBombMunition.cc (modified) * code/trunk/src/modules/weapons/munitions/GravityBombMunition.h (modified) * code/trunk/src/modules/weapons/munitions/IceMunition.cc (modified) * code/trunk/src/modules/weapons/munitions/IceMunition.h (modified) * code/trunk/src/modules/weapons/munitions/LaserMunition.cc (modified) * code/trunk/src/modules/weapons/munitions/LaserMunition.h (modified) * code/trunk/src/modules/weapons/munitions/LightningMunition.cc (modified) * code/trunk/src/modules/weapons/munitions/LightningMunition.h (modified) * code/trunk/src/modules/weapons/munitions/MineMunition.cc (modified) * code/trunk/src/modules/weapons/munitions/MineMunition.h (modified) * code/trunk/src/modules/weapons/munitions/RocketMunition.cc (modified) * code/trunk/src/modules/weapons/munitions/RocketMunition.h (modified) * code/trunk/src/modules/weapons/munitions/SplitMunition.cc (modified) * code/trunk/src/modules/weapons/munitions/SplitMunition.h (modified) * code/trunk/src/modules/weapons/projectiles/BasicProjectile.cc (modified) * code/trunk/src/modules/weapons/projectiles/BillboardProjectile.h (modified) * code/trunk/src/modules/weapons/projectiles/GravityBomb.cc (modified) * code/trunk/src/modules/weapons/projectiles/GravityBomb.h (modified) * code/trunk/src/modules/weapons/projectiles/GravityBombField.cc (modified) * code/trunk/src/modules/weapons/projectiles/GravityBombField.h (modified) * code/trunk/src/modules/weapons/projectiles/IceGunProjectile.cc (modified) * code/trunk/src/modules/weapons/projectiles/IceGunProjectile.h (modified) * code/trunk/src/modules/weapons/projectiles/LightningGunProjectile.cc (modified) * code/trunk/src/modules/weapons/projectiles/LightningGunProjectile.h (modified) * code/trunk/src/modules/weapons/projectiles/MineProjectile.cc (modified) * code/trunk/src/modules/weapons/projectiles/MineProjectile.h (modified) * code/trunk/src/modules/weapons/projectiles/ParticleProjectile.cc (modified) * code/trunk/src/modules/weapons/projectiles/ParticleProjectile.h (modified) * code/trunk/src/modules/weapons/projectiles/Projectile.cc (modified) * code/trunk/src/modules/weapons/projectiles/Projectile.h (modified) * code/trunk/src/modules/weapons/projectiles/Rocket.cc (modified) * code/trunk/src/modules/weapons/projectiles/Rocket.h (modified) * code/trunk/src/modules/weapons/projectiles/RocketOld.cc (modified) * code/trunk/src/modules/weapons/projectiles/RocketOld.h (modified) * code/trunk/src/modules/weapons/projectiles/SimpleRocket.cc (modified) * code/trunk/src/modules/weapons/projectiles/SimpleRocket.h (modified) * code/trunk/src/modules/weapons/weaponmodes/EnergyDrink.h (modified) * code/trunk/src/modules/weapons/weaponmodes/FusionFire.h (modified) * code/trunk/src/modules/weapons/weaponmodes/GravityBombFire.h (modified) * code/trunk/src/modules/weapons/weaponmodes/HsW01.h (modified) * code/trunk/src/modules/weapons/weaponmodes/IceGun.h (modified) * code/trunk/src/modules/weapons/weaponmodes/LaserFire.h (modified) * code/trunk/src/modules/weapons/weaponmodes/LightningGun.h (modified) * code/trunk/src/modules/weapons/weaponmodes/MineGun.h (modified) * code/trunk/src/modules/weapons/weaponmodes/RocketFire.h (modified) * code/trunk/src/modules/weapons/weaponmodes/RocketFireOld.h (modified) * code/trunk/src/modules/weapons/weaponmodes/SimpleRocketFire.h (modified) * code/trunk/src/modules/weapons/weaponmodes/SplitGun.h (modified) * code/trunk/src/orxonox/CameraManager.cc (modified) * code/trunk/src/orxonox/CameraManager.h (modified) * code/trunk/src/orxonox/Level.cc (modified) * code/trunk/src/orxonox/Level.h (modified) * code/trunk/src/orxonox/LevelInfo.cc (modified) * code/trunk/src/orxonox/LevelInfo.h (modified) * code/trunk/src/orxonox/LevelManager.cc (modified) * code/trunk/src/orxonox/LevelManager.h (modified) * code/trunk/src/orxonox/Main.h (modified) * code/trunk/src/orxonox/MoodManager.cc (modified) * code/trunk/src/orxonox/PlayerManager.cc (modified) * code/trunk/src/orxonox/PlayerManager.h (modified) * code/trunk/src/orxonox/Radar.cc (modified) * code/trunk/src/orxonox/Radar.h (modified) * code/trunk/src/orxonox/Scene.cc (modified) * code/trunk/src/orxonox/Scene.h (modified) * code/trunk/src/orxonox/Test.cc (modified) * code/trunk/src/orxonox/chat/ChatHistory.cc (modified) * code/trunk/src/orxonox/chat/ChatHistory.h (modified) * code/trunk/src/orxonox/chat/ChatInputHandler.cc (modified) * code/trunk/src/orxonox/chat/ChatInputHandler.h (modified) * code/trunk/src/orxonox/chat/ChatManager.cc (modified) * code/trunk/src/orxonox/chat/ChatManager.h (modified) * code/trunk/src/orxonox/collisionshapes/CollisionShape.cc (modified) * code/trunk/src/orxonox/collisionshapes/CollisionShape.h (modified) * code/trunk/src/orxonox/collisionshapes/CompoundCollisionShape.cc (modified) * code/trunk/src/orxonox/collisionshapes/CompoundCollisionShape.h (modified) * code/trunk/src/orxonox/collisionshapes/WorldEntityCollisionShape.cc (modified) * code/trunk/src/orxonox/collisionshapes/WorldEntityCollisionShape.h (modified) * code/trunk/src/orxonox/controllers/AIController.cc (modified) * code/trunk/src/orxonox/controllers/AIController.h (modified) * code/trunk/src/orxonox/controllers/ActionpointController.cc (modified) * code/trunk/src/orxonox/controllers/ActionpointController.h (modified) * code/trunk/src/orxonox/controllers/ArtificialController.cc (modified) * code/trunk/src/orxonox/controllers/ArtificialController.h (modified) * code/trunk/src/orxonox/controllers/CommonController.cc (modified) * code/trunk/src/orxonox/controllers/Controller.cc (modified) * code/trunk/src/orxonox/controllers/Controller.h (modified) * code/trunk/src/orxonox/controllers/ControllerDirector.cc (modified) * code/trunk/src/orxonox/controllers/ControllerDirector.h (modified) * code/trunk/src/orxonox/controllers/DivisionController.cc (modified) * code/trunk/src/orxonox/controllers/DivisionController.h (modified) * code/trunk/src/orxonox/controllers/DroneController.cc (modified) * code/trunk/src/orxonox/controllers/DroneController.h (modified) * code/trunk/src/orxonox/controllers/FightingController.cc (modified) * code/trunk/src/orxonox/controllers/FightingController.h (modified) * code/trunk/src/orxonox/controllers/FlyingController.cc (modified) * code/trunk/src/orxonox/controllers/FlyingController.h (modified) * code/trunk/src/orxonox/controllers/FormationController.cc (modified) * code/trunk/src/orxonox/controllers/FormationController.h (modified) * code/trunk/src/orxonox/controllers/HumanController.cc (modified) * code/trunk/src/orxonox/controllers/HumanController.h (modified) * code/trunk/src/orxonox/controllers/MasterController.cc (modified) * code/trunk/src/orxonox/controllers/MasterController.h (modified) * code/trunk/src/orxonox/controllers/NewHumanController.cc (modified) * code/trunk/src/orxonox/controllers/NewHumanController.h (modified) * code/trunk/src/orxonox/controllers/ScriptController.cc (modified) * code/trunk/src/orxonox/controllers/ScriptController.h (modified) * code/trunk/src/orxonox/controllers/SectionController.cc (modified) * code/trunk/src/orxonox/controllers/SectionController.h (modified) * code/trunk/src/orxonox/controllers/WaypointController.cc (modified) * code/trunk/src/orxonox/controllers/WaypointController.h (modified) * code/trunk/src/orxonox/controllers/WaypointPatrolController.cc (modified) * code/trunk/src/orxonox/controllers/WaypointPatrolController.h (modified) * code/trunk/src/orxonox/controllers/WingmanController.cc (modified) * code/trunk/src/orxonox/controllers/WingmanController.h (modified) * code/trunk/src/orxonox/gamestates/GSClient.h (modified) * code/trunk/src/orxonox/gamestates/GSGraphics.h (modified) * code/trunk/src/orxonox/gamestates/GSLevel.cc (modified) * code/trunk/src/orxonox/gamestates/GSLevel.h (modified) * code/trunk/src/orxonox/gamestates/GSLevelMemento.h (modified) * code/trunk/src/orxonox/gamestates/GSMainMenu.cc (modified) * code/trunk/src/orxonox/gamestates/GSMainMenu.h (modified) * code/trunk/src/orxonox/gamestates/GSMasterServer.h (modified) * code/trunk/src/orxonox/gamestates/GSRoot.cc (modified) * code/trunk/src/orxonox/gamestates/GSRoot.h (modified) * code/trunk/src/orxonox/gamestates/GSServer.cc (modified) * code/trunk/src/orxonox/gamestates/GSServer.h (modified) * code/trunk/src/orxonox/gamestates/GSStandalone.h (modified) * code/trunk/src/orxonox/gametypes/Asteroids.h (modified) * code/trunk/src/orxonox/gametypes/Deathmatch.h (modified) * code/trunk/src/orxonox/gametypes/Dynamicmatch.cc (modified) * code/trunk/src/orxonox/gametypes/Dynamicmatch.h (modified) * code/trunk/src/orxonox/gametypes/Gametype.cc (modified) * code/trunk/src/orxonox/gametypes/Gametype.h (modified) * code/trunk/src/orxonox/gametypes/LastManStanding.cc (modified) * code/trunk/src/orxonox/gametypes/LastManStanding.h (modified) * code/trunk/src/orxonox/gametypes/LastTeamStanding.cc (modified) * code/trunk/src/orxonox/gametypes/LastTeamStanding.h (modified) * code/trunk/src/orxonox/gametypes/Mission.cc (modified) * code/trunk/src/orxonox/gametypes/Mission.h (modified) * code/trunk/src/orxonox/gametypes/TeamBaseMatch.cc (modified) * code/trunk/src/orxonox/gametypes/TeamBaseMatch.h (modified) * code/trunk/src/orxonox/gametypes/TeamDeathmatch.cc (modified) * code/trunk/src/orxonox/gametypes/TeamDeathmatch.h (modified) * code/trunk/src/orxonox/gametypes/TeamGametype.cc (modified) * code/trunk/src/orxonox/gametypes/TeamGametype.h (modified) * code/trunk/src/orxonox/gametypes/UnderAttack.cc (modified) * code/trunk/src/orxonox/gametypes/UnderAttack.h (modified) * code/trunk/src/orxonox/graphics/AnimatedModel.h (modified) * code/trunk/src/orxonox/graphics/Backlight.cc (modified) * code/trunk/src/orxonox/graphics/Backlight.h (modified) * code/trunk/src/orxonox/graphics/Billboard.cc (modified) * code/trunk/src/orxonox/graphics/Billboard.h (modified) * code/trunk/src/orxonox/graphics/BlinkingBillboard.h (modified) * code/trunk/src/orxonox/graphics/Camera.h (modified) * code/trunk/src/orxonox/graphics/FadingBillboard.h (modified) * code/trunk/src/orxonox/graphics/GlobalShader.h (modified) * code/trunk/src/orxonox/graphics/Light.cc (modified) * code/trunk/src/orxonox/graphics/Light.h (modified) * code/trunk/src/orxonox/graphics/MeshLodInformation.h (modified) * code/trunk/src/orxonox/graphics/Model.cc (modified) * code/trunk/src/orxonox/graphics/Model.h (modified) * code/trunk/src/orxonox/graphics/ParticleEmitter.cc (modified) * code/trunk/src/orxonox/graphics/ParticleEmitter.h (modified) * code/trunk/src/orxonox/graphics/ParticleSpawner.h (modified) * code/trunk/src/orxonox/infos/Bot.h (modified) * code/trunk/src/orxonox/infos/GametypeInfo.cc (modified) * code/trunk/src/orxonox/infos/HumanPlayer.cc (modified) * code/trunk/src/orxonox/infos/HumanPlayer.h (modified) * code/trunk/src/orxonox/infos/PlayerInfo.cc (modified) * code/trunk/src/orxonox/infos/PlayerInfo.h (modified) * code/trunk/src/orxonox/interfaces/NotificationListener.cc (modified) * code/trunk/src/orxonox/interfaces/NotificationListener.h (modified) * code/trunk/src/orxonox/interfaces/PickupCarrier.cc (modified) * code/trunk/src/orxonox/interfaces/PickupCarrier.h (modified) * code/trunk/src/orxonox/interfaces/PickupListener.cc (modified) * code/trunk/src/orxonox/interfaces/Pickupable.cc (modified) * code/trunk/src/orxonox/interfaces/Pickupable.h (modified) * code/trunk/src/orxonox/interfaces/RadarViewable.cc (modified) * code/trunk/src/orxonox/interfaces/RadarViewable.h (modified) * code/trunk/src/orxonox/items/Engine.cc (modified) * code/trunk/src/orxonox/items/Engine.h (modified) * code/trunk/src/orxonox/items/MultiStateEngine.cc (modified) * code/trunk/src/orxonox/items/MultiStateEngine.h (modified) * code/trunk/src/orxonox/items/PartDestructionEvent.cc (modified) * code/trunk/src/orxonox/items/PartDestructionEvent.h (modified) * code/trunk/src/orxonox/items/ShipPart.cc (modified) * code/trunk/src/orxonox/items/ShipPart.h (modified) * code/trunk/src/orxonox/overlays/GUISheet.h (modified) * code/trunk/src/orxonox/overlays/InGameConsole.cc (modified) * code/trunk/src/orxonox/overlays/InGameConsole.h (modified) * code/trunk/src/orxonox/overlays/OrxonoxOverlay.cc (modified) * code/trunk/src/orxonox/overlays/OrxonoxOverlay.h (modified) * code/trunk/src/orxonox/overlays/OverlayGroup.cc (modified) * code/trunk/src/orxonox/overlays/OverlayGroup.h (modified) * code/trunk/src/orxonox/sound/AmbientSound.cc (modified) * code/trunk/src/orxonox/sound/AmbientSound.h (modified) * code/trunk/src/orxonox/sound/BaseSound.cc (modified) * code/trunk/src/orxonox/sound/BaseSound.h (modified) * code/trunk/src/orxonox/sound/SoundBuffer.cc (modified) * code/trunk/src/orxonox/sound/SoundBuffer.h (modified) * code/trunk/src/orxonox/sound/SoundManager.cc (modified) * code/trunk/src/orxonox/sound/SoundManager.h (modified) * code/trunk/src/orxonox/sound/SoundStreamer.cc (modified) * code/trunk/src/orxonox/sound/WorldAmbientSound.cc (modified) * code/trunk/src/orxonox/sound/WorldAmbientSound.h (modified) * code/trunk/src/orxonox/sound/WorldSound.cc (modified) * code/trunk/src/orxonox/sound/WorldSound.h (modified) * code/trunk/src/orxonox/weaponsystem/DefaultWeaponmodeLink.h (modified) * code/trunk/src/orxonox/weaponsystem/Munition.cc (modified) * code/trunk/src/orxonox/weaponsystem/Munition.h (modified) * code/trunk/src/orxonox/weaponsystem/ReplenishingMunition.h (modified) * code/trunk/src/orxonox/weaponsystem/Weapon.cc (modified) * code/trunk/src/orxonox/weaponsystem/Weapon.h (modified) * code/trunk/src/orxonox/weaponsystem/WeaponMode.cc (modified) * code/trunk/src/orxonox/weaponsystem/WeaponMode.h (modified) * code/trunk/src/orxonox/weaponsystem/WeaponPack.cc (modified) * code/trunk/src/orxonox/weaponsystem/WeaponPack.h (modified) * code/trunk/src/orxonox/weaponsystem/WeaponSet.cc (modified) * code/trunk/src/orxonox/weaponsystem/WeaponSet.h (modified) * code/trunk/src/orxonox/weaponsystem/WeaponSlot.cc (modified) * code/trunk/src/orxonox/weaponsystem/WeaponSlot.h (modified) * code/trunk/src/orxonox/weaponsystem/WeaponSystem.cc (modified) * code/trunk/src/orxonox/weaponsystem/WeaponSystem.h (modified) * code/trunk/src/orxonox/worldentities/Actionpoint.h (modified) * code/trunk/src/orxonox/worldentities/CameraPosition.h (modified) * code/trunk/src/orxonox/worldentities/ControllableEntity.cc (modified) * code/trunk/src/orxonox/worldentities/ControllableEntity.h (modified) * code/trunk/src/orxonox/worldentities/Drone.cc (modified) * code/trunk/src/orxonox/worldentities/Drone.h (modified) * code/trunk/src/orxonox/worldentities/EffectContainer.cc (modified) * code/trunk/src/orxonox/worldentities/EffectContainer.h (modified) * code/trunk/src/orxonox/worldentities/ExplosionChunk.cc (modified) * code/trunk/src/orxonox/worldentities/ExplosionChunk.h (modified) * code/trunk/src/orxonox/worldentities/ExplosionPart.cc (modified) * code/trunk/src/orxonox/worldentities/ExplosionPart.h (modified) * code/trunk/src/orxonox/worldentities/MobileEntity.cc (modified) * code/trunk/src/orxonox/worldentities/MobileEntity.h (modified) * code/trunk/src/orxonox/worldentities/MovableEntity.cc (modified) * code/trunk/src/orxonox/worldentities/MovableEntity.h (modified) * code/trunk/src/orxonox/worldentities/SpawnPoint.cc (modified) * code/trunk/src/orxonox/worldentities/SpawnPoint.h (modified) * code/trunk/src/orxonox/worldentities/StaticEntity.cc (modified) * code/trunk/src/orxonox/worldentities/StaticEntity.h (modified) * code/trunk/src/orxonox/worldentities/TeamSpawnPoint.h (modified) * code/trunk/src/orxonox/worldentities/WorldEntity.cc (modified) * code/trunk/src/orxonox/worldentities/WorldEntity.h (modified) * code/trunk/src/orxonox/worldentities/pawns/FpsPlayer.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/FpsPlayer.h (modified) * code/trunk/src/orxonox/worldentities/pawns/ModularSpaceShip.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/ModularSpaceShip.h (modified) * code/trunk/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/Pawn.h (modified) * code/trunk/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/Spectator.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/TeamBaseMatchBase.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/TeamBaseMatchBase.h (modified) * code/trunk/test/core/CMakeLists.txt (modified) * code/trunk/test/core/class/IdentifiableTest.cc (modified) * code/trunk/test/core/class/IdentifierClassHierarchyTest.cc (modified) * code/trunk/test/core/class/IdentifierExternalClassHierarchyTest.cc (modified) * code/trunk/test/core/class/IdentifierNestedClassHierarchyTest.cc (modified) * code/trunk/test/core/class/IdentifierSimpleClassHierarchyTest.cc (modified) * code/trunk/test/core/class/IdentifierTest.cc (modified) * code/trunk/test/core/class/OrxonoxClassTest.cc (modified) * code/trunk/test/core/class/OrxonoxInterfaceTest.cc (modified) * code/trunk/test/core/class/SubclassIdentifierTest.cc (modified) * code/trunk/test/core/class/SuperTest.cc (modified) * code/trunk/test/core/command/CommandTest.cc (modified) * code/trunk/test/core/command/ExecutorPtrTest.cc (copied) * code/trunk/test/core/command/FunctorPtrTest.cc (copied) * code/trunk/test/core/command/FunctorTest.cc (copied) * code/trunk/test/core/object/ClassFactoryTest.cc (modified) * code/trunk/test/core/object/ContextTest.cc (modified) * code/trunk/test/core/object/DestroyableTest.cc (modified) * code/trunk/test/core/object/IteratorTest.cc (modified) * code/trunk/test/core/object/ListableTest.cc (modified) * code/trunk/test/core/object/ObjectListBaseTest.cc (modified) * code/trunk/test/core/object/ObjectListIteratorTest.cc (modified) * code/trunk/test/core/object/ObjectListTest.cc (copied) * code/trunk/test/core/object/StrongPtrTest.cc (modified) * code/trunk/test/core/object/WeakPtrTest.cc (modified) * code/trunk/test/core/singleton/ScopeTest.cc (modified) * code/trunk/test/core_plugin/PluginTest.cc (modified) * code/trunk/test/util/MathTest.cc (modified) * code/trunk/test/util/MultiTypeTest.cc (modified) * code/trunk/test/util/SharedPtrTest.cc (modified) * code/trunk/test/util/SingletonTest.cc (modified) * code/trunk/test/util/SmallObjectAllocatorTest.cc (modified) * code/trunk/test/util/output/BaseWriterTest.cc (modified) * code/trunk/test/util/output/ConsoleWriterTest.cc (modified) * code/trunk/test/util/output/LogWriterTest.cc (modified) * code/trunk/test/util/output/MemoryWriterTest.cc (modified) * code/trunk/test/util/output/OutputListenerTest.cc (modified) * code/trunk/test/util/output/OutputManagerTest.cc (modified) * code/trunk/test/util/output/OutputStreamTest.cc (modified) merged branch cpp11_v3 back to trunk Sun, 10 Jan 2016 17:35:40 GMT landauf [11056] * code/trunk (modified) * code/trunk/src/modules/overlays/CMakeLists.txt (modified) merged last commit from presentationHS15 to trunk Sat, 09 Jan 2016 17:26:20 GMT landauf [11052] * code/trunk (modified) * code/trunk/data/defaultConfig/orxonox.ini (modified) * code/trunk/data/gui/layouts/CampaignMenu.layout (modified) * code/trunk/data/gui/layouts/InGameMenu.layout (modified) * code/trunk/data/gui/scripts/CampaignMenu.lua (modified) * code/trunk/data/gui/scripts/InGameMenu.lua (modified) * code/trunk/data/gui/scripts/SheetManager.lua (modified) * code/trunk/data/levels/AITest.oxw (copied) * code/trunk/data/levels/FPS_Level_HS14.oxw (modified) * code/trunk/data/levels/HeavyCruiser.oxw (modified) * code/trunk/data/levels/Hover.oxw (copied) * code/trunk/data/levels/emptyLevel.oxw (modified) * code/trunk/data/levels/expeditionSector.oxw (copied) * code/trunk/data/levels/iJohnVane_TriptoArea51.oxw (modified) * code/trunk/data/levels/iiiJohnVane_EscapeTheBastards.oxw (modified) * code/trunk/data/levels/includes/invaderWeapon.oxi (modified) * code/trunk/data/levels/includes/invaderWeaponEnemy.oxi (modified) * code/trunk/data/levels/includes/pickups.oxi (modified) * code/trunk/data/levels/includes/towerWeaponSettings.oxi (deleted) * code/trunk/data/levels/includes/weaponSettingsAssff.oxi (modified) * code/trunk/data/levels/includes/weaponSettingsAssff2.oxi (modified) * code/trunk/data/levels/includes/weaponSettingsCollateral.oxi (modified) * code/trunk/data/levels/includes/weaponSettingsEscort.oxi (modified) * code/trunk/data/levels/includes/weaponSettingsEscortMine.oxi (copied) * code/trunk/data/levels/includes/weaponSettingsFPS.oxi (modified) * code/trunk/data/levels/includes/weaponSettingsFPS_HS14.oxi (modified) * code/trunk/data/levels/includes/weaponSettingsFS15.oxi (modified) * code/trunk/data/levels/includes/weaponSettingsGhost.oxi (modified) * code/trunk/data/levels/includes/weaponSettingsH2.oxi (modified) * code/trunk/data/levels/includes/weaponSettingsHXY.oxi (modified) * code/trunk/data/levels/includes/weaponSettingsHeartAttack.oxi (modified) * code/trunk/data/levels/includes/weaponSettingsHeavyCruiser.oxi (modified) * code/trunk/data/levels/includes/weaponSettingsHeavyCruiserBody.oxi (modified) * code/trunk/data/levels/includes/weaponSettingsHover.oxi (copied) * code/trunk/data/levels/includes/weaponSettingsImmTest.oxi (modified) * code/trunk/data/levels/includes/weaponSettingsPirate.oxi (modified) * code/trunk/data/levels/includes/weaponSettingsRing.oxi (modified) * code/trunk/data/levels/includes/weaponSettingsSpacecruiser.oxi (modified) * code/trunk/data/levels/includes/weaponSettingsSwallow.oxi (modified) * code/trunk/data/levels/includes/weaponSettingsTransporter.oxi (modified) * code/trunk/data/levels/includes/weaponSettingsTurret.oxi (modified) * code/trunk/data/levels/includes/weaponSettingsTurret1.oxi (modified) * code/trunk/data/levels/includes/weaponSettingsbigship.oxi (modified) * code/trunk/data/levels/kecks.oxw (modified) * code/trunk/data/levels/mineLevel.oxw (copied) * code/trunk/data/levels/missionOne.oxw (modified) * code/trunk/data/levels/notifications.oxw (modified) * code/trunk/data/levels/pickups.oxw (modified) * code/trunk/data/levels/planetLevelHS15.oxw (copied) * code/trunk/data/levels/presentationHS13.oxw (modified) * code/trunk/data/levels/shieldTest.oxw (modified) * code/trunk/data/levels/shuttleAttack.oxw (copied) * code/trunk/data/levels/shuttleRetaliation.oxw (copied) * code/trunk/data/levels/templates/FPS.oxt (modified) * code/trunk/data/levels/templates/FPS_HS14.oxt (modified) * code/trunk/data/levels/templates/HeavyCruiser.oxt (modified) * code/trunk/data/levels/templates/HeavyCruiserBody.oxt (modified) * code/trunk/data/levels/templates/ModularSpaceShipTest.oxt (modified) * code/trunk/data/levels/templates/bigship.oxt (modified) * code/trunk/data/levels/templates/enemyInvader.oxt (modified) * code/trunk/data/levels/templates/pickupRepresentationTemplates.oxt (modified) * code/trunk/data/levels/templates/spaceshipAssff.oxt (modified) * code/trunk/data/levels/templates/spaceshipAssff2.oxt (modified) * code/trunk/data/levels/templates/spaceshipCollateralDamage.oxt (modified) * code/trunk/data/levels/templates/spaceshipDodgeRace.oxt (modified) * code/trunk/data/levels/templates/spaceshipEscort.oxt (modified) * code/trunk/data/levels/templates/spaceshipEscortMine.oxt (copied) * code/trunk/data/levels/templates/spaceshipGhost.oxt (modified) * code/trunk/data/levels/templates/spaceshipH2.oxt (modified) * code/trunk/data/levels/templates/spaceshipHXY.oxt (modified) * code/trunk/data/levels/templates/spaceshipHXYSL.oxt (modified) * code/trunk/data/levels/templates/spaceshipHeartAttack.oxt (modified) * code/trunk/data/levels/templates/spaceshipHover.oxt (copied) * code/trunk/data/levels/templates/spaceshipInvader.oxt (modified) * code/trunk/data/levels/templates/spaceshipPirate.oxt (modified) * code/trunk/data/levels/templates/spaceshipRace.oxt (modified) * code/trunk/data/levels/templates/spaceshipRing.oxt (modified) * code/trunk/data/levels/templates/spaceshipShuttle.oxt (copied) * code/trunk/data/levels/templates/spaceshipSpacecruiser.oxt (modified) * code/trunk/data/levels/templates/spaceshipSwallow.oxt (modified) * code/trunk/data/levels/templates/spaceshipTransporter.oxt (modified) * code/trunk/data/levels/templates/spaceshipTransporterSL.oxt (modified) * code/trunk/data/levels/templates/spaceshipTurret.oxt (modified) * code/trunk/data/levels/templates/towerdefensetower.oxt (modified) * code/trunk/data/levels/towerDefense.oxw (modified) * code/trunk/data/overlays/HUDTemplates3.oxo (modified) * code/trunk/data/overlays/HoverHUD.oxo (copied) * code/trunk/data/overlays/InvaderHUD.oxo (modified) * code/trunk/data/overlays/jumpHUD.oxo (modified) * code/trunk/data/particle/MineExpl.particle (copied) * code/trunk/data/particle/MineExpl1.particle (copied) * code/trunk/data/particle/MineExpl2.particle (copied) * code/trunk/data/particle/engine.particle (copied) * code/trunk/data/particle/engineglow.particle (modified) * code/trunk/data/particle/ice.particle (copied) * code/trunk/data/particle/mineparticle.particle (copied) * code/trunk/data/particle/psygun.particle (copied) * code/trunk/data/particle/rocketfire.particle (modified) * code/trunk/src/libraries/core/CoreConfig.cc (modified) * code/trunk/src/libraries/core/CoreConfig.h (modified) * code/trunk/src/libraries/core/GUIManager.cc (modified) * code/trunk/src/libraries/core/GUIManager.h (modified) * code/trunk/src/libraries/core/GameConfig.cc (modified) * code/trunk/src/libraries/core/GameConfig.h (modified) * code/trunk/src/libraries/core/command/ArgumentCompletionFunctions.h (modified) * code/trunk/src/libraries/core/command/ConsoleCommandIncludes.cc (modified) * code/trunk/src/libraries/core/command/ConsoleCommandManager.cc (modified) * code/trunk/src/libraries/core/commandline/CMakeLists.txt (modified) * code/trunk/src/libraries/core/input/KeyBinder.cc (modified) * code/trunk/src/libraries/core/input/KeyBinder.h (modified) * code/trunk/src/libraries/core/singleton/ScopedSingletonIncludes.cc (modified) * code/trunk/src/libraries/core/singleton/ScopedSingletonIncludes.h (modified) * code/trunk/src/libraries/network/NetworkFunctionIncludes.cc (modified) * code/trunk/src/libraries/network/NetworkFunctionIncludes.h (modified) * code/trunk/src/libraries/network/NetworkFunctionManager.cc (modified) * code/trunk/src/libraries/network/NetworkFunctionManager.h (modified) * code/trunk/src/libraries/tools/ParticleInterface.cc (modified) * code/trunk/src/libraries/tools/ParticleInterface.h (modified) * code/trunk/src/libraries/util/Math.cc (modified) * code/trunk/src/libraries/util/Math.h (modified) * code/trunk/src/modules/CMakeLists.txt (modified) * code/trunk/src/modules/docking/DockingController.cc (modified) * code/trunk/src/modules/dodgerace/DodgeRace.cc (modified) * code/trunk/src/modules/dodgerace/DodgeRace.h (modified) * code/trunk/src/modules/hover (copied) * code/trunk/src/modules/invader/Invader.cc (modified) * code/trunk/src/modules/notifications/dispatchers/CommandNotification.cc (modified) * code/trunk/src/modules/notifications/dispatchers/CommandNotification.h (modified) * code/trunk/src/modules/objects/Turret.h (modified) * code/trunk/src/modules/overlays/OverlaysPrereqs.h (modified) * code/trunk/src/modules/overlays/hud/CMakeLists.txt (modified) * code/trunk/src/modules/overlays/hud/HUDBar.cc (modified) * code/trunk/src/modules/overlays/hud/HUDBar.h (modified) * code/trunk/src/modules/overlays/hud/HUDBoostBar.cc (modified) * code/trunk/src/modules/overlays/hud/HUDEnemyShieldBar.cc (copied) * code/trunk/src/modules/overlays/hud/HUDEnemyShieldBar.h (copied) * code/trunk/src/modules/overlays/hud/HUDHealthBar.cc (modified) * code/trunk/src/modules/overlays/hud/HUDHealthBar.h (modified) * code/trunk/src/modules/overlays/hud/HUDRadar.cc (modified) * code/trunk/src/modules/overlays/hud/HUDRocketFuelBar.cc (copied) * code/trunk/src/modules/overlays/hud/HUDRocketFuelBar.h (copied) * code/trunk/src/modules/overlays/hud/HUDShieldBar.cc (copied) * code/trunk/src/modules/overlays/hud/HUDShieldBar.h (copied) * code/trunk/src/modules/overlays/hud/HUDWeapon.cc (copied) * code/trunk/src/modules/overlays/hud/HUDWeapon.h (copied) * code/trunk/src/modules/overlays/hud/HUDWeaponMode.cc (copied) * code/trunk/src/modules/overlays/hud/HUDWeaponMode.h (copied) * code/trunk/src/modules/overlays/hud/HUDWeaponSystem.cc (copied) * code/trunk/src/modules/overlays/hud/HUDWeaponSystem.h (copied) * code/trunk/src/modules/pickup/PickupPrereqs.h (modified) * code/trunk/src/modules/pickup/PickupRepresentation.cc (modified) * code/trunk/src/modules/pickup/items/BoostPickup.cc (copied) * code/trunk/src/modules/pickup/items/BoostPickup.h (copied) * code/trunk/src/modules/pickup/items/CMakeLists.txt (modified) * code/trunk/src/modules/pickup/items/DronePickup.h (modified) * code/trunk/src/modules/pickup/items/MunitionContainer.cc (copied) * code/trunk/src/modules/pickup/items/MunitionContainer.h (copied) * code/trunk/src/modules/pickup/items/MunitionPickup.cc (copied) * code/trunk/src/modules/pickup/items/MunitionPickup.h (copied) * code/trunk/src/modules/towerdefense/TowerDefenseField.cc (modified) * code/trunk/src/modules/towerdefense/TowerDefenseField.h (modified) * code/trunk/src/modules/towerdefense/TowerDefenseSelecter.cc (modified) * code/trunk/src/modules/towerdefense/TowerDefenseTower.cc (modified) * code/trunk/src/modules/weapons/IceGunFreezer.cc (modified) * code/trunk/src/modules/weapons/IceGunFreezer.h (modified) * code/trunk/src/modules/weapons/WeaponsPrereqs.h (modified) * code/trunk/src/modules/weapons/munitions/CMakeLists.txt (modified) * code/trunk/src/modules/weapons/munitions/FusionMunition.cc (modified) * code/trunk/src/modules/weapons/munitions/FusionMunition.h (modified) * code/trunk/src/modules/weapons/munitions/GravityBombMunition.cc (modified) * code/trunk/src/modules/weapons/munitions/GravityBombMunition.h (modified) * code/trunk/src/modules/weapons/munitions/IceMunition.cc (modified) * code/trunk/src/modules/weapons/munitions/IceMunition.h (modified) * code/trunk/src/modules/weapons/munitions/LaserMunition.cc (modified) * code/trunk/src/modules/weapons/munitions/LaserMunition.h (modified) * code/trunk/src/modules/weapons/munitions/LightningMunition.cc (copied) * code/trunk/src/modules/weapons/munitions/LightningMunition.h (copied) * code/trunk/src/modules/weapons/munitions/MineMunition.cc (copied) * code/trunk/src/modules/weapons/munitions/MineMunition.h (copied) * code/trunk/src/modules/weapons/munitions/ReplenishingMunition.cc (deleted) * code/trunk/src/modules/weapons/munitions/ReplenishingMunition.h (deleted) * code/trunk/src/modules/weapons/munitions/RocketMunition.cc (modified) * code/trunk/src/modules/weapons/munitions/RocketMunition.h (modified) * code/trunk/src/modules/weapons/munitions/SplitMunition.cc (modified) * code/trunk/src/modules/weapons/munitions/SplitMunition.h (modified) * code/trunk/src/modules/weapons/projectiles/BasicProjectile.cc (modified) * code/trunk/src/modules/weapons/projectiles/CMakeLists.txt (modified) * code/trunk/src/modules/weapons/projectiles/GravityBombField.cc (modified) * code/trunk/src/modules/weapons/projectiles/IceGunProjectile.cc (modified) * code/trunk/src/modules/weapons/projectiles/IceGunProjectile.h (modified) * code/trunk/src/modules/weapons/projectiles/MineProjectile.cc (copied) * code/trunk/src/modules/weapons/projectiles/MineProjectile.h (copied) * code/trunk/src/modules/weapons/projectiles/Projectile.h (modified) * code/trunk/src/modules/weapons/projectiles/Rocket.cc (modified) * code/trunk/src/modules/weapons/projectiles/Rocket.h (modified) * code/trunk/src/modules/weapons/projectiles/SimpleRocket.cc (modified) * code/trunk/src/modules/weapons/projectiles/SplitGunProjectile.cc (modified) * code/trunk/src/modules/weapons/projectiles/SplitGunProjectile.h (modified) * code/trunk/src/modules/weapons/weaponmodes/CMakeLists.txt (modified) * code/trunk/src/modules/weapons/weaponmodes/EnergyDrink.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/FusionFire.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/GravityBombFire.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/HsW01.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/IceGun.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/IceGun.h (modified) * code/trunk/src/modules/weapons/weaponmodes/LaserFire.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/LightningGun.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/MineGun.cc (copied) * code/trunk/src/modules/weapons/weaponmodes/MineGun.h (copied) * code/trunk/src/modules/weapons/weaponmodes/RocketFire.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/RocketFire.h (modified) * code/trunk/src/modules/weapons/weaponmodes/RocketFireOld.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/SimpleRocketFire.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/SplitGun.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/SplitGun.h (modified) * code/trunk/src/orxonox/OrxonoxPrereqs.h (modified) * code/trunk/src/orxonox/controllers/ActionpointController.cc (copied) * code/trunk/src/orxonox/controllers/ActionpointController.h (copied) * code/trunk/src/orxonox/controllers/ArtificialController.cc (modified) * code/trunk/src/orxonox/controllers/CMakeLists.txt (modified) * code/trunk/src/orxonox/controllers/CommonController.cc (copied) * code/trunk/src/orxonox/controllers/CommonController.h (copied) * code/trunk/src/orxonox/controllers/DivisionController.cc (copied) * code/trunk/src/orxonox/controllers/DivisionController.h (copied) * code/trunk/src/orxonox/controllers/FightingController.cc (copied) * code/trunk/src/orxonox/controllers/FightingController.h (copied) * code/trunk/src/orxonox/controllers/FlyingController.cc (copied) * code/trunk/src/orxonox/controllers/FlyingController.h (copied) * code/trunk/src/orxonox/controllers/FormationController.cc (modified) * code/trunk/src/orxonox/controllers/HumanController.cc (modified) * code/trunk/src/orxonox/controllers/MasterController.cc (copied) * code/trunk/src/orxonox/controllers/MasterController.h (copied) * code/trunk/src/orxonox/controllers/SectionController.cc (copied) * code/trunk/src/orxonox/controllers/SectionController.h (copied) * code/trunk/src/orxonox/controllers/WingmanController.cc (copied) * code/trunk/src/orxonox/controllers/WingmanController.h (copied) * code/trunk/src/orxonox/gametypes/Dynamicmatch.cc (modified) * code/trunk/src/orxonox/gametypes/Dynamicmatch.h (modified) * code/trunk/src/orxonox/infos/PlayerInfo.cc (modified) * code/trunk/src/orxonox/items/ShipPart.cc (modified) * code/trunk/src/orxonox/overlays/OrxonoxOverlay.cc (modified) * code/trunk/src/orxonox/overlays/OrxonoxOverlay.h (modified) * code/trunk/src/orxonox/overlays/OverlayGroup.cc (modified) * code/trunk/src/orxonox/weaponsystem/CMakeLists.txt (modified) * code/trunk/src/orxonox/weaponsystem/Munition.cc (modified) * code/trunk/src/orxonox/weaponsystem/Munition.h (modified) * code/trunk/src/orxonox/weaponsystem/ReplenishingMunition.cc (copied) * code/trunk/src/orxonox/weaponsystem/ReplenishingMunition.h (copied) * code/trunk/src/orxonox/weaponsystem/Weapon.cc (modified) * code/trunk/src/orxonox/weaponsystem/Weapon.h (modified) * code/trunk/src/orxonox/weaponsystem/WeaponMode.cc (modified) * code/trunk/src/orxonox/weaponsystem/WeaponMode.h (modified) * code/trunk/src/orxonox/weaponsystem/WeaponPack.cc (modified) * code/trunk/src/orxonox/weaponsystem/WeaponPack.h (modified) * code/trunk/src/orxonox/weaponsystem/WeaponSystem.cc (modified) * code/trunk/src/orxonox/weaponsystem/WeaponSystem.h (modified) * code/trunk/src/orxonox/worldentities/Actionpoint.cc (copied) * code/trunk/src/orxonox/worldentities/Actionpoint.h (copied) * code/trunk/src/orxonox/worldentities/BigExplosion.cc (deleted) * code/trunk/src/orxonox/worldentities/BigExplosion.h (deleted) * code/trunk/src/orxonox/worldentities/CMakeLists.txt (modified) * code/trunk/src/orxonox/worldentities/ExplosionPart.cc (copied) * code/trunk/src/orxonox/worldentities/ExplosionPart.h (copied) * code/trunk/src/orxonox/worldentities/MobileEntity.h (modified) * code/trunk/src/orxonox/worldentities/SpawnPoint.h (modified) * code/trunk/src/orxonox/worldentities/StaticEntity.h (modified) * code/trunk/src/orxonox/worldentities/TeamSpawnPoint.cc (modified) * code/trunk/src/orxonox/worldentities/TeamSpawnPoint.h (modified) * code/trunk/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/Pawn.h (modified) * code/trunk/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/SpaceShip.h (modified) * code/trunk/test/core/class/IdentifierNestedClassHierarchyTest.cc (modified) * code/trunk/test/util/MathTest.cc (modified) merged branch presentationHS15 back to trunk 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 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, 31 Oct 2015 10:06:37 GMT landauf [10727] * code/trunk/src/libraries/tools/Shader.cc (modified) * code/trunk/src/libraries/tools/Shader.h (modified) * code/trunk/src/modules/pong/PongAI.cc (modified) * code/trunk/src/modules/towerdefense/TowerDefense.cc (modified) * code/trunk/src/modules/towerdefense/TowerDefenseTower.cc (modified) * code/trunk/src/modules/weapons/projectiles/SplitGunProjectile.cc (modified) * code/trunk/src/orxonox/Scene.cc (modified) fixed warnings with MSVC14 Sat, 10 Oct 2015 17:55:21 GMT fvultier [10632] * code/trunk/src/modules/jump/JumpPlatform.cc (modified) * code/trunk/src/modules/jump/JumpPlatform.h (modified) Removed useless code (artifacts from copy-paste) in the Jump minigame. Sat, 10 Oct 2015 14:34:26 GMT fvultier [10629] * code/trunk/data/levels/emptyLevel.oxw (modified) * code/trunk/data/levels/includes/weaponSettingsRing.oxi (modified) * code/trunk/data/levels/includes/weaponSettingsSwallow.oxi (modified) * code/trunk/data/levels/jump.oxw (modified) * code/trunk/data/levels/templates/enemytowerdefense.oxt (deleted) * code/trunk/data/levels/towerDefense.oxw (modified) * code/trunk/src/modules/towerdefense/CMakeLists.txt (modified) * code/trunk/src/modules/towerdefense/TDCoordinate.cc (modified) * code/trunk/src/modules/towerdefense/TDCoordinate.h (modified) * code/trunk/src/modules/towerdefense/TDEnemy.h (deleted) * code/trunk/src/modules/towerdefense/TowerDefense.cc (modified) * code/trunk/src/modules/towerdefense/TowerDefense.h (modified) * code/trunk/src/modules/towerdefense/TowerDefenseCenterpoint.cc (modified) * code/trunk/src/modules/towerdefense/TowerDefenseCenterpoint.h (modified) * code/trunk/src/modules/towerdefense/TowerDefenseController.cc (deleted) * code/trunk/src/modules/towerdefense/TowerDefenseController.h (deleted) * code/trunk/src/modules/towerdefense/TowerDefenseEnemy.cc (modified) * code/trunk/src/modules/towerdefense/TowerDefenseEnemy.h (modified) * code/trunk/src/modules/towerdefense/TowerDefenseField.cc (added) * code/trunk/src/modules/towerdefense/TowerDefenseField.h (added) * code/trunk/src/modules/towerdefense/TowerDefenseHUDController.cc (modified) * code/trunk/src/modules/towerdefense/TowerDefenseSelecter.cc (modified) * code/trunk/src/modules/towerdefense/TowerDefenseSelecter.h (modified) * code/trunk/src/modules/towerdefense/TowerDefenseTower.cc (modified) * code/trunk/src/modules/towerdefense/TowerDefenseTower.h (modified) * code/trunk/src/modules/weapons/CMakeLists.txt (modified) * code/trunk/src/modules/weapons/IceGunFreezer.cc (added) * code/trunk/src/modules/weapons/IceGunFreezer.h (added) * code/trunk/src/modules/weapons/munitions/CMakeLists.txt (modified) * code/trunk/src/modules/weapons/munitions/IceMunition.cc (added) * code/trunk/src/modules/weapons/munitions/IceMunition.h (added) * code/trunk/src/modules/weapons/munitions/SplitMunition.cc (added) * code/trunk/src/modules/weapons/munitions/SplitMunition.h (added) * code/trunk/src/modules/weapons/projectiles/BillboardProjectile.cc (modified) * code/trunk/src/modules/weapons/projectiles/BillboardProjectile.h (modified) * code/trunk/src/modules/weapons/projectiles/CMakeLists.txt (modified) * code/trunk/src/modules/weapons/projectiles/IceGunProjectile.cc (added) * code/trunk/src/modules/weapons/projectiles/IceGunProjectile.h (added) * code/trunk/src/modules/weapons/projectiles/Projectile.cc (modified) * code/trunk/src/modules/weapons/projectiles/Projectile.h (modified) * code/trunk/src/modules/weapons/projectiles/SplitGunProjectile.cc (added) * code/trunk/src/modules/weapons/projectiles/SplitGunProjectile.h (added) * code/trunk/src/modules/weapons/weaponmodes/CMakeLists.txt (modified) * code/trunk/src/modules/weapons/weaponmodes/IceGun.cc (added) * code/trunk/src/modules/weapons/weaponmodes/IceGun.h (added) * code/trunk/src/modules/weapons/weaponmodes/SplitGun.cc (added) * code/trunk/src/modules/weapons/weaponmodes/SplitGun.h (added) Merged towerdefenseFabien branch back to trunk. The towerdefense ... Sat, 10 Oct 2015 09:40:59 GMT landauf [10628] * code/trunk/src/modules/invader/InvaderEnemyShooter.cc (modified) * code/trunk/src/modules/towerdefense/TowerDefenseEnemy.cc (modified) addendum to r10626 -> pass the collision shape to Pawn::damage Mon, 05 Oct 2015 13:34:47 GMT zifloria [10626] * code/trunk/src/modules/invader/InvaderEnemyShooter.cc (modified) * code/trunk/src/modules/invader/InvaderEnemyShooter.h (modified) * code/trunk/src/modules/towerdefense/TowerDefenseEnemy.cc (modified) * code/trunk/src/modules/towerdefense/TowerDefenseEnemy.h (modified) Fixed more of the same bug. Tower defense was also affected Mon, 05 Oct 2015 13:28:39 GMT zifloria [10625] * code/trunk/src/modules/invader/InvaderEnemy.cc (modified) * code/trunk/src/modules/invader/InvaderEnemy.h (modified) Fixed OrxonoxArcade. Points are awarded again. The problem was that I ... Sun, 04 Oct 2015 19:12:21 GMT landauf [10624] * code/trunk (modified) * code/trunk/CMakeLists.txt (modified) * code/trunk/cmake/InstallConfig.cmake (modified) * code/trunk/cmake/tools/FindVLD.cmake (modified) * code/trunk/cmake/tools/TargetUtilities.cmake (modified) * code/trunk/data/levels/4Dtest.oxw (modified) * code/trunk/data/levels/DodgeRace.oxw (modified) * code/trunk/data/levels/Invaders.oxw (modified) * code/trunk/data/levels/Spacerace2.oxw (modified) * code/trunk/data/levels/SurfaceRacePresentation.oxw (modified) * code/trunk/data/levels/jump.oxw (modified) * code/trunk/data/levels/pong.oxw (modified) * code/trunk/data/levels/presentationHS12.oxw (modified) * code/trunk/data/levels/spaceRace.oxw (modified) * code/trunk/data/levels/surfaceRace.oxw (modified) * code/trunk/data/levels/tetris.oxw (modified) * code/trunk/data/levels/towerDefense.oxw (modified) * code/trunk/src/CMakeLists.txt (modified) * code/trunk/src/SpecialConfig.h.in (modified) * code/trunk/src/libraries/core/ApplicationPaths.cc (copied) * code/trunk/src/libraries/core/ApplicationPaths.h (copied) * code/trunk/src/libraries/core/BaseObject.cc (modified) * code/trunk/src/libraries/core/BaseObject.h (modified) * code/trunk/src/libraries/core/CMakeLists.txt (modified) * code/trunk/src/libraries/core/ClassTreeMask.cc (modified) * code/trunk/src/libraries/core/ConfigurablePaths.cc (copied) * code/trunk/src/libraries/core/ConfigurablePaths.h (copied) * code/trunk/src/libraries/core/Core.cc (modified) * code/trunk/src/libraries/core/Core.h (modified) * code/trunk/src/libraries/core/CoreConfig.cc (copied) * code/trunk/src/libraries/core/CoreConfig.h (copied) * code/trunk/src/libraries/core/CoreIncludes.h (modified) * code/trunk/src/libraries/core/CorePrereqs.h (modified) * code/trunk/src/libraries/core/CoreStaticInitializationHandler.cc (copied) * code/trunk/src/libraries/core/CoreStaticInitializationHandler.h (copied) * code/trunk/src/libraries/core/DynLib.cc (deleted) * code/trunk/src/libraries/core/DynLib.h (deleted) * code/trunk/src/libraries/core/DynLibManager.cc (deleted) * code/trunk/src/libraries/core/DynLibManager.h (deleted) * code/trunk/src/libraries/core/GUIManager.cc (modified) * code/trunk/src/libraries/core/Game.cc (modified) * code/trunk/src/libraries/core/Game.h (modified) * code/trunk/src/libraries/core/GameConfig.cc (copied) * code/trunk/src/libraries/core/GameConfig.h (copied) * code/trunk/src/libraries/core/GraphicsManager.cc (modified) * code/trunk/src/libraries/core/GraphicsManager.h (modified) * code/trunk/src/libraries/core/Language.cc (modified) * code/trunk/src/libraries/core/Language.h (modified) * code/trunk/src/libraries/core/Loader.cc (modified) * code/trunk/src/libraries/core/Loader.h (modified) * code/trunk/src/libraries/core/Namespace.cc (modified) * code/trunk/src/libraries/core/PathConfig.cc (deleted) * code/trunk/src/libraries/core/PathConfig.h (deleted) * code/trunk/src/libraries/core/UpdateListener.cc (copied) * code/trunk/src/libraries/core/UpdateListener.h (copied) * code/trunk/src/libraries/core/ViewportEventListener.cc (modified) * code/trunk/src/libraries/core/WindowEventListener.cc (modified) * code/trunk/src/libraries/core/XMLNameListener.cc (modified) * code/trunk/src/libraries/core/XMLPort.cc (modified) * code/trunk/src/libraries/core/class/Identifiable.cc (modified) * code/trunk/src/libraries/core/class/Identifier.cc (modified) * code/trunk/src/libraries/core/class/Identifier.h (modified) * code/trunk/src/libraries/core/class/IdentifierManager.cc (modified) * code/trunk/src/libraries/core/class/IdentifierManager.h (modified) * code/trunk/src/libraries/core/class/OrxonoxInterface.cc (modified) * code/trunk/src/libraries/core/class/Super.h (modified) * code/trunk/src/libraries/core/command/ArgumentCompletionFunctions.cc (modified) * code/trunk/src/libraries/core/command/CMakeLists.txt (modified) * code/trunk/src/libraries/core/command/CommandEvaluation.cc (modified) * code/trunk/src/libraries/core/command/CommandExecutor.cc (modified) * code/trunk/src/libraries/core/command/ConsoleCommand.cc (modified) * code/trunk/src/libraries/core/command/ConsoleCommand.h (modified) * code/trunk/src/libraries/core/command/ConsoleCommandCompilation.cc (modified) * code/trunk/src/libraries/core/command/ConsoleCommandIncludes.cc (copied) * code/trunk/src/libraries/core/command/ConsoleCommandIncludes.h (copied) * code/trunk/src/libraries/core/command/ConsoleCommandManager.cc (copied) * code/trunk/src/libraries/core/command/ConsoleCommandManager.h (copied) * code/trunk/src/libraries/core/command/IRC.cc (modified) * code/trunk/src/libraries/core/command/Shell.cc (modified) * code/trunk/src/libraries/core/command/Shell.h (modified) * code/trunk/src/libraries/core/command/TclBind.cc (modified) * code/trunk/src/libraries/core/command/TclThreadManager.cc (modified) * code/trunk/src/libraries/core/commandline (copied) * code/trunk/src/libraries/core/config/CMakeLists.txt (modified) * code/trunk/src/libraries/core/config/CommandLineParser.cc (deleted) * code/trunk/src/libraries/core/config/CommandLineParser.h (deleted) * code/trunk/src/libraries/core/config/ConfigFile.cc (modified) * code/trunk/src/libraries/core/config/Configurable.cc (modified) * code/trunk/src/libraries/core/config/SettingsConfigFile.cc (modified) * code/trunk/src/libraries/core/input/InputManager.cc (modified) * code/trunk/src/libraries/core/input/JoyStick.cc (modified) * code/trunk/src/libraries/core/input/JoyStickQuantityListener.cc (modified) * code/trunk/src/libraries/core/input/KeyBinder.cc (modified) * code/trunk/src/libraries/core/input/KeyBinderManager.cc (modified) * code/trunk/src/libraries/core/input/KeyDetector.cc (modified) * code/trunk/src/libraries/core/input/Mouse.cc (modified) * code/trunk/src/libraries/core/module (copied) * code/trunk/src/libraries/core/object/CMakeLists.txt (modified) * code/trunk/src/libraries/core/object/Context.cc (modified) * code/trunk/src/libraries/core/object/Context.h (modified) * code/trunk/src/libraries/core/object/DestroyLaterManager.cc (copied) * code/trunk/src/libraries/core/object/DestroyLaterManager.h (copied) * code/trunk/src/libraries/core/object/Destroyable.cc (modified) * code/trunk/src/libraries/core/object/Destroyable.h (modified) * code/trunk/src/libraries/core/object/Iterator.h (modified) * code/trunk/src/libraries/core/object/IteratorBase.h (modified) * code/trunk/src/libraries/core/object/Listable.cc (modified) * code/trunk/src/libraries/core/object/ObjectList.h (modified) * code/trunk/src/libraries/core/object/ObjectListIterator.h (modified) * code/trunk/src/libraries/core/object/SmartPtr.h (deleted) * code/trunk/src/libraries/core/object/StrongPtr.h (copied) * code/trunk/src/libraries/core/object/WeakPtr.h (modified) * code/trunk/src/libraries/core/singleton (copied) * code/trunk/src/libraries/network/CMakeLists.txt (modified) * code/trunk/src/libraries/network/Client.cc (modified) * code/trunk/src/libraries/network/ClientConnectionListener.cc (modified) * code/trunk/src/libraries/network/FunctionCall.cc (modified) * code/trunk/src/libraries/network/FunctionCall.h (modified) * code/trunk/src/libraries/network/FunctionCallManager.cc (modified) * code/trunk/src/libraries/network/FunctionCallManager.h (modified) * code/trunk/src/libraries/network/Host.cc (modified) * code/trunk/src/libraries/network/LANDiscovery.cc (modified) * code/trunk/src/libraries/network/MasterServer.cc (modified) * code/trunk/src/libraries/network/NetworkFunction.cc (modified) * code/trunk/src/libraries/network/NetworkFunction.h (modified) * code/trunk/src/libraries/network/NetworkFunctionIncludes.cc (copied) * code/trunk/src/libraries/network/NetworkFunctionIncludes.h (copied) * code/trunk/src/libraries/network/NetworkFunctionManager.cc (copied) * code/trunk/src/libraries/network/NetworkFunctionManager.h (copied) * code/trunk/src/libraries/network/NetworkPrereqs.h (modified) * code/trunk/src/libraries/network/NetworkStaticInitializationHandler.cc (copied) * code/trunk/src/libraries/network/NetworkStaticInitializationHandler.h (copied) * code/trunk/src/libraries/network/WANDiscoverable.cc (modified) * code/trunk/src/libraries/network/WANDiscovery.cc (modified) * code/trunk/src/libraries/network/packet/FunctionCalls.cc (modified) * code/trunk/src/libraries/network/packet/FunctionCalls.h (modified) * code/trunk/src/libraries/network/packet/FunctionIDs.cc (modified) * code/trunk/src/libraries/network/synchronisable/CMakeLists.txt (modified) * code/trunk/src/libraries/network/synchronisable/Serialise.h (modified) * code/trunk/src/libraries/network/synchronisable/Synchronisable.cc (modified) * code/trunk/src/libraries/network/synchronisable/SynchronisableVariable.cc (deleted) * code/trunk/src/libraries/network/synchronisable/SynchronisableVariable.h (modified) * code/trunk/src/libraries/tools/ParticleInterface.cc (modified) * code/trunk/src/libraries/tools/ParticleInterface.h (modified) * code/trunk/src/libraries/tools/ResourceLocation.cc (modified) * code/trunk/src/libraries/tools/Timer.cc (modified) * code/trunk/src/libraries/tools/interfaces/ToolsInterfaceCompilation.cc (modified) * code/trunk/src/libraries/util/CMakeLists.txt (modified) * code/trunk/src/libraries/util/Scope.cc (deleted) * code/trunk/src/libraries/util/Scope.h (deleted) * code/trunk/src/libraries/util/ScopedSingletonManager.cc (deleted) * code/trunk/src/libraries/util/ScopedSingletonManager.h (deleted) * code/trunk/src/libraries/util/SharedPtr.h (modified) * code/trunk/src/libraries/util/Singleton.h (modified) * code/trunk/src/libraries/util/UtilPrereqs.h (modified) * code/trunk/src/libraries/util/output/OutputDefinitions.h (modified) * code/trunk/src/modules/designtools/ScreenshotManager.cc (modified) * code/trunk/src/modules/designtools/SkyboxGenerator.cc (modified) * code/trunk/src/modules/docking/Dock.cc (modified) * code/trunk/src/modules/docking/DockingAnimation.cc (modified) * code/trunk/src/modules/docking/DockingEffect.cc (modified) * code/trunk/src/modules/dodgerace/CMakeLists.txt (modified) * code/trunk/src/modules/dodgerace/DodgeRace.cc (modified) * code/trunk/src/modules/dodgerace/DodgeRace.h (modified) * code/trunk/src/modules/dodgerace/DodgeRaceCenterPoint.cc (modified) * code/trunk/src/modules/dodgerace/DodgeRaceCenterPoint.h (modified) * code/trunk/src/modules/dodgerace/DodgeRaceCube.cc (modified) * code/trunk/src/modules/dodgerace/DodgeRaceHUDinfo.cc (modified) * code/trunk/src/modules/dodgerace/DodgeRaceShip.cc (modified) * code/trunk/src/modules/dodgerace/DodgeRaceShip.h (modified) * code/trunk/src/modules/gametypes/CMakeLists.txt (modified) * code/trunk/src/modules/gametypes/OldRaceCheckPoint.cc (modified) * code/trunk/src/modules/gametypes/SpaceRaceManager.cc (modified) * code/trunk/src/modules/invader/CMakeLists.txt (modified) * code/trunk/src/modules/invader/Invader.cc (modified) * code/trunk/src/modules/invader/Invader.h (modified) * code/trunk/src/modules/invader/InvaderCenterPoint.cc (modified) * code/trunk/src/modules/invader/InvaderCenterPoint.h (modified) * code/trunk/src/modules/invader/InvaderEnemy.cc (modified) * code/trunk/src/modules/invader/InvaderEnemy.h (modified) * code/trunk/src/modules/invader/InvaderHUDinfo.cc (modified) * code/trunk/src/modules/invader/InvaderShip.cc (modified) * code/trunk/src/modules/invader/InvaderShip.h (modified) * code/trunk/src/modules/invader/InvaderWeapon.cc (modified) * code/trunk/src/modules/jump/CMakeLists.txt (modified) * code/trunk/src/modules/jump/JumpCenterpoint.cc (modified) * code/trunk/src/modules/jump/JumpCenterpoint.h (modified) * code/trunk/src/modules/jump/JumpEnemy.cc (modified) * code/trunk/src/modules/jump/JumpEnemy.h (modified) * code/trunk/src/modules/jump/JumpItem.cc (modified) * code/trunk/src/modules/jump/JumpItem.h (modified) * code/trunk/src/modules/jump/JumpPlatform.cc (modified) * code/trunk/src/modules/jump/JumpPlatform.h (modified) * code/trunk/src/modules/jump/JumpProjectile.cc (modified) * code/trunk/src/modules/jump/JumpProjectile.h (modified) * code/trunk/src/modules/jump/JumpScore.cc (modified) * code/trunk/src/modules/mini4dgame/CMakeLists.txt (modified) * code/trunk/src/modules/mini4dgame/Mini4Dgame.cc (modified) * code/trunk/src/modules/mini4dgame/Mini4DgameBoard.cc (modified) * code/trunk/src/modules/mini4dgame/Mini4DgameBoard.h (modified) * code/trunk/src/modules/notifications/NotificationDispatcher.cc (modified) * code/trunk/src/modules/notifications/NotificationManager.cc (modified) * code/trunk/src/modules/objects/Planet.cc (modified) * code/trunk/src/modules/objects/Planet.h (modified) * code/trunk/src/modules/objects/Script.cc (modified) * code/trunk/src/modules/objects/SpaceBoundaries.cc (modified) * code/trunk/src/modules/objects/collisionshapes/AbstractRadiusHeightCollisionShape.cc (modified) * code/trunk/src/modules/objects/collisionshapes/BoxCollisionShape.cc (modified) * code/trunk/src/modules/objects/collisionshapes/BoxCollisionShape.h (modified) * code/trunk/src/modules/objects/collisionshapes/ConeCollisionShape.cc (modified) * code/trunk/src/modules/objects/collisionshapes/ConeCollisionShape.h (modified) * code/trunk/src/modules/objects/collisionshapes/CylinderCollisionShape.cc (modified) * code/trunk/src/modules/objects/collisionshapes/CylinderCollisionShape.h (modified) * code/trunk/src/modules/objects/collisionshapes/PlaneCollisionShape.cc (modified) * code/trunk/src/modules/objects/collisionshapes/PlaneCollisionShape.h (modified) * code/trunk/src/modules/objects/collisionshapes/SphereCollisionShape.cc (modified) * code/trunk/src/modules/objects/collisionshapes/SphereCollisionShape.h (modified) * code/trunk/src/modules/objects/triggers/CheckPoint.cc (modified) * code/trunk/src/modules/objects/triggers/DistanceMultiTrigger.cc (modified) * code/trunk/src/modules/objects/triggers/DistanceMultiTrigger.h (modified) * code/trunk/src/modules/objects/triggers/DistanceTrigger.cc (modified) * code/trunk/src/modules/objects/triggers/Trigger.cc (modified) * code/trunk/src/modules/overlays/hud/HUDHealthBar.h (modified) * code/trunk/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/trunk/src/modules/overlays/hud/LastManStandingInfos.cc (modified) * code/trunk/src/modules/overlays/hud/LastTeamStandingInfos.cc (modified) * code/trunk/src/modules/overlays/hud/TeamBaseMatchScore.cc (modified) * code/trunk/src/modules/pickup/CollectiblePickup.cc (modified) * code/trunk/src/modules/pickup/PickupManager.cc (modified) * code/trunk/src/modules/pickup/PickupManager.h (modified) * code/trunk/src/modules/pickup/PickupSpawner.cc (modified) * code/trunk/src/modules/pickup/items/ShrinkPickup.cc (modified) * code/trunk/src/modules/pong/CMakeLists.txt (modified) * code/trunk/src/modules/pong/PongCenterpoint.cc (modified) * code/trunk/src/modules/pong/PongCenterpoint.h (modified) * code/trunk/src/modules/pong/PongScore.cc (modified) * code/trunk/src/modules/questsystem/Quest.cc (modified) * code/trunk/src/modules/questsystem/QuestEffect.cc (modified) * code/trunk/src/modules/questsystem/QuestManager.cc (modified) * code/trunk/src/modules/questsystem/effects/ChangeQuestStatus.cc (modified) * code/trunk/src/modules/tetris/CMakeLists.txt (modified) * code/trunk/src/modules/tetris/Tetris.cc (modified) * code/trunk/src/modules/tetris/Tetris.h (modified) * code/trunk/src/modules/tetris/TetrisBrick.cc (modified) * code/trunk/src/modules/tetris/TetrisCenterpoint.cc (modified) * code/trunk/src/modules/tetris/TetrisCenterpoint.h (modified) * code/trunk/src/modules/tetris/TetrisScore.cc (modified) * code/trunk/src/modules/towerdefense/CMakeLists.txt (modified) * code/trunk/src/modules/towerdefense/TDCoordinate.h (modified) * code/trunk/src/modules/towerdefense/TowerDefense.cc (modified) * code/trunk/src/modules/towerdefense/TowerDefenseCenterpoint.cc (modified) * code/trunk/src/modules/towerdefense/TowerDefenseCenterpoint.h (modified) * code/trunk/src/modules/towerdefense/TowerDefenseEnemy.cc (modified) * code/trunk/src/modules/towerdefense/TowerDefenseEnemy.h (modified) * code/trunk/src/modules/towerdefense/TowerDefenseHUDController.cc (modified) * code/trunk/src/modules/weapons/projectiles/ParticleProjectile.cc (modified) * code/trunk/src/orxonox/CMakeLists.txt (modified) * code/trunk/src/orxonox/CameraManager.cc (modified) * code/trunk/src/orxonox/Level.cc (modified) * code/trunk/src/orxonox/Level.h (modified) * code/trunk/src/orxonox/LevelManager.cc (modified) * code/trunk/src/orxonox/Main.cc (modified) * code/trunk/src/orxonox/MoodManager.cc (modified) * code/trunk/src/orxonox/OrxonoxPrereqs.h (modified) * code/trunk/src/orxonox/PawnManager.cc (deleted) * code/trunk/src/orxonox/PawnManager.h (deleted) * code/trunk/src/orxonox/PlayerManager.cc (modified) * code/trunk/src/orxonox/Radar.cc (modified) * code/trunk/src/orxonox/Scene.cc (modified) * code/trunk/src/orxonox/Scene.h (modified) * code/trunk/src/orxonox/ShipPartManager.cc (deleted) * code/trunk/src/orxonox/ShipPartManager.h (deleted) * code/trunk/src/orxonox/Test.cc (modified) * code/trunk/src/orxonox/chat/ChatHistory.cc (modified) * code/trunk/src/orxonox/chat/ChatHistory.h (modified) * code/trunk/src/orxonox/chat/ChatInputHandler.cc (modified) * code/trunk/src/orxonox/chat/ChatManager.cc (modified) * code/trunk/src/orxonox/collisionshapes/CollisionShape.cc (modified) * code/trunk/src/orxonox/collisionshapes/CompoundCollisionShape.cc (modified) * code/trunk/src/orxonox/collisionshapes/WorldEntityCollisionShape.cc (modified) * code/trunk/src/orxonox/collisionshapes/WorldEntityCollisionShape.h (modified) * code/trunk/src/orxonox/controllers/ArtificialController.cc (modified) * code/trunk/src/orxonox/controllers/FormationController.cc (modified) * code/trunk/src/orxonox/controllers/HumanController.cc (modified) * code/trunk/src/orxonox/controllers/HumanController.h (modified) * code/trunk/src/orxonox/controllers/NewHumanController.cc (modified) * code/trunk/src/orxonox/gamestates/GSClient.cc (modified) * code/trunk/src/orxonox/gamestates/GSLevel.cc (modified) * code/trunk/src/orxonox/gamestates/GSLevel.h (modified) * code/trunk/src/orxonox/gamestates/GSMainMenu.cc (modified) * code/trunk/src/orxonox/gamestates/GSRoot.cc (modified) * code/trunk/src/orxonox/gamestates/GSServer.cc (modified) * code/trunk/src/orxonox/gametypes/Dynamicmatch.cc (modified) * code/trunk/src/orxonox/gametypes/Dynamicmatch.h (modified) * code/trunk/src/orxonox/gametypes/Gametype.cc (modified) * code/trunk/src/orxonox/gametypes/Gametype.h (modified) * code/trunk/src/orxonox/gametypes/Mission.cc (modified) * code/trunk/src/orxonox/infos/GametypeInfo.cc (modified) * code/trunk/src/orxonox/infos/HumanPlayer.cc (modified) * code/trunk/src/orxonox/infos/HumanPlayer.h (modified) * code/trunk/src/orxonox/infos/PlayerInfo.cc (modified) * code/trunk/src/orxonox/infos/PlayerInfo.h (modified) * code/trunk/src/orxonox/interfaces/InterfaceCompilation.cc (modified) * code/trunk/src/orxonox/interfaces/NotificationListener.cc (modified) * code/trunk/src/orxonox/interfaces/PickupCarrier.cc (modified) * code/trunk/src/orxonox/interfaces/PickupListener.cc (modified) * code/trunk/src/orxonox/interfaces/Pickupable.cc (modified) * code/trunk/src/orxonox/interfaces/Pickupable.h (modified) * code/trunk/src/orxonox/interfaces/PlayerTrigger.h (modified) * code/trunk/src/orxonox/interfaces/RadarViewable.cc (modified) * code/trunk/src/orxonox/interfaces/RadarViewable.h (modified) * code/trunk/src/orxonox/items/ShipPart.cc (modified) * code/trunk/src/orxonox/items/ShipPart.h (modified) * code/trunk/src/orxonox/overlays/InGameConsole.cc (modified) * code/trunk/src/orxonox/overlays/InGameConsole.h (modified) * code/trunk/src/orxonox/overlays/OrxonoxOverlay.cc (modified) * code/trunk/src/orxonox/overlays/OverlayGroup.cc (modified) * code/trunk/src/orxonox/overlays/OverlayGroup.h (modified) * code/trunk/src/orxonox/sound/AmbientSound.cc (modified) * code/trunk/src/orxonox/sound/BaseSound.cc (modified) * code/trunk/src/orxonox/sound/SoundBuffer.h (modified) * code/trunk/src/orxonox/sound/SoundManager.cc (modified) * code/trunk/src/orxonox/sound/SoundManager.h (modified) * code/trunk/src/orxonox/sound/WorldAmbientSound.cc (modified) * code/trunk/src/orxonox/weaponsystem/WeaponMode.cc (modified) * code/trunk/src/orxonox/worldentities/ControllableEntity.cc (modified) * code/trunk/src/orxonox/worldentities/ControllableEntity.h (modified) * code/trunk/src/orxonox/worldentities/WorldEntity.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/Destroyer.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/ModularSpaceShip.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/Spectator.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/TeamBaseMatchBase.cc (modified) * code/trunk/test/core/CMakeLists.txt (modified) * code/trunk/test/core/class/IdentifiableTest.cc (modified) * code/trunk/test/core/class/IdentifierClassHierarchyTest.cc (modified) * code/trunk/test/core/class/IdentifierExternalClassHierarchyTest.cc (modified) * code/trunk/test/core/class/IdentifierNestedClassHierarchyTest.cc (copied) * code/trunk/test/core/class/IdentifierSimpleClassHierarchyTest.cc (modified) * code/trunk/test/core/class/IdentifierTest.cc (modified) * code/trunk/test/core/class/OrxonoxClassTest.cc (modified) * code/trunk/test/core/class/OrxonoxInterfaceTest.cc (modified) * code/trunk/test/core/class/SubclassIdentifierTest.cc (modified) * code/trunk/test/core/class/SuperTest.cc (modified) * code/trunk/test/core/command/CommandTest.cc (modified) * code/trunk/test/core/object/ClassFactoryTest.cc (modified) * code/trunk/test/core/object/ContextTest.cc (modified) * code/trunk/test/core/object/IteratorTest.cc (modified) * code/trunk/test/core/object/ListableTest.cc (modified) * code/trunk/test/core/object/ObjectListIteratorTest.cc (modified) * code/trunk/test/core/object/SmartPtrTest.cc (deleted) * code/trunk/test/core/object/StrongPtrTest.cc (copied) * code/trunk/test/core/object/WeakPtrTest.cc (modified) * code/trunk/test/core/singleton (copied) * code/trunk/test/util/CMakeLists.txt (modified) * code/trunk/test/util/ScopeTest.cc (deleted) * code/trunk/test/util/output/ConsoleWriterTest.cc (modified) * code/trunk/test/util/output/LogWriterTest.cc (modified) * code/trunk/test/util/output/MemoryWriterTest.cc (modified) * code/trunk/test/util/output/OutputManagerTest.cc (modified) merged branch core7 back to trunk Sun, 04 Oct 2015 13:45:56 GMT landauf [10622] * code/trunk (modified) * code/trunk/data/defaultConfig/keybindings.ini (modified) * code/trunk/data/gui/scripts/MultiplayerMenu.lua (modified) * code/trunk/data/gui/scripts/presentation.lua (copied) * code/trunk/data/gui/scripts/testscript.lua (modified) * code/trunk/data/levels/clangenb.oxw (copied) * code/trunk/data/levels/includes/weaponSettingsAssff.oxi (modified) * code/trunk/data/levels/includes/weaponSettingsFS15.oxi (copied) * code/trunk/data/levels/includes/weaponSettingsHeartAttack.oxi (copied) * code/trunk/data/levels/includes/weaponSettingsRing.oxi (copied) * code/trunk/data/levels/presentationFS15.oxw (copied) * code/trunk/data/levels/scriptController.oxw (modified) * code/trunk/data/levels/simone.oxw (copied) * code/trunk/data/levels/templates/enemytowerdefense.oxt (modified) * code/trunk/data/levels/templates/orbStation.oxt (copied) * code/trunk/data/levels/templates/spaceshipFS15.oxt (copied) * code/trunk/data/levels/templates/spaceshipHeartAttack.oxt (copied) * code/trunk/data/levels/templates/spaceshipRing.oxt (copied) * code/trunk/data/levels/templates/tower.oxt (deleted) * code/trunk/data/levels/templates/towerdefensetower.oxt (copied) * code/trunk/data/levels/towerDefense.oxw (modified) * code/trunk/data/particle/FieldExplosion.particle (copied) * code/trunk/data/particle/GravityBombField.particle (copied) * code/trunk/data/particle/orxonox_explosionAfterglow.particle (copied) * code/trunk/data/particle/orxonox_explosionFlame.particle (copied) * code/trunk/data/particle/orxonox_explosionFlame2.particle (copied) * code/trunk/data/particle/orxonox_explosionFlash.particle (copied) * code/trunk/data/particle/orxonox_explosionFlash2.particle (copied) * code/trunk/data/particle/orxonox_explosionShockwave.particle (copied) * code/trunk/data/particle/orxonox_explosionShockwave2.particle (copied) * code/trunk/data/particle/orxonox_explosionSparks.particle (copied) * code/trunk/data/particle/orxonox_explosionSparks2.particle (copied) * code/trunk/data/particle/orxonox_explosionStreak1.particle (copied) * code/trunk/data/particle/orxonox_explosionStreak2.particle (copied) * code/trunk/src/libraries/network/GamestateManager.h (modified) * code/trunk/src/libraries/network/LANDiscoverable.cc (modified) * code/trunk/src/libraries/network/LANDiscoverable.h (modified) * code/trunk/src/libraries/network/LANDiscovery.cc (modified) * code/trunk/src/libraries/network/LANDiscovery.h (modified) * code/trunk/src/libraries/network/MasterServer.cc (modified) * code/trunk/src/libraries/network/MasterServer.h (modified) * code/trunk/src/libraries/network/MasterServerProtocol.h (modified) * code/trunk/src/libraries/network/PeerList.cc (modified) * code/trunk/src/libraries/network/PeerList.h (modified) * code/trunk/src/libraries/network/Server.cc (modified) * code/trunk/src/libraries/network/Server.h (modified) * code/trunk/src/libraries/network/ServerList.cc (modified) * code/trunk/src/libraries/network/ServerList.h (modified) * code/trunk/src/libraries/network/WANDiscoverable.cc (modified) * code/trunk/src/libraries/network/WANDiscoverable.h (modified) * code/trunk/src/libraries/network/WANDiscovery.cc (modified) * code/trunk/src/libraries/network/WANDiscovery.h (modified) * code/trunk/src/libraries/network/packet/ServerInformation.cc (modified) * code/trunk/src/libraries/network/packet/ServerInformation.h (modified) * code/trunk/src/modules/objects/ForceField.h (modified) * code/trunk/src/modules/objects/Turret.cc (modified) * code/trunk/src/modules/objects/Turret.h (modified) * code/trunk/src/modules/objects/controllers/TurretController.cc (modified) * code/trunk/src/modules/tetris/Tetris.h (modified) * code/trunk/src/modules/towerdefense/CMakeLists.txt (modified) * code/trunk/src/modules/towerdefense/TDCoordinate.cc (modified) * code/trunk/src/modules/towerdefense/TDCoordinate.h (modified) * code/trunk/src/modules/towerdefense/Tower.cc (deleted) * code/trunk/src/modules/towerdefense/Tower.h (deleted) * code/trunk/src/modules/towerdefense/TowerDefense.cc (modified) * code/trunk/src/modules/towerdefense/TowerDefense.h (modified) * code/trunk/src/modules/towerdefense/TowerDefenseCenterpoint.cc (modified) * code/trunk/src/modules/towerdefense/TowerDefenseCenterpoint.h (modified) * code/trunk/src/modules/towerdefense/TowerDefenseEnemy.cc (modified) * code/trunk/src/modules/towerdefense/TowerDefenseSelecter.cc (copied) * code/trunk/src/modules/towerdefense/TowerDefenseSelecter.h (copied) * code/trunk/src/modules/towerdefense/TowerDefenseTower.cc (modified) * code/trunk/src/modules/towerdefense/TowerDefenseTower.h (modified) * code/trunk/src/modules/towerdefense/TowerTurret.cc (deleted) * code/trunk/src/modules/towerdefense/TowerTurret.h (deleted) * code/trunk/src/modules/weapons/WeaponsPrereqs.h (modified) * code/trunk/src/modules/weapons/munitions/CMakeLists.txt (modified) * code/trunk/src/modules/weapons/munitions/GravityBombMunition.cc (copied) * code/trunk/src/modules/weapons/munitions/GravityBombMunition.h (copied) * code/trunk/src/modules/weapons/projectiles/CMakeLists.txt (modified) * code/trunk/src/modules/weapons/projectiles/GravityBomb.cc (copied) * code/trunk/src/modules/weapons/projectiles/GravityBomb.h (copied) * code/trunk/src/modules/weapons/projectiles/GravityBombField.cc (copied) * code/trunk/src/modules/weapons/projectiles/GravityBombField.h (copied) * code/trunk/src/modules/weapons/projectiles/LightningGunProjectile.cc (modified) * code/trunk/src/modules/weapons/projectiles/Rocket.cc (modified) * code/trunk/src/modules/weapons/projectiles/RocketOld.cc (copied) * code/trunk/src/modules/weapons/projectiles/RocketOld.h (copied) * code/trunk/src/modules/weapons/weaponmodes/CMakeLists.txt (modified) * code/trunk/src/modules/weapons/weaponmodes/EnergyDrink.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/FusionFire.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/GravityBombFire.cc (copied) * code/trunk/src/modules/weapons/weaponmodes/GravityBombFire.h (copied) * code/trunk/src/modules/weapons/weaponmodes/LaserFire.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/RocketFireOld.cc (copied) * code/trunk/src/modules/weapons/weaponmodes/RocketFireOld.h (copied) * code/trunk/src/orxonox/controllers/ControllerDirector.cc (modified) * code/trunk/src/orxonox/controllers/ControllerDirector.h (modified) * code/trunk/src/orxonox/controllers/FormationController.cc (modified) * code/trunk/src/orxonox/controllers/ScriptController.cc (modified) * code/trunk/src/orxonox/controllers/ScriptController.h (modified) * code/trunk/src/orxonox/controllers/testscript.lua (modified) * code/trunk/src/orxonox/worldentities/pawns/Pawn.cc (modified) merged branch presentationFS15merge back to trunk Thu, 07 May 2015 22:17:03 GMT fvultier [10437] * code/trunk/src/modules/jump/JumpScore.cc (modified) * code/trunk/src/orxonox/worldentities/ControllableEntity.h (modified) * code/trunk/src/orxonox/worldentities/MobileEntity.h (modified) * code/trunk/src/orxonox/worldentities/StaticEntity.h (modified) * code/trunk/src/orxonox/worldentities/pawns/Pawn.h (modified) * code/trunk/src/orxonox/worldentities/pawns/SpaceShip.h (modified) Removed unnecessary output to console in kump minigame. Added a small ... Sun, 15 Mar 2015 16:27:57 GMT smerkli [10318] * code/trunk/src/modules/gametypes/SpaceRaceController.cc (modified) fixed destructor (during class hierarchy initialization) Mon, 02 Mar 2015 22:19:32 GMT landauf [10299] * code/trunk/src/modules/weapons/projectiles/SimpleRocket.cc (modified) * code/trunk/src/orxonox/gamestates/GSLevel.cc (modified) fixed crash in SimpleRocket (during level-unloading). improved debug ... Sun, 01 Mar 2015 21:06:17 GMT landauf [10296] * code/trunk/src/modules/weapons/weaponmodes/EnergyDrink.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/FusionFire.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/HsW01.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/LaserFire.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/LightningGun.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/RocketFire.cc (modified) don't add the pawn's velocity to the projectile's velocity. this ... Sun, 01 Mar 2015 20:59:28 GMT landauf [10294] * code/trunk/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/EnergyDrink.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/FusionFire.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/HsW01.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/LaserFire.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/LightningGun.cc (modified) * code/trunk/src/orxonox/controllers/ArtificialController.cc (modified) made projectiles slower (and all have the same speed now). makes it ... Sun, 01 Mar 2015 19:59:15 GMT landauf [10293] * code/trunk/src/modules/weapons/projectiles/BasicProjectile.cc (modified) * code/trunk/src/modules/weapons/projectiles/BasicProjectile.h (modified) avoid collisions between projectiles of a turret and the parent-pawn ... Sun, 01 Mar 2015 14:27:01 GMT landauf [10292] * code/trunk/data/overlays/HUD.oxo (modified) * code/trunk/data/overlays/HUDTemplates3.oxo (modified) * code/trunk/data/overlays/HUDTemplatesFPS.oxo (modified) * code/trunk/src/modules/overlays/hud/HUDNavigation.cc (modified) fixed text size in HUD (marker which shows the enemy's name). the ... Sun, 01 Mar 2015 14:08:45 GMT landauf [10291] * code/trunk/src/libraries/util/Math.cc (modified) * code/trunk/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/trunk/src/modules/overlays/hud/HUDNavigation.h (modified) simplified Math: temp is always positive, thus only solution1 is ... Sun, 01 Mar 2015 13:17:08 GMT landauf [10290] * code/trunk/src/modules/weapons/weaponmodes/HsW01.cc (modified) * code/trunk/src/orxonox/controllers/FormationController.cc (modified) details Sat, 28 Feb 2015 22:50:41 GMT landauf [10287] * code/trunk/src/modules/weapons/projectiles/BasicProjectile.cc (modified) * code/trunk/src/modules/weapons/projectiles/Projectile.cc (modified) use dynamic physics for projectiles. this seems to avoid 'tunneling' ... Thu, 26 Feb 2015 21:29:13 GMT landauf [10284] * code/trunk/src/modules/dodgerace/CMakeLists.txt (modified) * code/trunk/src/modules/dodgerace/DodgeRaceShip.h (modified) * code/trunk/src/modules/jump/CMakeLists.txt (modified) * code/trunk/src/modules/mini4dgame/CMakeLists.txt (modified) * code/trunk/src/modules/questsystem/CMakeLists.txt (modified) removed some unnecessary module dependencies Fri, 06 Feb 2015 22:30:26 GMT landauf [10262] * code/trunk/data/defaultConfig/orxonox.ini (modified) * code/trunk/data/gui/layouts/CampaignMenu.layout (modified) * code/trunk/data/gui/scripts/CampaignMenu.lua (modified) * code/trunk/data/gui/scripts/testscript.lua (modified) * code/trunk/data/levels/4Dtest.oxw (modified) * code/trunk/data/levels/AnihilationThreat.oxw (modified) * code/trunk/data/levels/DodgeRace.oxw (modified) * code/trunk/data/levels/FPS_Level_HS14.oxw (modified) * code/trunk/data/levels/ModularShipsTest0.oxw (modified) * code/trunk/data/levels/ModularShipsTest1.oxw (modified) * code/trunk/data/levels/collisionShapes.oxw (modified) * code/trunk/data/levels/includes/weaponSettingsFPS_HS14.oxi (modified) * code/trunk/data/levels/includes/weaponSettingsTurret1.oxi (modified) * code/trunk/data/levels/jump.oxw (modified) * code/trunk/data/levels/kecks.oxw (modified) * code/trunk/data/levels/levelTry.oxw (modified) * code/trunk/data/levels/michaelstestfile.lua (modified) * code/trunk/data/levels/scriptController.oxw (modified) * code/trunk/data/levels/templates/DodgeRacePattern.oxt (modified) * code/trunk/data/levels/templates/FPS_HS14.oxt (modified) * code/trunk/data/levels/templates/ModularSpaceShipTest.oxt (modified) * code/trunk/data/levels/templates/enemytowerdefense.oxt (modified) * code/trunk/data/levels/templates/spaceshipDodgeRace.oxt (modified) * code/trunk/data/levels/templates/spacestation_elements.oxt (modified) * code/trunk/data/levels/templates/ss_tube01.oxt (modified) * code/trunk/data/levels/templates/standardTurret.oxt (modified) * code/trunk/data/overlays/DodgeRaceHUD.oxo (modified) * code/trunk/data/overlays/jumpHUD.oxo (modified) * code/trunk/src/libraries/tools/BulletDebugDrawer.cc (modified) * code/trunk/src/libraries/tools/BulletDebugDrawer.h (modified) * code/trunk/src/libraries/tools/DebugDrawer.cc (modified) * code/trunk/src/libraries/tools/DebugDrawer.h (modified) * code/trunk/src/libraries/tools/IcoSphere.cc (modified) * code/trunk/src/libraries/tools/IcoSphere.h (modified) * code/trunk/src/libraries/tools/OgreBulletUtils.h (modified) * code/trunk/src/modules/gametypes/SpaceRaceBot.cc (modified) * code/trunk/src/modules/gametypes/SpaceRaceBot.h (modified) * code/trunk/src/modules/gametypes/SpaceRaceController.cc (modified) * code/trunk/src/modules/gametypes/SpaceRaceController.h (modified) * code/trunk/src/modules/jump/CMakeLists.txt (modified) * code/trunk/src/modules/jump/Jump.cc (modified) * code/trunk/src/modules/jump/Jump.h (modified) * code/trunk/src/modules/jump/JumpBoots.cc (modified) * code/trunk/src/modules/jump/JumpBoots.h (modified) * code/trunk/src/modules/jump/JumpCenterpoint.cc (modified) * code/trunk/src/modules/jump/JumpCenterpoint.h (modified) * code/trunk/src/modules/jump/JumpEnemy.cc (modified) * code/trunk/src/modules/jump/JumpEnemy.h (modified) * code/trunk/src/modules/jump/JumpFigure.cc (modified) * code/trunk/src/modules/jump/JumpFigure.h (modified) * code/trunk/src/modules/jump/JumpItem.cc (modified) * code/trunk/src/modules/jump/JumpItem.h (modified) * code/trunk/src/modules/jump/JumpPlatform.cc (modified) * code/trunk/src/modules/jump/JumpPlatform.h (modified) * code/trunk/src/modules/jump/JumpPlatformDisappear.cc (modified) * code/trunk/src/modules/jump/JumpPlatformDisappear.h (modified) * code/trunk/src/modules/jump/JumpPlatformFake.cc (modified) * code/trunk/src/modules/jump/JumpPlatformFake.h (modified) * code/trunk/src/modules/jump/JumpPlatformHMove.cc (modified) * code/trunk/src/modules/jump/JumpPlatformHMove.h (modified) * code/trunk/src/modules/jump/JumpPlatformStatic.cc (modified) * code/trunk/src/modules/jump/JumpPlatformStatic.h (modified) * code/trunk/src/modules/jump/JumpPlatformTimer.cc (modified) * code/trunk/src/modules/jump/JumpPlatformTimer.h (modified) * code/trunk/src/modules/jump/JumpPlatformVMove.cc (modified) * code/trunk/src/modules/jump/JumpPlatformVMove.h (modified) * code/trunk/src/modules/jump/JumpPrereqs.h (modified) * code/trunk/src/modules/jump/JumpProjectile.cc (modified) * code/trunk/src/modules/jump/JumpProjectile.h (modified) * code/trunk/src/modules/jump/JumpPropeller.cc (modified) * code/trunk/src/modules/jump/JumpPropeller.h (modified) * code/trunk/src/modules/jump/JumpRocket.cc (modified) * code/trunk/src/modules/jump/JumpRocket.h (modified) * code/trunk/src/modules/jump/JumpScore.cc (modified) * code/trunk/src/modules/jump/JumpScore.h (modified) * code/trunk/src/modules/jump/JumpShield.cc (modified) * code/trunk/src/modules/jump/JumpShield.h (modified) * code/trunk/src/modules/jump/JumpSpring.cc (modified) * code/trunk/src/modules/jump/JumpSpring.h (modified) * code/trunk/src/modules/objects/Turret.cc (modified) * code/trunk/src/modules/objects/Turret.h (modified) * code/trunk/src/modules/objects/collisionshapes/CylinderCollisionShape.cc (modified) * code/trunk/src/modules/objects/collisionshapes/CylinderCollisionShape.h (modified) * code/trunk/src/modules/objects/controllers/CMakeLists.txt (modified) * code/trunk/src/modules/objects/controllers/TeamTargetProxy.cc (modified) * code/trunk/src/modules/objects/controllers/TeamTargetProxy.h (modified) * code/trunk/src/modules/objects/controllers/TurretController.cc (modified) * code/trunk/src/modules/objects/controllers/TurretController.h (modified) * code/trunk/src/modules/tetris/TetrisBrick.cc (modified) * code/trunk/src/modules/tetris/TetrisBrick.h (modified) * code/trunk/src/modules/tetris/TetrisScore.cc (modified) * code/trunk/src/modules/tetris/TetrisScore.h (modified) * code/trunk/src/orxonox/ShipPartManager.cc (modified) * code/trunk/src/orxonox/ShipPartManager.h (modified) * code/trunk/src/orxonox/controllers/ControllerDirector.cc (modified) * code/trunk/src/orxonox/controllers/ControllerDirector.h (modified) * code/trunk/src/orxonox/controllers/ScriptController.cc (modified) * code/trunk/src/orxonox/controllers/ScriptController.h (modified) * code/trunk/src/orxonox/controllers/testscript.lua (modified) * code/trunk/src/orxonox/items/PartDestructionEvent.cc (modified) * code/trunk/src/orxonox/items/PartDestructionEvent.h (modified) * code/trunk/src/orxonox/items/ShipPart.cc (modified) * code/trunk/src/orxonox/items/ShipPart.h (modified) * code/trunk/src/orxonox/worldentities/pawns/ModularSpaceShip.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/ModularSpaceShip.h (modified) eol-style native. no changes in code. Fri, 06 Feb 2015 22:11:10 GMT landauf [10261] * code/trunk/src/modules/jump/Jump.cc (modified) fixed warning Fri, 06 Feb 2015 22:03:00 GMT landauf [10260] * code/trunk (modified) * code/trunk/data/levels/jump.oxw (modified) * code/trunk/data/overlays/jumpHUD.oxo (modified) * code/trunk/src/modules/jump/Jump.cc (modified) * code/trunk/src/modules/jump/Jump.h (modified) * code/trunk/src/modules/jump/JumpBoots.cc (modified) * code/trunk/src/modules/jump/JumpBoots.h (modified) * code/trunk/src/modules/jump/JumpFigure.cc (modified) * code/trunk/src/modules/jump/JumpFigure.h (modified) * code/trunk/src/modules/jump/JumpItem.h (modified) * code/trunk/src/modules/jump/JumpPropeller.cc (modified) * code/trunk/src/modules/jump/JumpPropeller.h (modified) * code/trunk/src/modules/jump/JumpRocket.cc (modified) * code/trunk/src/modules/jump/JumpRocket.h (modified) * code/trunk/src/modules/jump/JumpScore.cc (modified) * code/trunk/src/modules/jump/JumpScore.h (modified) * code/trunk/src/modules/jump/JumpShield.cc (modified) * code/trunk/src/modules/jump/JumpShield.h (modified) merged the latest changes from pickupsFS14 to trunk Fri, 06 Feb 2015 21:55:17 GMT landauf [10259] * code/trunk (modified) * code/trunk/data/levels/jump.oxw (modified) * code/trunk/src/modules/jump/Jump.cc (modified) recorded merge of pickupsFS14 up to r10112 (which was already mostly ... Thu, 05 Feb 2015 22:47:13 GMT landauf [10258] * code/trunk (modified) * code/trunk/cmake/LibraryConfig.cmake (modified) * code/trunk/data/defaultConfig/orxonox.ini (copied) * code/trunk/data/gui/layouts/CampaignMenu.layout (copied) * code/trunk/data/gui/layouts/SingleplayerMenu.layout (modified) * code/trunk/data/gui/scripts/CampaignMenu.lua (copied) * code/trunk/data/gui/scripts/SingleplayerMenu.lua (modified) * code/trunk/data/levels/4Dtest.oxw (copied) * code/trunk/data/levels/AnihilationThreat.oxw (copied) * code/trunk/data/levels/DodgeRace.oxw (copied) * code/trunk/data/levels/FPS_Level_HS14.oxw (copied) * code/trunk/data/levels/includes/weaponSettingsFPS_HS14.oxi (copied) * code/trunk/data/levels/includes/weaponSettingsTurret1.oxi (copied) * code/trunk/data/levels/kecks.oxw (copied) * code/trunk/data/levels/presentationHS13.oxw (modified) * code/trunk/data/levels/templates/DodgeRacePattern.oxt (copied) * code/trunk/data/levels/templates/FPS.oxt (modified) * code/trunk/data/levels/templates/FPS_HS14.oxt (copied) * code/trunk/data/levels/templates/enemytowerdefense.oxt (copied) * code/trunk/data/levels/templates/spaceshipDodgeRace.oxt (copied) * code/trunk/data/levels/templates/spacestation_elements.oxt (copied) * code/trunk/data/levels/templates/ss_tube01.oxt (copied) * code/trunk/data/levels/templates/tower.oxt (modified) * code/trunk/data/levels/towerDefense.oxw (modified) * code/trunk/data/overlays/DodgeRaceHUD.oxo (copied) * code/trunk/data/overlays/HUDTemplates3.oxo (modified) * code/trunk/data/overlays/towerdefenseHUD.oxo (modified) * code/trunk/src/modules/CMakeLists.txt (modified) * code/trunk/src/modules/dodgerace (copied) * code/trunk/src/modules/mini4dgame (copied) * code/trunk/src/modules/notifications/NotificationQueueCEGUI.cc (modified) * code/trunk/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/trunk/src/modules/overlays/hud/HUDNavigation.h (modified) * code/trunk/src/modules/towerdefense/CMakeLists.txt (modified) * code/trunk/src/modules/towerdefense/TDCoordinate.cc (copied) * code/trunk/src/modules/towerdefense/TDCoordinate.h (copied) * code/trunk/src/modules/towerdefense/TDEnemy.h (modified) * code/trunk/src/modules/towerdefense/Tower.cc (modified) * code/trunk/src/modules/towerdefense/TowerDefense.cc (modified) * code/trunk/src/modules/towerdefense/TowerDefense.h (modified) * code/trunk/src/modules/towerdefense/TowerDefenseController.cc (modified) * code/trunk/src/modules/towerdefense/TowerDefenseEnemy.cc (copied) * code/trunk/src/modules/towerdefense/TowerDefenseEnemy.h (copied) * code/trunk/src/modules/towerdefense/TowerDefenseHUDController.cc (modified) * code/trunk/src/modules/towerdefense/TowerDefenseHUDController.h (modified) * code/trunk/src/modules/towerdefense/TowerDefensePlayerStats.cc (modified) * code/trunk/src/modules/towerdefense/TowerDefensePlayerStats.h (modified) * code/trunk/src/modules/towerdefense/TowerDefensePrereqs.h (modified) * code/trunk/src/modules/towerdefense/TowerDefenseTower.cc (copied) * code/trunk/src/modules/towerdefense/TowerDefenseTower.h (copied) * code/trunk/src/modules/towerdefense/TowerTurret.cc (copied) * code/trunk/src/modules/towerdefense/TowerTurret.h (copied) * code/trunk/src/modules/weapons/RocketController.cc (modified) * code/trunk/src/orxonox/LevelManager.cc (modified) * code/trunk/src/orxonox/LevelManager.h (modified) * code/trunk/src/orxonox/gametypes/Mission.cc (modified) merged presentationHS14merge back to trunk Sat, 31 Jan 2015 22:29:45 GMT landauf [10218] * code/trunk/src/modules/jump/Jump.cc (modified) * code/trunk/src/modules/jump/JumpFigure.cc (modified) * code/trunk/src/modules/jump/JumpPrereqs.h (modified) * code/trunk/src/modules/objects/controllers/TeamTargetProxy.h (modified) * code/trunk/src/modules/objects/controllers/TurretController.cc (modified) * code/trunk/src/modules/objects/controllers/TurretController.h (modified) fixed build and warnings with MSVC Sat, 31 Jan 2015 17:03:17 GMT landauf [10216] * code/trunk (modified) * code/trunk/data/gui/scripts/testscript.lua (copied) * code/trunk/data/levels/ModularShipsTest0.oxw (copied) * code/trunk/data/levels/ModularShipsTest1.oxw (copied) * code/trunk/data/levels/includes/weaponSettingsTurret.oxi (modified) * code/trunk/data/levels/jump.oxw (copied) * code/trunk/data/levels/levelTry.oxw (copied) * code/trunk/data/levels/michaelstestfile.lua (copied) * code/trunk/data/levels/scriptController.oxw (copied) * code/trunk/data/levels/templates/HeavyCruiser.oxt (modified) * code/trunk/data/levels/templates/ModularSpaceShipTest.oxt (copied) * code/trunk/data/levels/templates/standardTurret.oxt (copied) * code/trunk/data/levels/turretTest.oxw (modified) * code/trunk/data/overlays/jumpHUD.oxo (copied) * code/trunk/src/modules/CMakeLists.txt (modified) * code/trunk/src/modules/invader/InvaderWeapon.cc (modified) * code/trunk/src/modules/jump (copied) * code/trunk/src/modules/objects/CMakeLists.txt (modified) * code/trunk/src/modules/objects/Turret.cc (modified) * code/trunk/src/modules/objects/Turret.h (modified) * code/trunk/src/modules/objects/controllers (copied) * code/trunk/src/modules/weapons/projectiles/BasicProjectile.cc (modified) * code/trunk/src/modules/weapons/projectiles/BasicProjectile.h (modified) * code/trunk/src/modules/weapons/projectiles/Projectile.cc (modified) * code/trunk/src/modules/weapons/projectiles/Projectile.h (modified) * code/trunk/src/modules/weapons/projectiles/Rocket.cc (modified) * code/trunk/src/modules/weapons/projectiles/Rocket.h (modified) * code/trunk/src/modules/weapons/projectiles/SimpleRocket.cc (modified) * code/trunk/src/modules/weapons/projectiles/SimpleRocket.h (modified) * code/trunk/src/orxonox/CMakeLists.txt (modified) * code/trunk/src/orxonox/OrxonoxPrereqs.h (modified) * code/trunk/src/orxonox/Scene.cc (modified) * code/trunk/src/orxonox/ShipPartManager.cc (copied) * code/trunk/src/orxonox/ShipPartManager.h (copied) * code/trunk/src/orxonox/collisionshapes/CollisionShape.cc (modified) * code/trunk/src/orxonox/controllers/ArtificialController.cc (modified) * code/trunk/src/orxonox/controllers/CMakeLists.txt (modified) * code/trunk/src/orxonox/controllers/ControllerDirector.cc (copied) * code/trunk/src/orxonox/controllers/ControllerDirector.h (copied) * code/trunk/src/orxonox/controllers/NewHumanController.cc (modified) * code/trunk/src/orxonox/controllers/ScriptController.cc (copied) * code/trunk/src/orxonox/controllers/ScriptController.h (copied) * code/trunk/src/orxonox/controllers/testscript.lua (copied) * code/trunk/src/orxonox/items/CMakeLists.txt (modified) * code/trunk/src/orxonox/items/PartDestructionEvent.cc (copied) * code/trunk/src/orxonox/items/PartDestructionEvent.h (copied) * code/trunk/src/orxonox/items/ShipPart.cc (copied) * code/trunk/src/orxonox/items/ShipPart.h (copied) * code/trunk/src/orxonox/worldentities/MovableEntity.cc (modified) * code/trunk/src/orxonox/worldentities/MovableEntity.h (modified) * code/trunk/src/orxonox/worldentities/WorldEntity.h (modified) * code/trunk/src/orxonox/worldentities/pawns/CMakeLists.txt (modified) * code/trunk/src/orxonox/worldentities/pawns/ModularSpaceShip.cc (copied) * code/trunk/src/orxonox/worldentities/pawns/ModularSpaceShip.h (copied) * code/trunk/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/Pawn.h (modified) * code/trunk/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/SpaceShip.h (modified) merged branch presentationFS14 back to trunk Sun, 11 Jan 2015 14:40:41 GMT landauf [10189] * code/trunk/data/levels/collisionShapes.oxw (added) * code/trunk/src/libraries/core/CoreIncludes.h (modified) * code/trunk/src/modules/objects/ObjectsPrereqs.h (modified) * code/trunk/src/modules/objects/collisionshapes/AbstractRadiusHeightCollisionShape.cc (copied) * code/trunk/src/modules/objects/collisionshapes/AbstractRadiusHeightCollisionShape.h (copied) * code/trunk/src/modules/objects/collisionshapes/CMakeLists.txt (modified) * code/trunk/src/modules/objects/collisionshapes/ConeCollisionShape.cc (modified) * code/trunk/src/modules/objects/collisionshapes/ConeCollisionShape.h (modified) * code/trunk/src/modules/objects/collisionshapes/CylinderCollisionShape.cc (added) * code/trunk/src/modules/objects/collisionshapes/CylinderCollisionShape.h (added) added new collision shape (cylinder) Sat, 04 Jan 2014 14:51:36 GMT landauf [9974] * code/trunk/src/modules/docking/DockToShip.cc (modified) docking should take actual control, not just temporary. this also ... Sat, 04 Jan 2014 13:56:03 GMT landauf [9973] * code/trunk/src/modules/gametypes/RaceCheckPoint.cc (modified) * code/trunk/src/modules/gametypes/SpaceRaceController.cc (modified) * code/trunk/src/modules/gametypes/SpaceRaceController.h (modified) several (potential) bugfixes in SpaceRaceController: * check if ... Sat, 04 Jan 2014 13:20:06 GMT landauf [9971] * code/trunk/src/modules/gametypes/RaceCheckPoint.h (modified) return reference instead of copy. this also fixes a crash in ... Fri, 03 Jan 2014 21:14:03 GMT landauf [9967] * code/trunk/src/modules/gametypes/RaceCheckPoint.cc (modified) * code/trunk/src/modules/gametypes/SpaceRaceController.cc (modified) * code/trunk/src/modules/gametypes/SpaceRaceController.h (modified) call by reference instead of value Fri, 03 Jan 2014 21:05:55 GMT landauf [9966] * code/trunk/src/modules/gametypes/SpaceRaceController.h (modified) moved declarations to follow our formatting guidelines. no changes in ... Fri, 03 Jan 2014 20:57:52 GMT landauf [9965] * code/trunk/src/modules/gametypes/SpaceRaceController.cc (modified) simplified algorithm. turns out this code actually tries to find the ... Fri, 03 Jan 2014 20:44:23 GMT landauf [9964] * code/trunk/src/modules/gametypes/RaceCheckPoint.cc (modified) * code/trunk/src/modules/gametypes/RaceCheckPoint.h (modified) * code/trunk/src/modules/gametypes/SpaceRaceController.cc (modified) removed unused code (some of the code was after a 'return' statement ... Fri, 03 Jan 2014 20:29:13 GMT landauf [9963] * code/trunk/src/modules/gametypes/RaceCheckPoint.cc (modified) * code/trunk/src/modules/gametypes/RaceCheckPoint.h (modified) removed unused variable. RaceCheckPoint is a WorldEntity itself, so ... Fri, 03 Jan 2014 20:28:38 GMT landauf [9962] * code/trunk/src/modules/gametypes/SpaceRaceController.cc (modified) * code/trunk/src/modules/gametypes/SpaceRaceController.h (modified) fixed warnings (msvc) Fri, 03 Jan 2014 20:20:39 GMT landauf [9961] * code/trunk/src/modules/invader/Invader.cc (modified) * code/trunk/src/modules/invader/InvaderEnemy.cc (modified) * code/trunk/src/modules/invader/InvaderEnemyShooter.cc (modified) * code/trunk/src/modules/invader/InvaderHUDinfo.cc (modified) * code/trunk/src/modules/invader/InvaderWeapon.cc (modified) fixed warnings (msvc) Fri, 03 Jan 2014 19:49:30 GMT landauf [9959] * code/trunk/src/modules/invader/Invader.cc (modified) don't re-initialize the random number generator - we already do this ... Fri, 03 Jan 2014 19:29:21 GMT landauf [9958] * code/trunk/src/modules/invader/CMakeLists.txt (modified) * code/trunk/src/modules/towerdefense/CMakeLists.txt (modified) user lower-case for all module names Fri, 03 Jan 2014 19:28:52 GMT landauf [9957] * code/trunk/src/modules/invader/InvaderHUDinfo.h (modified) * code/trunk/src/modules/invader/InvaderPrereqs.h (modified) fixed a number of linker warnings with msvc Fri, 03 Jan 2014 19:13:59 GMT landauf [9956] * code/trunk/src/modules/invader/Invader.cc (modified) fixed build with msvc (it seems to use c++98 which has 3 overloads of ... Fri, 03 Jan 2014 12:50:22 GMT landauf [9945] * code/trunk/src/libraries/util/Math.cc (modified) * code/trunk/src/modules/docking/Dock.cc (modified) * code/trunk/src/modules/docking/MoveToDockingTarget.cc (modified) * code/trunk/src/modules/gametypes/SpaceRaceController.cc (modified) * code/trunk/src/modules/invader/InvaderWeaponEnemy.cc (modified) * code/trunk/src/modules/objects/ForceField.cc (modified) * code/trunk/src/modules/objects/Turret.cc (modified) * code/trunk/src/modules/overlays/hud/HUDRadar.cc (modified) * code/trunk/src/modules/overlays/hud/HUDRadar.h (modified) * code/trunk/src/modules/pong/PongBall.cc (modified) * code/trunk/src/modules/tetris/TetrisBrick.cc (modified) * code/trunk/src/modules/tetris/TetrisScore.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/HsW01.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/HsW01.h (modified) * code/trunk/src/orxonox/gametypes/Dynamicmatch.cc (modified) * code/trunk/src/orxonox/infos/PlayerInfo.cc (modified) * code/trunk/src/orxonox/sound/WorldAmbientSound.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/Pawn.cc (modified) replaced tabs with spaces. no changes in code Fri, 03 Jan 2014 11:45:21 GMT landauf [9943] * code/trunk/data/gui/layouts/UndockingDialog.layout (modified) * code/trunk/data/gui/scripts/UndockingDialog.lua (modified) * code/trunk/data/levels/HeavyCruiser.oxw (modified) * code/trunk/data/levels/InsideSpaceStation.oxw (modified) * code/trunk/data/levels/Invaders.oxw (modified) * code/trunk/data/levels/_temp.oxw (modified) * code/trunk/data/levels/dockingToASpaceStation.oxw (modified) * code/trunk/data/levels/iJohnVane_TriptoArea51.oxw (modified) * code/trunk/data/levels/iiJohnVane_Area51UnderFire.oxw (modified) * code/trunk/data/levels/iiiJohnVane_EscapeTheBastards.oxw (modified) * code/trunk/data/levels/includes/HeavyCruiserParts.lua (modified) * code/trunk/data/levels/includes/invaderWeapon.oxi (modified) * code/trunk/data/levels/includes/invaderWeaponEnemy.oxi (modified) * code/trunk/data/levels/includes/weaponSettingsHeavyCruiser.oxi (modified) * code/trunk/data/levels/includes/weaponSettingsHeavyCruiserBody.oxi (modified) * code/trunk/data/levels/presentationHS13.oxw (modified) * code/trunk/data/levels/radar3D_test.oxw (modified) * code/trunk/data/levels/templates/.shipmodels (modified) * code/trunk/data/levels/templates/HeavyCruiser.oxt (modified) * code/trunk/data/levels/templates/HeavyCruiserBody.oxt (modified) * code/trunk/data/levels/templates/enemyInvader.oxt (modified) * code/trunk/data/levels/templates/enemyInvaderShooter.oxt (modified) * code/trunk/data/levels/templates/spaceshipInvader.oxt (modified) * code/trunk/data/overlays/InvaderHUD.oxo (modified) * code/trunk/src/modules/invader/CMakeLists.txt (modified) * code/trunk/src/modules/invader/Invader.cc (modified) * code/trunk/src/modules/invader/Invader.h (modified) * code/trunk/src/modules/invader/InvaderCenterPoint.cc (modified) * code/trunk/src/modules/invader/InvaderCenterPoint.h (modified) * code/trunk/src/modules/invader/InvaderEnemy.cc (modified) * code/trunk/src/modules/invader/InvaderEnemy.h (modified) * code/trunk/src/modules/invader/InvaderEnemyShooter.cc (modified) * code/trunk/src/modules/invader/InvaderEnemyShooter.h (modified) * code/trunk/src/modules/invader/InvaderHUDinfo.cc (modified) * code/trunk/src/modules/invader/InvaderHUDinfo.h (modified) * code/trunk/src/modules/invader/InvaderPrereqs.h (modified) * code/trunk/src/modules/invader/InvaderShip.cc (modified) * code/trunk/src/modules/invader/InvaderShip.h (modified) * code/trunk/src/modules/invader/InvaderWeapon.cc (modified) * code/trunk/src/modules/invader/InvaderWeapon.h (modified) * code/trunk/src/modules/invader/InvaderWeaponEnemy.cc (modified) * code/trunk/src/modules/invader/InvaderWeaponEnemy.h (modified) * code/trunk/src/modules/overlays/debugging/DebugPositionText.cc (modified) * code/trunk/src/modules/overlays/debugging/DebugPositionText.h (modified) * code/trunk/src/modules/overlays/hud/CountDown.cc (modified) * code/trunk/src/modules/overlays/hud/CountDown.h (modified) eol-style native Sun, 29 Dec 2013 19:45:00 GMT jo [9942] * code/trunk/src/modules/invader/Invader.cc (modified) * code/trunk/src/modules/invader/Invader.h (modified) Disabling addbots for Invaders, since it will cause the game to crash. Sun, 29 Dec 2013 19:06:44 GMT jo [9941] * code/trunk/data/gui/layouts/CreditsMenu.layout (modified) * code/trunk/data/gui/scripts/MiscConfigMenu.lua (modified) * code/trunk/data/levels/missionOne.oxw (modified) * code/trunk/data/levels/underAttack.oxw (modified) * code/trunk/src/modules/objects/SpaceBoundaries.cc (modified) * code/trunk/src/orxonox/gametypes/LastTeamStanding.cc (modified) * code/trunk/src/orxonox/gametypes/TeamDeathmatch.cc (modified) * code/trunk/src/orxonox/gametypes/TeamDeathmatch.h (modified) * code/trunk/src/orxonox/gametypes/TeamGametype.cc (modified) * code/trunk/src/orxonox/gametypes/TeamGametype.h (modified) * code/trunk/src/orxonox/gametypes/UnderAttack.cc (modified) * code/trunk/src/orxonox/gametypes/UnderAttack.h (modified) Adding most of the changes that were proposed in the release2012 branch. Sat, 21 Dec 2013 22:16:54 GMT jo [9939] * code/trunk (modified) * code/trunk/data/defaultConfig/keybindings.ini (modified) * code/trunk/data/gui/layouts/UndockingDialog.layout (copied) * code/trunk/data/gui/scripts/MiscConfigMenu.lua (modified) * code/trunk/data/gui/scripts/UndockingDialog.lua (copied) * code/trunk/data/levels/FPSTest.oxw (modified) * code/trunk/data/levels/HeavyCruiser.oxw (copied) * code/trunk/data/levels/InsideSpaceStation.oxw (copied) * code/trunk/data/levels/Invaders.oxw (copied) * code/trunk/data/levels/Spacerace2.oxw (modified) * code/trunk/data/levels/_temp.oxw (copied) * code/trunk/data/levels/asteroidField.oxw (modified) * code/trunk/data/levels/asteroids.oxw (modified) * code/trunk/data/levels/docking.oxw (modified) * code/trunk/data/levels/dockingToASpaceStation.oxw (copied) * code/trunk/data/levels/dynamicMatch.oxw (modified) * code/trunk/data/levels/gallery.oxw (modified) * code/trunk/data/levels/iJohnVane_TriptoArea51.oxw (copied) * code/trunk/data/levels/iiJohnVane_Area51UnderFire.oxw (copied) * code/trunk/data/levels/iiiJohnVane_EscapeTheBastards.oxw (copied) * code/trunk/data/levels/includes/HeavyCruiserParts.lua (copied) * code/trunk/data/levels/includes/invaderWeapon.oxi (copied) * code/trunk/data/levels/includes/invaderWeaponEnemy.oxi (copied) * code/trunk/data/levels/includes/weaponSettingsHeavyCruiser.oxi (copied) * code/trunk/data/levels/includes/weaponSettingsHeavyCruiserBody.oxi (copied) * code/trunk/data/levels/lastManStanding.oxw (modified) * code/trunk/data/levels/lastTeamStanding.oxw (modified) * code/trunk/data/levels/lastTeamStandingII.oxw (modified) * code/trunk/data/levels/maxim.oxw (modified) * code/trunk/data/levels/missionOne.oxw (modified) * code/trunk/data/levels/pickups.oxw (modified) * code/trunk/data/levels/pirateAttack.oxw (modified) * code/trunk/data/levels/pong.oxw (modified) * code/trunk/data/levels/portals.oxw (modified) * code/trunk/data/levels/presentation.oxw (modified) * code/trunk/data/levels/presentationFS11.oxw (modified) * code/trunk/data/levels/presentationHS13.oxw (copied) * code/trunk/data/levels/quests.oxw (modified) * code/trunk/data/levels/radar3D_test.oxw (copied) * code/trunk/data/levels/spaceRace.oxw (modified) * code/trunk/data/levels/surfaceRace.oxw (modified) * code/trunk/data/levels/teamBaseMatch.oxw (modified) * code/trunk/data/levels/teamDeathMatch.oxw (modified) * code/trunk/data/levels/templates/.shipmodels (copied) * code/trunk/data/levels/templates/HeavyCruiser.oxt (copied) * code/trunk/data/levels/templates/HeavyCruiserBody.oxt (copied) * code/trunk/data/levels/templates/enemyInvader.oxt (copied) * code/trunk/data/levels/templates/enemyInvaderShooter.oxt (copied) * code/trunk/data/levels/templates/lodInformation.oxt (modified) * code/trunk/data/levels/templates/spaceshipAssff.oxt (modified) * code/trunk/data/levels/templates/spaceshipInvader.oxt (copied) * code/trunk/data/levels/turretTest.oxw (modified) * code/trunk/data/levels/underAttack.oxw (modified) * code/trunk/data/overlays/HUD.oxo (modified) * code/trunk/data/overlays/HUDTemplates3.oxo (modified) * code/trunk/data/overlays/InvaderHUD.oxo (copied) * code/trunk/data/overlays/debug.oxo (modified) * code/trunk/src/libraries/util/Math.cc (modified) * code/trunk/src/libraries/util/Math.h (modified) * code/trunk/src/modules/CMakeLists.txt (modified) * code/trunk/src/modules/docking/Dock.cc (modified) * code/trunk/src/modules/docking/Dock.h (modified) * code/trunk/src/modules/docking/MoveToDockingTarget.cc (modified) * code/trunk/src/modules/invader (copied) * code/trunk/src/modules/invader/CMakeLists.txt (copied) * code/trunk/src/modules/invader/Invader.cc (copied) * code/trunk/src/modules/invader/Invader.h (copied) * code/trunk/src/modules/invader/InvaderCenterPoint.cc (copied) * code/trunk/src/modules/invader/InvaderCenterPoint.h (copied) * code/trunk/src/modules/invader/InvaderEnemy.cc (copied) * code/trunk/src/modules/invader/InvaderEnemy.h (copied) * code/trunk/src/modules/invader/InvaderEnemyShooter.cc (copied) * code/trunk/src/modules/invader/InvaderEnemyShooter.h (copied) * code/trunk/src/modules/invader/InvaderHUDinfo.cc (copied) * code/trunk/src/modules/invader/InvaderHUDinfo.h (copied) * code/trunk/src/modules/invader/InvaderPrereqs.h (copied) * code/trunk/src/modules/invader/InvaderShip.cc (copied) * code/trunk/src/modules/invader/InvaderShip.h (copied) * code/trunk/src/modules/invader/InvaderWeapon.cc (copied) * code/trunk/src/modules/invader/InvaderWeapon.h (copied) * code/trunk/src/modules/invader/InvaderWeaponEnemy.cc (copied) * code/trunk/src/modules/invader/InvaderWeaponEnemy.h (copied) * code/trunk/src/modules/objects/ForceField.cc (modified) * code/trunk/src/modules/objects/ForceField.h (modified) * code/trunk/src/modules/overlays/OverlaysPrereqs.h (modified) * code/trunk/src/modules/overlays/debugging/CMakeLists.txt (modified) * code/trunk/src/modules/overlays/debugging/DebugPositionText.cc (copied) * code/trunk/src/modules/overlays/debugging/DebugPositionText.h (copied) * code/trunk/src/modules/overlays/hud/CMakeLists.txt (modified) * code/trunk/src/modules/overlays/hud/CountDown.cc (copied) * code/trunk/src/modules/overlays/hud/CountDown.h (copied) * code/trunk/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/trunk/src/modules/overlays/hud/HUDRadar.cc (modified) * code/trunk/src/modules/overlays/hud/HUDRadar.h (modified) * code/trunk/src/modules/pong/Pong.cc (modified) * code/trunk/src/modules/pong/PongBall.cc (modified) * code/trunk/src/modules/pong/PongBall.h (modified) * code/trunk/src/modules/pong/PongScore.cc (modified) * code/trunk/src/modules/pong/PongScore.h (modified) * code/trunk/src/modules/weapons/weaponmodes/HsW01.h (modified) * code/trunk/src/orxonox/MoodManager.h (modified) * code/trunk/src/orxonox/controllers/NewHumanController.cc (modified) * code/trunk/src/orxonox/gamestates/GSMainMenu.cc (modified) * code/trunk/src/orxonox/gametypes/Gametype.cc (modified) * code/trunk/src/orxonox/graphics/ParticleEmitter.cc (modified) * code/trunk/src/orxonox/graphics/ParticleEmitter.h (modified) * code/trunk/src/orxonox/infos/PlayerInfo.cc (modified) * code/trunk/src/orxonox/interfaces/RadarViewable.h (modified) * code/trunk/src/orxonox/items/MultiStateEngine.cc (modified) * code/trunk/src/orxonox/sound/AmbientSound.cc (modified) * code/trunk/src/orxonox/sound/AmbientSound.h (modified) * code/trunk/src/orxonox/sound/BaseSound.cc (modified) * code/trunk/src/orxonox/sound/SoundManager.cc (modified) * code/trunk/src/orxonox/sound/WorldAmbientSound.cc (modified) * code/trunk/src/orxonox/sound/WorldAmbientSound.h (modified) * code/trunk/src/orxonox/sound/WorldSound.cc (modified) * code/trunk/src/orxonox/weaponsystem/WeaponMode.cc (modified) * code/trunk/src/orxonox/worldentities/BigExplosion.cc (modified) * code/trunk/src/orxonox/worldentities/BigExplosion.h (modified) * code/trunk/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/Pawn.h (modified) presentationHS13 branch merged into trunk Sun, 01 Dec 2013 23:19:44 GMT jo [9834] * code/trunk/src/modules/tetris/Tetris.cc (modified) Fixing another bug introduced by the previous bug fix. Sun, 01 Dec 2013 22:38:21 GMT jo [9833] * code/trunk/src/modules/tetris/Tetris.cc (modified) * code/trunk/src/modules/tetris/Tetris.h (modified) Fixing cleanup bug, that causes orxonox to crash when tetris was ... Thu, 21 Nov 2013 22:44:16 GMT jo [9804] * code/trunk/src/modules/gametypes/SpaceRace.cc (modified) Cleaning up the spacerace output. Thu, 21 Nov 2013 22:20:31 GMT jo [9803] * code/trunk/src/modules/tetris/Tetris.cc (modified) * code/trunk/src/modules/tetris/TetrisBrick.cc (modified) The brick falldown acceleration is increased, but the velocity is ... Thu, 21 Nov 2013 21:11:27 GMT jo [9802] * code/trunk/src/modules/tetris/Tetris.cc (modified) * code/trunk/src/modules/tetris/Tetris.h (modified) Making the Tetris collision detection more robust, by decoupling ... Thu, 21 Nov 2013 20:26:33 GMT jo [9801] * code/trunk/src/modules/tetris/Tetris.cc (modified) * code/trunk/src/modules/tetris/TetrisBrick.cc (modified) * code/trunk/src/modules/tetris/TetrisScore.h (modified) Eridicating a Tetris Bug, related to the positioning of a TetrisBrick ... Thu, 21 Nov 2013 08:03:13 GMT jo [9795] * code/trunk/src/modules/tetris/Tetris.cc (modified) Removed recursion bug. Invalid positioning/ collision detection still ... Tue, 05 Nov 2013 22:12:02 GMT jo [9756] * code/trunk/src/modules/tetris/TetrisBrick.cc (modified) Disabling the single tetris brick. Now all tetris bricks consists of ... Thu, 26 Sep 2013 21:03:33 GMT landauf [9675] * code/trunk (modified) * code/trunk/cmake/tools/FindCEGUI.cmake (modified) * code/trunk/src/OrxonoxConfig.h.in (modified) * code/trunk/src/libraries/core/CorePrereqs.h (modified) * code/trunk/src/libraries/core/GUIManager.cc (modified) * code/trunk/src/libraries/core/GUIManager.h (modified) * code/trunk/src/libraries/core/GraphicsManager.cc (modified) * code/trunk/src/libraries/core/GraphicsManager.h (modified) * code/trunk/src/libraries/core/Resource.cc (modified) * code/trunk/src/libraries/util/Exception.cc (modified) * code/trunk/src/modules/objects/Planet.cc (modified) * code/trunk/src/orxonox/chat/ChatInputHandler.cc (modified) * code/trunk/src/orxonox/chat/ChatInputHandler.h (modified) * code/trunk/src/orxonox/graphics/Model.cc (modified) merged branch 'libs' back to trunk. orxonox now compiles and runs ... Sun, 25 Aug 2013 19:08:42 GMT landauf [9667] * code/trunk (modified) * code/trunk/src/SourceConfig.cmake (modified) * code/trunk/src/libraries/core/BaseObject.cc (modified) * code/trunk/src/libraries/core/BaseObject.h (modified) * code/trunk/src/libraries/core/CMakeLists.txt (modified) * code/trunk/src/libraries/core/ClassFactory.h (deleted) * code/trunk/src/libraries/core/ClassTreeMask.cc (modified) * code/trunk/src/libraries/core/ClassTreeMask.h (modified) * code/trunk/src/libraries/core/CommandLineParser.cc (deleted) * code/trunk/src/libraries/core/CommandLineParser.h (deleted) * code/trunk/src/libraries/core/ConfigFileManager.cc (deleted) * code/trunk/src/libraries/core/ConfigFileManager.h (deleted) * code/trunk/src/libraries/core/ConfigValueContainer.cc (deleted) * code/trunk/src/libraries/core/ConfigValueContainer.h (deleted) * code/trunk/src/libraries/core/ConfigValueIncludes.h (deleted) * code/trunk/src/libraries/core/Core.cc (modified) * code/trunk/src/libraries/core/Core.h (modified) * code/trunk/src/libraries/core/CoreIncludes.h (modified) * code/trunk/src/libraries/core/CorePrereqs.h (modified) * code/trunk/src/libraries/core/Event.cc (modified) * code/trunk/src/libraries/core/GUIManager.cc (modified) * code/trunk/src/libraries/core/GUIManager.h (modified) * code/trunk/src/libraries/core/Game.cc (modified) * code/trunk/src/libraries/core/Game.h (modified) * code/trunk/src/libraries/core/GraphicsManager.cc (modified) * code/trunk/src/libraries/core/GraphicsManager.h (modified) * code/trunk/src/libraries/core/Identifier.cc (deleted) * code/trunk/src/libraries/core/Identifier.h (deleted) * code/trunk/src/libraries/core/Iterator.h (deleted) * code/trunk/src/libraries/core/Loader.cc (modified) * code/trunk/src/libraries/core/MetaObjectList.cc (deleted) * code/trunk/src/libraries/core/MetaObjectList.h (deleted) * code/trunk/src/libraries/core/Namespace.cc (modified) * code/trunk/src/libraries/core/Namespace.h (modified) * code/trunk/src/libraries/core/ObjectList.h (deleted) * code/trunk/src/libraries/core/ObjectListBase.cc (deleted) * code/trunk/src/libraries/core/ObjectListBase.h (deleted) * code/trunk/src/libraries/core/ObjectListIterator.h (deleted) * code/trunk/src/libraries/core/OrxonoxClass.cc (deleted) * code/trunk/src/libraries/core/OrxonoxClass.h (deleted) * code/trunk/src/libraries/core/PathConfig.cc (modified) * code/trunk/src/libraries/core/SmartPtr.h (deleted) * code/trunk/src/libraries/core/SubclassIdentifier.h (deleted) * code/trunk/src/libraries/core/Super.h (deleted) * code/trunk/src/libraries/core/Template.cc (modified) * code/trunk/src/libraries/core/Template.h (modified) * code/trunk/src/libraries/core/ViewportEventListener.cc (modified) * code/trunk/src/libraries/core/ViewportEventListener.h (modified) * code/trunk/src/libraries/core/WeakPtr.h (deleted) * code/trunk/src/libraries/core/WindowEventListener.cc (modified) * code/trunk/src/libraries/core/WindowEventListener.h (modified) * code/trunk/src/libraries/core/XMLNameListener.cc (modified) * code/trunk/src/libraries/core/XMLNameListener.h (modified) * code/trunk/src/libraries/core/XMLPort.cc (modified) * code/trunk/src/libraries/core/XMLPort.h (modified) * code/trunk/src/libraries/core/class (copied) * code/trunk/src/libraries/core/class/CMakeLists.txt (modified) * code/trunk/src/libraries/core/class/Identifiable.cc (modified) * code/trunk/src/libraries/core/class/Identifiable.h (modified) * code/trunk/src/libraries/core/class/Identifier.cc (modified) * code/trunk/src/libraries/core/class/Identifier.h (modified) * code/trunk/src/libraries/core/class/IdentifierManager.cc (modified) * code/trunk/src/libraries/core/class/IdentifierManager.h (modified) * code/trunk/src/libraries/core/class/OrxonoxClass.cc (copied) * code/trunk/src/libraries/core/class/OrxonoxClass.h (modified) * code/trunk/src/libraries/core/class/OrxonoxInterface.cc (copied) * code/trunk/src/libraries/core/class/OrxonoxInterface.h (modified) * code/trunk/src/libraries/core/class/SubclassIdentifier.h (modified) * code/trunk/src/libraries/core/class/Super.h (modified) * code/trunk/src/libraries/core/command/ArgumentCompletionFunctions.cc (modified) * code/trunk/src/libraries/core/command/Functor.h (modified) * code/trunk/src/libraries/core/command/IOConsolePOSIX.cc (modified) * code/trunk/src/libraries/core/command/IOConsoleWindows.cc (modified) * code/trunk/src/libraries/core/command/Shell.cc (modified) * code/trunk/src/libraries/core/command/Shell.h (modified) * code/trunk/src/libraries/core/config (copied) * code/trunk/src/libraries/core/config/CMakeLists.txt (modified) * code/trunk/src/libraries/core/config/ConfigValueContainer.h (modified) * code/trunk/src/libraries/core/config/Configurable.cc (copied) * code/trunk/src/libraries/core/config/Configurable.h (modified) * code/trunk/src/libraries/core/input/Button.cc (modified) * code/trunk/src/libraries/core/input/InputBuffer.cc (modified) * code/trunk/src/libraries/core/input/InputBuffer.h (modified) * code/trunk/src/libraries/core/input/InputManager.cc (modified) * code/trunk/src/libraries/core/input/JoyStick.cc (modified) * code/trunk/src/libraries/core/input/JoyStick.h (modified) * code/trunk/src/libraries/core/input/JoyStickQuantityListener.cc (modified) * code/trunk/src/libraries/core/input/JoyStickQuantityListener.h (modified) * code/trunk/src/libraries/core/input/KeyBinder.cc (modified) * code/trunk/src/libraries/core/input/KeyBinderManager.cc (modified) * code/trunk/src/libraries/core/input/KeyBinderManager.h (modified) * code/trunk/src/libraries/core/input/Mouse.cc (modified) * code/trunk/src/libraries/core/object (copied) * code/trunk/src/libraries/core/object/CMakeLists.txt (modified) * code/trunk/src/libraries/core/object/ClassFactory.h (modified) * code/trunk/src/libraries/core/object/Context.cc (modified) * code/trunk/src/libraries/core/object/Context.h (modified) * code/trunk/src/libraries/core/object/Iterator.h (modified) * code/trunk/src/libraries/core/object/IteratorBase.h (copied) * code/trunk/src/libraries/core/object/Listable.cc (modified) * code/trunk/src/libraries/core/object/Listable.h (modified) * code/branches/core6/src/libraries/core/object/MetaObjectList.cc (deleted) * code/branches/core6/src/libraries/core/object/MetaObjectList.h (deleted) * code/trunk/src/libraries/core/object/ObjectList.h (modified) * code/trunk/src/libraries/core/object/ObjectListBase.cc (modified) * code/trunk/src/libraries/core/object/ObjectListBase.h (modified) * code/trunk/src/libraries/core/object/ObjectListIterator.h (modified) * code/trunk/src/libraries/network/Client.cc (modified) * code/trunk/src/libraries/network/ClientConnectionListener.cc (modified) * code/trunk/src/libraries/network/ClientConnectionListener.h (modified) * code/trunk/src/libraries/network/Host.cc (modified) * code/trunk/src/libraries/network/NetworkChatListener.h (modified) * code/trunk/src/libraries/network/NetworkFunction.cc (modified) * code/trunk/src/libraries/network/NetworkFunction.h (modified) * code/trunk/src/libraries/network/Server.cc (modified) * code/trunk/src/libraries/network/TrafficControl.cc (modified) * code/trunk/src/libraries/network/WANDiscoverable.cc (modified) * code/trunk/src/libraries/network/WANDiscoverable.h (modified) * code/trunk/src/libraries/network/WANDiscovery.h (modified) * code/trunk/src/libraries/network/packet/ClassID.cc (modified) * code/trunk/src/libraries/network/packet/FunctionIDs.cc (modified) * code/trunk/src/libraries/network/packet/Gamestate.cc (modified) * code/trunk/src/libraries/network/synchronisable/Serialise.h (modified) * code/trunk/src/libraries/network/synchronisable/Synchronisable.cc (modified) * code/trunk/src/libraries/network/synchronisable/Synchronisable.h (modified) * code/trunk/src/libraries/tools/ParticleInterface.cc (modified) * code/trunk/src/libraries/tools/ResourceCollection.cc (modified) * code/trunk/src/libraries/tools/ResourceCollection.h (modified) * code/trunk/src/libraries/tools/ResourceLocation.cc (modified) * code/trunk/src/libraries/tools/ResourceLocation.h (modified) * code/trunk/src/libraries/tools/Shader.cc (modified) * code/trunk/src/libraries/tools/Timer.cc (modified) * code/trunk/src/libraries/tools/Timer.h (modified) * code/trunk/src/libraries/tools/interfaces/Tickable.h (modified) * code/trunk/src/libraries/tools/interfaces/TimeFactorListener.h (modified) * code/trunk/src/libraries/tools/interfaces/ToolsInterfaceCompilation.cc (modified) * code/trunk/src/libraries/util/ScopedSingletonManager.h (modified) * code/trunk/src/modules/designtools/CreateStars.cc (modified) * code/trunk/src/modules/designtools/CreateStars.h (modified) * code/trunk/src/modules/designtools/ScreenshotManager.cc (modified) * code/trunk/src/modules/designtools/ScreenshotManager.h (modified) * code/trunk/src/modules/designtools/SkyboxGenerator.cc (modified) * code/trunk/src/modules/designtools/SkyboxGenerator.h (modified) * code/trunk/src/modules/docking/Dock.cc (modified) * code/trunk/src/modules/docking/Dock.h (modified) * code/trunk/src/modules/docking/DockToShip.cc (modified) * code/trunk/src/modules/docking/DockToShip.h (modified) * code/trunk/src/modules/docking/DockingAnimation.cc (modified) * code/trunk/src/modules/docking/DockingAnimation.h (modified) * code/trunk/src/modules/docking/DockingController.cc (modified) * code/trunk/src/modules/docking/DockingController.h (modified) * code/trunk/src/modules/docking/DockingEffect.cc (modified) * code/trunk/src/modules/docking/DockingEffect.h (modified) * code/trunk/src/modules/docking/DockingPrecompiledHeaders.h (modified) * code/trunk/src/modules/docking/DockingTarget.cc (modified) * code/trunk/src/modules/docking/DockingTarget.h (modified) * code/trunk/src/modules/docking/MoveToDockingTarget.cc (modified) * code/trunk/src/modules/docking/MoveToDockingTarget.h (modified) * code/trunk/src/modules/gametypes/OldRaceCheckPoint.cc (modified) * code/trunk/src/modules/gametypes/OldRaceCheckPoint.h (modified) * code/trunk/src/modules/gametypes/OldSpaceRace.cc (modified) * code/trunk/src/modules/gametypes/OldSpaceRace.h (modified) * code/trunk/src/modules/gametypes/RaceCheckPoint.cc (modified) * code/trunk/src/modules/gametypes/RaceCheckPoint.h (modified) * code/trunk/src/modules/gametypes/SpaceRace.cc (modified) * code/trunk/src/modules/gametypes/SpaceRace.h (modified) * code/trunk/src/modules/gametypes/SpaceRaceBot.cc (modified) * code/trunk/src/modules/gametypes/SpaceRaceBot.h (modified) * code/trunk/src/modules/gametypes/SpaceRaceController.cc (modified) * code/trunk/src/modules/gametypes/SpaceRaceController.h (modified) * code/trunk/src/modules/gametypes/SpaceRaceManager.cc (modified) * code/trunk/src/modules/gametypes/SpaceRaceManager.h (modified) * code/trunk/src/modules/notifications/NotificationDispatcher.cc (modified) * code/trunk/src/modules/notifications/NotificationDispatcher.h (modified) * code/trunk/src/modules/notifications/NotificationManager.cc (modified) * code/trunk/src/modules/notifications/NotificationManager.h (modified) * code/trunk/src/modules/notifications/NotificationQueue.cc (modified) * code/trunk/src/modules/notifications/NotificationQueue.h (modified) * code/trunk/src/modules/notifications/NotificationQueueCEGUI.cc (modified) * code/trunk/src/modules/notifications/NotificationQueueCEGUI.h (modified) * code/trunk/src/modules/notifications/dispatchers/CommandNotification.cc (modified) * code/trunk/src/modules/notifications/dispatchers/CommandNotification.h (modified) * code/trunk/src/modules/notifications/dispatchers/SimpleNotification.cc (modified) * code/trunk/src/modules/notifications/dispatchers/SimpleNotification.h (modified) * code/trunk/src/modules/objects/Attacher.cc (modified) * code/trunk/src/modules/objects/Attacher.h (modified) * code/trunk/src/modules/objects/ForceField.cc (modified) * code/trunk/src/modules/objects/ForceField.h (modified) * code/trunk/src/modules/objects/Planet.cc (modified) * code/trunk/src/modules/objects/Planet.h (modified) * code/trunk/src/modules/objects/Script.cc (modified) * code/trunk/src/modules/objects/Script.h (modified) * code/trunk/src/modules/objects/SpaceBoundaries.cc (modified) * code/trunk/src/modules/objects/SpaceBoundaries.h (modified) * code/trunk/src/modules/objects/Turret.cc (modified) * code/trunk/src/modules/objects/Turret.h (modified) * code/trunk/src/modules/objects/collisionshapes/BoxCollisionShape.cc (modified) * code/trunk/src/modules/objects/collisionshapes/BoxCollisionShape.h (modified) * code/trunk/src/modules/objects/collisionshapes/ConeCollisionShape.cc (modified) * code/trunk/src/modules/objects/collisionshapes/ConeCollisionShape.h (modified) * code/trunk/src/modules/objects/collisionshapes/PlaneCollisionShape.cc (modified) * code/trunk/src/modules/objects/collisionshapes/PlaneCollisionShape.h (modified) * code/trunk/src/modules/objects/collisionshapes/SphereCollisionShape.cc (modified) * code/trunk/src/modules/objects/collisionshapes/SphereCollisionShape.h (modified) * code/trunk/src/modules/objects/eventsystem/EventDispatcher.cc (modified) * code/trunk/src/modules/objects/eventsystem/EventDispatcher.h (modified) * code/trunk/src/modules/objects/eventsystem/EventFilter.cc (modified) * code/trunk/src/modules/objects/eventsystem/EventFilter.h (modified) * code/trunk/src/modules/objects/eventsystem/EventListener.cc (modified) * code/trunk/src/modules/objects/eventsystem/EventListener.h (modified) * code/trunk/src/modules/objects/eventsystem/EventName.cc (modified) * code/trunk/src/modules/objects/eventsystem/EventName.h (modified) * code/trunk/src/modules/objects/eventsystem/EventTarget.cc (modified) * code/trunk/src/modules/objects/eventsystem/EventTarget.h (modified) * code/trunk/src/modules/objects/triggers/CheckPoint.cc (modified) * code/trunk/src/modules/objects/triggers/CheckPoint.h (modified) * code/trunk/src/modules/objects/triggers/DistanceMultiTrigger.cc (modified) * code/trunk/src/modules/objects/triggers/DistanceMultiTrigger.h (modified) * code/trunk/src/modules/objects/triggers/DistanceTrigger.cc (modified) * code/trunk/src/modules/objects/triggers/DistanceTrigger.h (modified) * code/trunk/src/modules/objects/triggers/DistanceTriggerBeacon.cc (modified) * code/trunk/src/modules/objects/triggers/DistanceTriggerBeacon.h (modified) * code/trunk/src/modules/objects/triggers/EventMultiTrigger.cc (modified) * code/trunk/src/modules/objects/triggers/EventMultiTrigger.h (modified) * code/trunk/src/modules/objects/triggers/EventTrigger.cc (modified) * code/trunk/src/modules/objects/triggers/EventTrigger.h (modified) * code/trunk/src/modules/objects/triggers/MultiTrigger.cc (modified) * code/trunk/src/modules/objects/triggers/MultiTrigger.h (modified) * code/trunk/src/modules/objects/triggers/MultiTriggerContainer.cc (modified) * code/trunk/src/modules/objects/triggers/MultiTriggerContainer.h (modified) * code/trunk/src/modules/objects/triggers/Trigger.cc (modified) * code/trunk/src/modules/objects/triggers/Trigger.h (modified) * code/trunk/src/modules/objects/triggers/TriggerBase.cc (modified) * code/trunk/src/modules/objects/triggers/TriggerBase.h (modified) * code/trunk/src/modules/overlays/FadeoutText.cc (modified) * code/trunk/src/modules/overlays/FadeoutText.h (modified) * code/trunk/src/modules/overlays/GUIOverlay.cc (modified) * code/trunk/src/modules/overlays/GUIOverlay.h (modified) * code/trunk/src/modules/overlays/OverlayText.cc (modified) * code/trunk/src/modules/overlays/OverlayText.h (modified) * code/trunk/src/modules/overlays/debugging/DebugFPSText.cc (modified) * code/trunk/src/modules/overlays/debugging/DebugFPSText.h (modified) * code/trunk/src/modules/overlays/debugging/DebugRTRText.cc (modified) * code/trunk/src/modules/overlays/debugging/DebugRTRText.h (modified) * code/trunk/src/modules/overlays/hud/AnnounceMessage.cc (modified) * code/trunk/src/modules/overlays/hud/AnnounceMessage.h (modified) * code/trunk/src/modules/overlays/hud/ChatOverlay.cc (modified) * code/trunk/src/modules/overlays/hud/ChatOverlay.h (modified) * code/trunk/src/modules/overlays/hud/DeathMessage.cc (modified) * code/trunk/src/modules/overlays/hud/DeathMessage.h (modified) * code/trunk/src/modules/overlays/hud/GametypeFadingMessage.cc (modified) * code/trunk/src/modules/overlays/hud/GametypeFadingMessage.h (modified) * code/trunk/src/modules/overlays/hud/GametypeStaticMessage.cc (modified) * code/trunk/src/modules/overlays/hud/GametypeStaticMessage.h (modified) * code/trunk/src/modules/overlays/hud/HUDBar.cc (modified) * code/trunk/src/modules/overlays/hud/HUDBar.h (modified) * code/trunk/src/modules/overlays/hud/HUDBoostBar.cc (modified) * code/trunk/src/modules/overlays/hud/HUDBoostBar.h (modified) * code/trunk/src/modules/overlays/hud/HUDEnemyHealthBar.cc (modified) * code/trunk/src/modules/overlays/hud/HUDEnemyHealthBar.h (modified) * code/trunk/src/modules/overlays/hud/HUDHealthBar.cc (modified) * code/trunk/src/modules/overlays/hud/HUDHealthBar.h (modified) * code/trunk/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/trunk/src/modules/overlays/hud/HUDNavigation.h (modified) * code/trunk/src/modules/overlays/hud/HUDRadar.cc (modified) * code/trunk/src/modules/overlays/hud/HUDRadar.h (modified) * code/trunk/src/modules/overlays/hud/HUDSpeedBar.cc (modified) * code/trunk/src/modules/overlays/hud/HUDSpeedBar.h (modified) * code/trunk/src/modules/overlays/hud/HUDTimer.cc (modified) * code/trunk/src/modules/overlays/hud/HUDTimer.h (modified) * code/trunk/src/modules/overlays/hud/KillMessage.cc (modified) * code/trunk/src/modules/overlays/hud/KillMessage.h (modified) * code/trunk/src/modules/overlays/hud/LastManStandingInfos.cc (modified) * code/trunk/src/modules/overlays/hud/LastManStandingInfos.h (modified) * code/trunk/src/modules/overlays/hud/LastTeamStandingInfos.cc (modified) * code/trunk/src/modules/overlays/hud/LastTeamStandingInfos.h (modified) * code/trunk/src/modules/overlays/hud/PauseNotice.cc (modified) * code/trunk/src/modules/overlays/hud/PauseNotice.h (modified) * code/trunk/src/modules/overlays/hud/TeamBaseMatchScore.cc (modified) * code/trunk/src/modules/overlays/hud/TeamBaseMatchScore.h (modified) * code/trunk/src/modules/overlays/stats/Scoreboard.cc (modified) * code/trunk/src/modules/overlays/stats/Scoreboard.h (modified) * code/trunk/src/modules/overlays/stats/Stats.cc (modified) * code/trunk/src/modules/overlays/stats/Stats.h (modified) * code/trunk/src/modules/pickup/CollectiblePickup.cc (modified) * code/trunk/src/modules/pickup/Pickup.cc (modified) * code/trunk/src/modules/pickup/Pickup.h (modified) * code/trunk/src/modules/pickup/PickupCollection.cc (modified) * code/trunk/src/modules/pickup/PickupCollection.h (modified) * code/trunk/src/modules/pickup/PickupManager.cc (modified) * code/trunk/src/modules/pickup/PickupManager.h (modified) * code/trunk/src/modules/pickup/PickupRepresentation.cc (modified) * code/trunk/src/modules/pickup/PickupRepresentation.h (modified) * code/trunk/src/modules/pickup/PickupSpawner.cc (modified) * code/trunk/src/modules/pickup/PickupSpawner.h (modified) * code/trunk/src/modules/pickup/items/DamageBoostPickup.cc (modified) * code/trunk/src/modules/pickup/items/DamageBoostPickup.h (modified) * code/trunk/src/modules/pickup/items/DronePickup.cc (modified) * code/trunk/src/modules/pickup/items/DronePickup.h (modified) * code/trunk/src/modules/pickup/items/HealthPickup.cc (modified) * code/trunk/src/modules/pickup/items/HealthPickup.h (modified) * code/trunk/src/modules/pickup/items/InvisiblePickup.cc (modified) * code/trunk/src/modules/pickup/items/InvisiblePickup.h (modified) * code/trunk/src/modules/pickup/items/MetaPickup.cc (modified) * code/trunk/src/modules/pickup/items/MetaPickup.h (modified) * code/trunk/src/modules/pickup/items/ShieldPickup.cc (modified) * code/trunk/src/modules/pickup/items/ShieldPickup.h (modified) * code/trunk/src/modules/pickup/items/ShrinkPickup.cc (modified) * code/trunk/src/modules/pickup/items/ShrinkPickup.h (modified) * code/trunk/src/modules/pickup/items/SpeedPickup.cc (modified) * code/trunk/src/modules/pickup/items/SpeedPickup.h (modified) * code/trunk/src/modules/pong/Pong.cc (modified) * code/trunk/src/modules/pong/Pong.h (modified) * code/trunk/src/modules/pong/PongAI.cc (modified) * code/trunk/src/modules/pong/PongAI.h (modified) * code/trunk/src/modules/pong/PongBall.cc (modified) * code/trunk/src/modules/pong/PongBall.h (modified) * code/trunk/src/modules/pong/PongBat.cc (modified) * code/trunk/src/modules/pong/PongBat.h (modified) * code/trunk/src/modules/pong/PongBot.cc (modified) * code/trunk/src/modules/pong/PongBot.h (modified) * code/trunk/src/modules/pong/PongCenterpoint.cc (modified) * code/trunk/src/modules/pong/PongCenterpoint.h (modified) * code/trunk/src/modules/pong/PongScore.cc (modified) * code/trunk/src/modules/pong/PongScore.h (modified) * code/trunk/src/modules/portals/PortalEndPoint.cc (modified) * code/trunk/src/modules/portals/PortalEndPoint.h (modified) * code/trunk/src/modules/portals/PortalLink.cc (modified) * code/trunk/src/modules/portals/PortalLink.h (modified) * code/trunk/src/modules/questsystem/GlobalQuest.cc (modified) * code/trunk/src/modules/questsystem/GlobalQuest.h (modified) * code/trunk/src/modules/questsystem/LocalQuest.cc (modified) * code/trunk/src/modules/questsystem/LocalQuest.h (modified) * code/trunk/src/modules/questsystem/Quest.cc (modified) * code/trunk/src/modules/questsystem/Quest.h (modified) * code/trunk/src/modules/questsystem/QuestDescription.cc (modified) * code/trunk/src/modules/questsystem/QuestDescription.h (modified) * code/trunk/src/modules/questsystem/QuestEffect.cc (modified) * code/trunk/src/modules/questsystem/QuestEffect.h (modified) * code/trunk/src/modules/questsystem/QuestEffectBeacon.cc (modified) * code/trunk/src/modules/questsystem/QuestEffectBeacon.h (modified) * code/trunk/src/modules/questsystem/QuestHint.cc (modified) * code/trunk/src/modules/questsystem/QuestHint.h (modified) * code/trunk/src/modules/questsystem/QuestItem.cc (modified) * code/trunk/src/modules/questsystem/QuestItem.h (modified) * code/trunk/src/modules/questsystem/QuestListener.cc (modified) * code/trunk/src/modules/questsystem/QuestListener.h (modified) * code/trunk/src/modules/questsystem/QuestManager.cc (modified) * code/trunk/src/modules/questsystem/QuestManager.h (modified) * code/trunk/src/modules/questsystem/effects/AddQuest.cc (modified) * code/trunk/src/modules/questsystem/effects/AddQuest.h (modified) * code/trunk/src/modules/questsystem/effects/AddQuestHint.cc (modified) * code/trunk/src/modules/questsystem/effects/AddQuestHint.h (modified) * code/trunk/src/modules/questsystem/effects/AddReward.cc (modified) * code/trunk/src/modules/questsystem/effects/AddReward.h (modified) * code/trunk/src/modules/questsystem/effects/ChangeQuestStatus.cc (modified) * code/trunk/src/modules/questsystem/effects/ChangeQuestStatus.h (modified) * code/trunk/src/modules/questsystem/effects/CompleteQuest.cc (modified) * code/trunk/src/modules/questsystem/effects/CompleteQuest.h (modified) * code/trunk/src/modules/questsystem/effects/FailQuest.cc (modified) * code/trunk/src/modules/questsystem/effects/FailQuest.h (modified) * code/trunk/src/modules/tetris/Tetris.cc (modified) * code/trunk/src/modules/tetris/Tetris.h (modified) * code/trunk/src/modules/tetris/TetrisBrick.cc (modified) * code/trunk/src/modules/tetris/TetrisBrick.h (modified) * code/trunk/src/modules/tetris/TetrisCenterpoint.cc (modified) * code/trunk/src/modules/tetris/TetrisCenterpoint.h (modified) * code/trunk/src/modules/tetris/TetrisScore.cc (modified) * code/trunk/src/modules/tetris/TetrisScore.h (modified) * code/trunk/src/modules/tetris/TetrisStone.cc (modified) * code/trunk/src/modules/tetris/TetrisStone.h (modified) * code/trunk/src/modules/towerdefense/Tower.cc (modified) * code/trunk/src/modules/towerdefense/Tower.h (modified) * code/trunk/src/modules/towerdefense/TowerDefense.cc (modified) * code/trunk/src/modules/towerdefense/TowerDefense.h (modified) * code/trunk/src/modules/towerdefense/TowerDefenseCenterpoint.cc (modified) * code/trunk/src/modules/towerdefense/TowerDefenseCenterpoint.h (modified) * code/trunk/src/modules/towerdefense/TowerDefenseController.cc (modified) * code/trunk/src/modules/towerdefense/TowerDefenseController.h (modified) * code/trunk/src/modules/towerdefense/TowerDefenseHUDController.cc (modified) * code/trunk/src/modules/towerdefense/TowerDefenseHUDController.h (modified) * code/trunk/src/modules/weapons/MuzzleFlash.cc (modified) * code/trunk/src/modules/weapons/MuzzleFlash.h (modified) * code/trunk/src/modules/weapons/RocketController.cc (modified) * code/trunk/src/modules/weapons/RocketController.h (modified) * code/trunk/src/modules/weapons/munitions/FusionMunition.cc (modified) * code/trunk/src/modules/weapons/munitions/FusionMunition.h (modified) * code/trunk/src/modules/weapons/munitions/LaserMunition.cc (modified) * code/trunk/src/modules/weapons/munitions/LaserMunition.h (modified) * code/trunk/src/modules/weapons/munitions/ReplenishingMunition.cc (modified) * code/trunk/src/modules/weapons/munitions/ReplenishingMunition.h (modified) * code/trunk/src/modules/weapons/munitions/RocketMunition.cc (modified) * code/trunk/src/modules/weapons/munitions/RocketMunition.h (modified) * code/trunk/src/modules/weapons/projectiles/BasicProjectile.cc (modified) * code/trunk/src/modules/weapons/projectiles/BasicProjectile.h (modified) * code/trunk/src/modules/weapons/projectiles/BillboardProjectile.cc (modified) * code/trunk/src/modules/weapons/projectiles/BillboardProjectile.h (modified) * code/trunk/src/modules/weapons/projectiles/LightningGunProjectile.cc (modified) * code/trunk/src/modules/weapons/projectiles/LightningGunProjectile.h (modified) * code/trunk/src/modules/weapons/projectiles/ParticleProjectile.cc (modified) * code/trunk/src/modules/weapons/projectiles/ParticleProjectile.h (modified) * code/trunk/src/modules/weapons/projectiles/Projectile.cc (modified) * code/trunk/src/modules/weapons/projectiles/Projectile.h (modified) * code/trunk/src/modules/weapons/projectiles/Rocket.cc (modified) * code/trunk/src/modules/weapons/projectiles/Rocket.h (modified) * code/trunk/src/modules/weapons/projectiles/SimpleRocket.cc (modified) * code/trunk/src/modules/weapons/projectiles/SimpleRocket.h (modified) * code/trunk/src/modules/weapons/weaponmodes/EnergyDrink.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/EnergyDrink.h (modified) * code/trunk/src/modules/weapons/weaponmodes/FusionFire.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/FusionFire.h (modified) * code/trunk/src/modules/weapons/weaponmodes/HsW01.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/HsW01.h (modified) * code/trunk/src/modules/weapons/weaponmodes/LaserFire.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/LaserFire.h (modified) * code/trunk/src/modules/weapons/weaponmodes/LightningGun.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/LightningGun.h (modified) * code/trunk/src/modules/weapons/weaponmodes/RocketFire.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/RocketFire.h (modified) * code/trunk/src/modules/weapons/weaponmodes/SimpleRocketFire.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/SimpleRocketFire.h (modified) * code/trunk/src/orxonox/CameraManager.cc (modified) * code/trunk/src/orxonox/CameraManager.h (modified) * code/trunk/src/orxonox/Level.cc (modified) * code/trunk/src/orxonox/Level.h (modified) * code/trunk/src/orxonox/LevelInfo.cc (modified) * code/trunk/src/orxonox/LevelInfo.h (modified) * code/trunk/src/orxonox/LevelManager.cc (modified) * code/trunk/src/orxonox/LevelManager.h (modified) * code/trunk/src/orxonox/Main.cc (modified) * code/trunk/src/orxonox/MoodManager.cc (modified) * code/trunk/src/orxonox/MoodManager.h (modified) * code/trunk/src/orxonox/PawnManager.cc (modified) * code/trunk/src/orxonox/PlayerManager.cc (modified) * code/trunk/src/orxonox/Radar.cc (modified) * code/trunk/src/orxonox/Radar.h (modified) * code/trunk/src/orxonox/Scene.cc (modified) * code/trunk/src/orxonox/Scene.h (modified) * code/trunk/src/orxonox/Test.cc (modified) * code/trunk/src/orxonox/Test.h (modified) * code/trunk/src/orxonox/chat/ChatHistory.cc (modified) * code/trunk/src/orxonox/chat/ChatListener.h (modified) * code/trunk/src/orxonox/chat/ChatManager.cc (modified) * code/trunk/src/orxonox/collisionshapes/CollisionShape.cc (modified) * code/trunk/src/orxonox/collisionshapes/CollisionShape.h (modified) * code/trunk/src/orxonox/collisionshapes/CompoundCollisionShape.cc (modified) * code/trunk/src/orxonox/collisionshapes/CompoundCollisionShape.h (modified) * code/trunk/src/orxonox/collisionshapes/WorldEntityCollisionShape.cc (modified) * code/trunk/src/orxonox/collisionshapes/WorldEntityCollisionShape.h (modified) * code/trunk/src/orxonox/controllers/AIController.cc (modified) * code/trunk/src/orxonox/controllers/AIController.h (modified) * code/trunk/src/orxonox/controllers/ArtificialController.cc (modified) * code/trunk/src/orxonox/controllers/ArtificialController.h (modified) * code/trunk/src/orxonox/controllers/Controller.cc (modified) * code/trunk/src/orxonox/controllers/Controller.h (modified) * code/trunk/src/orxonox/controllers/DroneController.cc (modified) * code/trunk/src/orxonox/controllers/DroneController.h (modified) * code/trunk/src/orxonox/controllers/FormationController.cc (modified) * code/trunk/src/orxonox/controllers/FormationController.h (modified) * code/trunk/src/orxonox/controllers/HumanController.cc (modified) * code/trunk/src/orxonox/controllers/HumanController.h (modified) * code/trunk/src/orxonox/controllers/NewHumanController.cc (modified) * code/trunk/src/orxonox/controllers/NewHumanController.h (modified) * code/trunk/src/orxonox/controllers/ScriptController.cc (modified) * code/trunk/src/orxonox/controllers/ScriptController.h (modified) * code/trunk/src/orxonox/controllers/WaypointController.cc (modified) * code/trunk/src/orxonox/controllers/WaypointController.h (modified) * code/trunk/src/orxonox/controllers/WaypointPatrolController.cc (modified) * code/trunk/src/orxonox/controllers/WaypointPatrolController.h (modified) * code/trunk/src/orxonox/gamestates/GSClient.cc (modified) * code/trunk/src/orxonox/gamestates/GSLevel.h (modified) * code/trunk/src/orxonox/gamestates/GSMainMenu.cc (modified) * code/trunk/src/orxonox/gamestates/GSMainMenu.h (modified) * code/trunk/src/orxonox/gamestates/GSServer.cc (modified) * code/trunk/src/orxonox/gametypes/Asteroids.cc (modified) * code/trunk/src/orxonox/gametypes/Asteroids.h (modified) * code/trunk/src/orxonox/gametypes/Deathmatch.cc (modified) * code/trunk/src/orxonox/gametypes/Deathmatch.h (modified) * code/trunk/src/orxonox/gametypes/Dynamicmatch.cc (modified) * code/trunk/src/orxonox/gametypes/Dynamicmatch.h (modified) * code/trunk/src/orxonox/gametypes/Gametype.cc (modified) * code/trunk/src/orxonox/gametypes/Gametype.h (modified) * code/trunk/src/orxonox/gametypes/LastManStanding.cc (modified) * code/trunk/src/orxonox/gametypes/LastManStanding.h (modified) * code/trunk/src/orxonox/gametypes/LastTeamStanding.cc (modified) * code/trunk/src/orxonox/gametypes/LastTeamStanding.h (modified) * code/trunk/src/orxonox/gametypes/Mission.cc (modified) * code/trunk/src/orxonox/gametypes/Mission.h (modified) * code/trunk/src/orxonox/gametypes/TeamBaseMatch.cc (modified) * code/trunk/src/orxonox/gametypes/TeamBaseMatch.h (modified) * code/trunk/src/orxonox/gametypes/TeamDeathmatch.cc (modified) * code/trunk/src/orxonox/gametypes/TeamDeathmatch.h (modified) * code/trunk/src/orxonox/gametypes/TeamGametype.cc (modified) * code/trunk/src/orxonox/gametypes/TeamGametype.h (modified) * code/trunk/src/orxonox/gametypes/UnderAttack.cc (modified) * code/trunk/src/orxonox/gametypes/UnderAttack.h (modified) * code/trunk/src/orxonox/graphics/AnimatedModel.cc (modified) * code/trunk/src/orxonox/graphics/AnimatedModel.h (modified) * code/trunk/src/orxonox/graphics/Backlight.cc (modified) * code/trunk/src/orxonox/graphics/Backlight.h (modified) * code/trunk/src/orxonox/graphics/Billboard.cc (modified) * code/trunk/src/orxonox/graphics/Billboard.h (modified) * code/trunk/src/orxonox/graphics/BlinkingBillboard.cc (modified) * code/trunk/src/orxonox/graphics/BlinkingBillboard.h (modified) * code/trunk/src/orxonox/graphics/Camera.cc (modified) * code/trunk/src/orxonox/graphics/Camera.h (modified) * code/trunk/src/orxonox/graphics/FadingBillboard.cc (modified) * code/trunk/src/orxonox/graphics/FadingBillboard.h (modified) * code/trunk/src/orxonox/graphics/GlobalShader.cc (modified) * code/trunk/src/orxonox/graphics/GlobalShader.h (modified) * code/trunk/src/orxonox/graphics/Light.cc (modified) * code/trunk/src/orxonox/graphics/Light.h (modified) * code/trunk/src/orxonox/graphics/MeshLodInformation.cc (modified) * code/trunk/src/orxonox/graphics/MeshLodInformation.h (modified) * code/trunk/src/orxonox/graphics/Model.cc (modified) * code/trunk/src/orxonox/graphics/Model.h (modified) * code/trunk/src/orxonox/graphics/ParticleEmitter.cc (modified) * code/trunk/src/orxonox/graphics/ParticleEmitter.h (modified) * code/trunk/src/orxonox/graphics/ParticleSpawner.cc (modified) * code/trunk/src/orxonox/graphics/ParticleSpawner.h (modified) * code/trunk/src/orxonox/infos/Bot.cc (modified) * code/trunk/src/orxonox/infos/Bot.h (modified) * code/trunk/src/orxonox/infos/GametypeInfo.cc (modified) * code/trunk/src/orxonox/infos/GametypeInfo.h (modified) * code/trunk/src/orxonox/infos/HumanPlayer.cc (modified) * code/trunk/src/orxonox/infos/HumanPlayer.h (modified) * code/trunk/src/orxonox/infos/Info.cc (modified) * code/trunk/src/orxonox/infos/Info.h (modified) * code/trunk/src/orxonox/infos/PlayerInfo.cc (modified) * code/trunk/src/orxonox/infos/PlayerInfo.h (modified) * code/trunk/src/orxonox/interfaces/GametypeMessageListener.h (modified) * code/trunk/src/orxonox/interfaces/InterfaceCompilation.cc (modified) * code/trunk/src/orxonox/interfaces/NotificationListener.cc (modified) * code/trunk/src/orxonox/interfaces/NotificationListener.h (modified) * code/trunk/src/orxonox/interfaces/PickupCarrier.cc (modified) * code/trunk/src/orxonox/interfaces/PickupCarrier.h (modified) * code/trunk/src/orxonox/interfaces/PickupListener.cc (modified) * code/trunk/src/orxonox/interfaces/PickupListener.h (modified) * code/trunk/src/orxonox/interfaces/Pickupable.cc (modified) * code/trunk/src/orxonox/interfaces/Pickupable.h (modified) * code/trunk/src/orxonox/interfaces/PlayerTrigger.h (modified) * code/trunk/src/orxonox/interfaces/RadarListener.h (modified) * code/trunk/src/orxonox/interfaces/RadarViewable.cc (modified) * code/trunk/src/orxonox/interfaces/RadarViewable.h (modified) * code/trunk/src/orxonox/interfaces/Rewardable.h (modified) * code/trunk/src/orxonox/interfaces/TeamColourable.h (modified) * code/trunk/src/orxonox/items/Engine.cc (modified) * code/trunk/src/orxonox/items/Engine.h (modified) * code/trunk/src/orxonox/items/Item.cc (modified) * code/trunk/src/orxonox/items/Item.h (modified) * code/trunk/src/orxonox/items/MultiStateEngine.cc (modified) * code/trunk/src/orxonox/items/MultiStateEngine.h (modified) * code/trunk/src/orxonox/overlays/GUISheet.cc (modified) * code/trunk/src/orxonox/overlays/GUISheet.h (modified) * code/trunk/src/orxonox/overlays/InGameConsole.cc (modified) * code/trunk/src/orxonox/overlays/OrxonoxOverlay.cc (modified) * code/trunk/src/orxonox/overlays/OrxonoxOverlay.h (modified) * code/trunk/src/orxonox/overlays/OverlayGroup.cc (modified) * code/trunk/src/orxonox/overlays/OverlayGroup.h (modified) * code/trunk/src/orxonox/sound/BaseSound.cc (modified) * code/trunk/src/orxonox/sound/BaseSound.h (modified) * code/trunk/src/orxonox/sound/SoundManager.cc (modified) * code/trunk/src/orxonox/sound/SoundManager.h (modified) * code/trunk/src/orxonox/sound/WorldAmbientSound.cc (modified) * code/trunk/src/orxonox/sound/WorldAmbientSound.h (modified) * code/trunk/src/orxonox/sound/WorldSound.cc (modified) * code/trunk/src/orxonox/sound/WorldSound.h (modified) * code/trunk/src/orxonox/weaponsystem/DefaultWeaponmodeLink.cc (modified) * code/trunk/src/orxonox/weaponsystem/DefaultWeaponmodeLink.h (modified) * code/trunk/src/orxonox/weaponsystem/Munition.cc (modified) * code/trunk/src/orxonox/weaponsystem/Munition.h (modified) * code/trunk/src/orxonox/weaponsystem/Weapon.cc (modified) * code/trunk/src/orxonox/weaponsystem/Weapon.h (modified) * code/trunk/src/orxonox/weaponsystem/WeaponMode.cc (modified) * code/trunk/src/orxonox/weaponsystem/WeaponMode.h (modified) * code/trunk/src/orxonox/weaponsystem/WeaponPack.cc (modified) * code/trunk/src/orxonox/weaponsystem/WeaponPack.h (modified) * code/trunk/src/orxonox/weaponsystem/WeaponSet.cc (modified) * code/trunk/src/orxonox/weaponsystem/WeaponSet.h (modified) * code/trunk/src/orxonox/weaponsystem/WeaponSlot.cc (modified) * code/trunk/src/orxonox/weaponsystem/WeaponSlot.h (modified) * code/trunk/src/orxonox/weaponsystem/WeaponSystem.cc (modified) * code/trunk/src/orxonox/weaponsystem/WeaponSystem.h (modified) * code/trunk/src/orxonox/worldentities/BigExplosion.cc (modified) * code/trunk/src/orxonox/worldentities/BigExplosion.h (modified) * code/trunk/src/orxonox/worldentities/CameraPosition.cc (modified) * code/trunk/src/orxonox/worldentities/CameraPosition.h (modified) * code/trunk/src/orxonox/worldentities/ControllableEntity.cc (modified) * code/trunk/src/orxonox/worldentities/ControllableEntity.h (modified) * code/trunk/src/orxonox/worldentities/Drone.cc (modified) * code/trunk/src/orxonox/worldentities/Drone.h (modified) * code/trunk/src/orxonox/worldentities/EffectContainer.cc (modified) * code/trunk/src/orxonox/worldentities/EffectContainer.h (modified) * code/trunk/src/orxonox/worldentities/ExplosionChunk.cc (modified) * code/trunk/src/orxonox/worldentities/ExplosionChunk.h (modified) * code/trunk/src/orxonox/worldentities/MobileEntity.cc (modified) * code/trunk/src/orxonox/worldentities/MobileEntity.h (modified) * code/trunk/src/orxonox/worldentities/MovableEntity.cc (modified) * code/trunk/src/orxonox/worldentities/MovableEntity.h (modified) * code/trunk/src/orxonox/worldentities/SpawnPoint.cc (modified) * code/trunk/src/orxonox/worldentities/SpawnPoint.h (modified) * code/trunk/src/orxonox/worldentities/StaticEntity.cc (modified) * code/trunk/src/orxonox/worldentities/StaticEntity.h (modified) * code/trunk/src/orxonox/worldentities/TeamSpawnPoint.cc (modified) * code/trunk/src/orxonox/worldentities/TeamSpawnPoint.h (modified) * code/trunk/src/orxonox/worldentities/WorldEntity.cc (modified) * code/trunk/src/orxonox/worldentities/WorldEntity.h (modified) * code/trunk/src/orxonox/worldentities/pawns/Destroyer.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/Destroyer.h (modified) * code/trunk/src/orxonox/worldentities/pawns/FpsPlayer.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/FpsPlayer.h (modified) * code/trunk/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/Pawn.h (modified) * code/trunk/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/SpaceShip.h (modified) * code/trunk/src/orxonox/worldentities/pawns/Spectator.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/Spectator.h (modified) * code/trunk/src/orxonox/worldentities/pawns/TeamBaseMatchBase.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/TeamBaseMatchBase.h (modified) * code/trunk/test/CMakeLists.txt (modified) * code/trunk/test/core (copied) merged core6 back to trunk Tue, 12 Mar 2013 22:13:03 GMT landauf [9550] * code/trunk (modified) * code/trunk/CMakeLists.txt (modified) * code/trunk/cmake/tools/TargetUtilities.cmake (modified) * code/trunk/src/CMakeLists.txt (modified) * code/trunk/src/SourceConfig.cmake (copied) * code/trunk/src/external/CMakeLists.txt (modified) * code/trunk/src/external/gmock (copied) * code/trunk/src/external/gtest (copied) * code/trunk/src/libraries/core/CommandLineParser.cc (modified) * code/trunk/src/libraries/core/CommandLineParser.h (modified) * code/trunk/src/libraries/core/ConfigValueContainer.cc (modified) * code/trunk/src/libraries/core/Core.cc (modified) * code/trunk/src/libraries/core/PathConfig.cc (modified) * code/trunk/src/libraries/core/command/CommandEvaluation.cc (modified) * code/trunk/src/libraries/core/command/CommandExecutor.cc (modified) * code/trunk/src/libraries/core/command/ConsoleCommand.h (modified) * code/trunk/src/libraries/core/command/Executor.cc (modified) * code/trunk/src/libraries/core/command/Executor.h (modified) * code/trunk/src/libraries/core/command/Functor.h (modified) * code/trunk/src/libraries/core/command/IOConsolePOSIX.cc (modified) * code/trunk/src/libraries/core/command/IOConsoleWindows.cc (modified) * code/trunk/src/libraries/core/command/Shell.cc (modified) * code/trunk/src/libraries/core/command/TclBind.cc (modified) * code/trunk/src/libraries/core/input/InputManager.cc (modified) * code/trunk/src/libraries/network/Client.cc (modified) * code/trunk/src/libraries/tools/Shader.cc (modified) * code/trunk/src/libraries/tools/Shader.h (modified) * code/trunk/src/libraries/util/Math.h (modified) * code/trunk/src/libraries/util/MultiType.cc (modified) * code/trunk/src/libraries/util/MultiType.h (modified) * code/trunk/src/libraries/util/MultiTypeValue.h (modified) * code/trunk/src/libraries/util/SignalHandler.cc (modified) * code/trunk/src/libraries/util/SignalHandler.h (modified) * code/trunk/src/libraries/util/StringUtils.cc (modified) * code/trunk/src/libraries/util/StringUtils.h (modified) * code/trunk/src/libraries/util/SubString.cc (modified) * code/trunk/src/libraries/util/SubString.h (modified) * code/trunk/src/libraries/util/UtilPrereqs.h (modified) * code/trunk/src/libraries/util/VA_NARGS.h (modified) * code/trunk/src/libraries/util/output/AdditionalContextListener.h (copied) * code/trunk/src/libraries/util/output/ConsoleWriter.cc (modified) * code/trunk/src/libraries/util/output/ConsoleWriter.h (modified) * code/trunk/src/libraries/util/output/LogWriter.cc (modified) * code/trunk/src/libraries/util/output/LogWriter.h (modified) * code/trunk/src/libraries/util/output/MemoryWriter.cc (modified) * code/trunk/src/libraries/util/output/MemoryWriter.h (modified) * code/trunk/src/libraries/util/output/OutputDefinitions.h (modified) * code/trunk/src/libraries/util/output/OutputListener.cc (modified) * code/trunk/src/libraries/util/output/OutputListener.h (modified) * code/trunk/src/libraries/util/output/OutputManager.cc (modified) * code/trunk/src/libraries/util/output/OutputManager.h (modified) * code/trunk/src/libraries/util/output/OutputStream.h (modified) * code/trunk/src/libraries/util/output/SubcontextOutputListener.h (modified) * code/trunk/src/modules/notifications/dispatchers/CommandNotification.cc (modified) * code/trunk/src/orxonox-main.vcproj.user.in (deleted) * code/trunk/src/orxonox-main.vcxproj.user.in (deleted) * code/trunk/src/orxonox/LevelManager.cc (modified) * code/trunk/src/orxonox/Main.cc (modified) * code/trunk/src/orxonox/graphics/ParticleEmitter.cc (modified) * code/trunk/src/orxonox/overlays/InGameConsole.cc (modified) * code/trunk/src/template.vcproj.user.in (copied) * code/trunk/src/template.vcxproj.user.in (copied) * code/trunk/test (copied) merged testing branch back to trunk. unbelievable it took me 13 ... Tue, 19 Feb 2013 09:25:42 GMT jo [9526] * code/trunk (modified) * code/trunk/data/defaultConfig/keybindings.ini (modified) * code/trunk/data/levels/bigshipPresentation.oxw (copied) * code/trunk/data/levels/collateralDamageDemo.oxw (copied) * code/trunk/data/levels/gallery.oxw (modified) * code/trunk/data/levels/includes/weaponSettingsCollateral.oxi (copied) * code/trunk/data/levels/includes/weaponSettingsEscort.oxi (modified) * code/trunk/data/levels/includes/weaponSettingsTurret.oxi (copied) * code/trunk/data/levels/includes/weaponSettingsbigship.oxi (copied) * code/trunk/data/levels/pong.oxw (modified) * code/trunk/data/levels/presentationHS12.oxw (copied) * code/trunk/data/levels/templates/bigship.oxt (copied) * code/trunk/data/levels/templates/lodInformation.oxt (modified) * code/trunk/data/levels/templates/spaceshipCollateralDamage.oxt (copied) * code/trunk/data/levels/templates/spaceshipEscort.oxt (modified) * code/trunk/data/levels/templates/spaceshipTurret.oxt (copied) * code/trunk/data/levels/turretTest.oxw (copied) * code/trunk/data/overlays/HUD.oxo (modified) * code/trunk/data/overlays/HUDTemplates3.oxo (modified) * code/trunk/src/modules/gametypes/CMakeLists.txt (modified) * code/trunk/src/modules/gametypes/GametypesPrereqs.h (modified) * code/trunk/src/modules/gametypes/RaceCheckPoint.cc (modified) * code/trunk/src/modules/gametypes/RaceCheckPoint.h (modified) * code/trunk/src/modules/gametypes/SpaceRace.cc (modified) * code/trunk/src/modules/gametypes/SpaceRaceBot.cc (copied) * code/trunk/src/modules/gametypes/SpaceRaceBot.h (copied) * code/trunk/src/modules/gametypes/SpaceRaceController.cc (copied) * code/trunk/src/modules/gametypes/SpaceRaceController.h (copied) * code/trunk/src/modules/gametypes/SpaceRaceManager.cc (modified) * code/trunk/src/modules/gametypes/SpaceRaceManager.h (modified) * code/trunk/src/modules/objects/CMakeLists.txt (modified) * code/trunk/src/modules/objects/ObjectsPrereqs.h (modified) * code/trunk/src/modules/objects/Turret.cc (copied) * code/trunk/src/modules/objects/Turret.h (copied) * code/trunk/src/modules/overlays/OverlaysPrereqs.h (modified) * code/trunk/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/trunk/src/modules/overlays/hud/HUDNavigation.h (modified) * code/trunk/src/modules/portals/PortalEndPoint.cc (modified) * code/trunk/src/modules/portals/PortalEndPoint.h (modified) * code/trunk/src/modules/weapons/weaponmodes/HsW01.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/HsW01.h (modified) * code/trunk/src/orxonox/interfaces/RadarViewable.cc (modified) * code/trunk/src/orxonox/interfaces/RadarViewable.h (modified) Merging presentationHS12 back to the trunk. Thu, 30 Aug 2012 21:08:17 GMT landauf [9348] * code/trunk (modified) * code/trunk/cmake/tools/BuildUnits.cmake (modified) * code/trunk/data/gui/layouts/GUILayout.xsd (modified) * code/trunk/data/gui/layouts/InGamePickupHUD.layout (modified) * code/trunk/data/gui/layouts/ShipSelectionMenu.layout (copied) * code/trunk/data/gui/layouts/SingleplayerConfigMenu.layout (modified) * code/trunk/data/gui/scripts/AudioMenu.lua (modified) * code/trunk/data/gui/scripts/PickupInventory.lua (modified) * code/trunk/data/gui/scripts/ShipSelectionMenu.lua (copied) * code/trunk/data/gui/scripts/SingleplayerConfigMenu.lua (modified) * code/trunk/data/gui/scripts/SingleplayerMenu.lua (modified) * code/trunk/data/levels/FPSTest.oxw (modified) * code/trunk/data/levels/Spacerace2.oxw (modified) * code/trunk/data/levels/SurfaceRacePresentation.oxw (copied) * code/trunk/data/levels/asteroidField.oxw (modified) * code/trunk/data/levels/asteroids.oxw (modified) * code/trunk/data/levels/docking.oxw (modified) * code/trunk/data/levels/dynamicMatch.oxw (modified) * code/trunk/data/levels/events.oxw (modified) * code/trunk/data/levels/fightInOurBack.oxw (modified) * code/trunk/data/levels/includes/CuboidSpaceStation.lua (modified) * code/trunk/data/levels/includes/asteroidField.lua (modified) * code/trunk/data/levels/includes/pickups.oxi (modified) * code/trunk/data/levels/includes/towerWeaponSettings.oxi (copied) * code/trunk/data/levels/includes/weaponSettingsFPS.oxi (modified) * code/trunk/data/levels/includes/weaponSettingsSpacecruiser.oxi (modified) * code/trunk/data/levels/lastManStanding.oxw (modified) * code/trunk/data/levels/lastTeamStanding.oxw (modified) * code/trunk/data/levels/lastTeamStandingII.oxw (modified) * code/trunk/data/levels/missionOne.oxw (modified) * code/trunk/data/levels/notifications.oxw (modified) * code/trunk/data/levels/old/CuboidSpaceStation.oxw (modified) * code/trunk/data/levels/old/presentationPhysics.oxw (modified) * code/trunk/data/levels/old/princessAeryn.oxw (modified) * code/trunk/data/levels/pickups.oxw (modified) * code/trunk/data/levels/pirateAttack.oxw (modified) * code/trunk/data/levels/planets.oxw (modified) * code/trunk/data/levels/pong.oxw (modified) * code/trunk/data/levels/portals.oxw (modified) * code/trunk/data/levels/presentation09.oxw (modified) * code/trunk/data/levels/presentation09b.oxw (modified) * code/trunk/data/levels/presentationDM.oxw (modified) * code/trunk/data/levels/presentationFS10.oxw (modified) * code/trunk/data/levels/presentationFS102.oxw (modified) * code/trunk/data/levels/presentationFS10Ed.oxw (modified) * code/trunk/data/levels/presentationFS11.oxw (modified) * code/trunk/data/levels/presentationHS09.oxw (modified) * code/trunk/data/levels/presentationHS11.oxw (modified) * code/trunk/data/levels/princessAeryn.oxw (modified) * code/trunk/data/levels/screenshot.oxw (modified) * code/trunk/data/levels/surfaceRace.oxw (copied) * code/trunk/data/levels/teamBaseMatch.oxw (modified) * code/trunk/data/levels/teamDeathMatch.oxw (modified) * code/trunk/data/levels/templates/FPS.oxt (modified) * code/trunk/data/levels/templates/pickupRepresentationTemplates.oxt (modified) * code/trunk/data/levels/templates/spaceshipRace.oxt (copied) * code/trunk/data/levels/templates/spaceshipSpacecruiser.oxt (modified) * code/trunk/data/levels/templates/tower.oxt (copied) * code/trunk/data/levels/testStars.oxw (modified) * code/trunk/data/levels/testSwallow.oxw (modified) * code/trunk/data/levels/tetris.oxw (modified) * code/trunk/data/levels/theTimeMachine.oxw (modified) * code/trunk/data/levels/towerDefense.oxw (copied) * code/trunk/data/levels/tutorial.oxw (modified) * code/trunk/data/levels/underAttack.oxw (modified) * code/trunk/data/levels/waypoints.oxw (modified) * code/trunk/data/overlays/dynamicMatchHUD.oxo (modified) * code/trunk/data/overlays/lastManStandingHUD.oxo (modified) * code/trunk/data/overlays/lastTeamStandingHUD.oxo (modified) * code/trunk/data/overlays/tetrisHUD.oxo (copied) * code/trunk/data/overlays/towerdefenseHUD.oxo (copied) * code/trunk/data/overlays/underAttackHUD.oxo (deleted) * code/trunk/data/particle/smoke1.particle (deleted) * code/trunk/doc/api/groups/Portals.dox (modified) * code/trunk/doc/api/groups/Weapons.dox (modified) * code/trunk/src/BuildUnitsConfigGCC.cmake (modified) * code/trunk/src/BuildUnitsConfigMSVC.cmake (modified) * code/trunk/src/external/enet/VERSION (modified) * code/trunk/src/external/tolua/README_ORXONOX (modified) * code/trunk/src/libraries/core/Super.h (modified) * code/trunk/src/libraries/core/Template.cc (modified) * code/trunk/src/libraries/core/XMLPort.h (modified) * code/trunk/src/libraries/core/command/ConsoleCommand.cc (modified) * code/trunk/src/libraries/core/command/ConsoleCommand.h (modified) * code/trunk/src/libraries/util/output/ConsoleWriter.cc (modified) * code/trunk/src/modules/CMakeLists.txt (modified) * code/trunk/src/modules/docking/DockingController.cc (modified) * code/trunk/src/modules/gametypes/OldRaceCheckPoint.cc (modified) * code/trunk/src/modules/gametypes/OldRaceCheckPoint.h (modified) * code/trunk/src/modules/gametypes/OldSpaceRace.cc (modified) * code/trunk/src/modules/gametypes/OldSpaceRace.h (modified) * code/trunk/src/modules/gametypes/RaceCheckPoint.cc (modified) * code/trunk/src/modules/gametypes/SpaceRace.cc (modified) * code/trunk/src/modules/gametypes/SpaceRaceManager.cc (modified) * code/trunk/src/modules/gametypes/SpaceRaceManager.h (modified) * code/trunk/src/modules/objects/triggers/CheckPoint.cc (modified) * code/trunk/src/modules/overlays/OverlaysPrereqs.h (modified) * code/trunk/src/modules/overlays/hud/CMakeLists.txt (modified) * code/trunk/src/modules/overlays/hud/HUDBoostBar.cc (modified) * code/trunk/src/modules/overlays/hud/HUDBoostBar.h (modified) * code/trunk/src/modules/overlays/hud/HUDEnemyHealthBar.cc (modified) * code/trunk/src/modules/overlays/hud/HUDEnemyHealthBar.h (modified) * code/trunk/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/trunk/src/modules/overlays/hud/HUDNavigation.h (modified) * code/trunk/src/modules/overlays/hud/HUDRadar.cc (modified) * code/trunk/src/modules/overlays/hud/UnderAttackHealthBar.cc (deleted) * code/trunk/src/modules/overlays/hud/UnderAttackHealthBar.h (deleted) * code/trunk/src/modules/pickup/CMakeLists.txt (modified) * code/trunk/src/modules/pickup/CollectiblePickup.cc (modified) * code/trunk/src/modules/pickup/CollectiblePickup.h (modified) * code/trunk/src/modules/pickup/DroppedPickup.cc (deleted) * code/trunk/src/modules/pickup/DroppedPickup.h (deleted) * code/trunk/src/modules/pickup/Pickup.cc (modified) * code/trunk/src/modules/pickup/Pickup.h (modified) * code/trunk/src/modules/pickup/PickupCollection.cc (modified) * code/trunk/src/modules/pickup/PickupCollection.h (modified) * code/trunk/src/modules/pickup/PickupCollectionIdentifier.cc (deleted) * code/trunk/src/modules/pickup/PickupCollectionIdentifier.h (deleted) * code/trunk/src/modules/pickup/PickupManager.cc (modified) * code/trunk/src/modules/pickup/PickupManager.h (modified) * code/trunk/src/modules/pickup/PickupPrereqs.h (modified) * code/trunk/src/modules/pickup/PickupRepresentation.cc (modified) * code/trunk/src/modules/pickup/PickupRepresentation.h (modified) * code/trunk/src/modules/pickup/PickupSpawner.cc (modified) * code/trunk/src/modules/pickup/PickupSpawner.h (modified) * code/trunk/src/modules/pickup/items/CMakeLists.txt (modified) * code/trunk/src/modules/pickup/items/DamageBoostPickup.cc (copied) * code/trunk/src/modules/pickup/items/DamageBoostPickup.h (copied) * code/trunk/src/modules/pickup/items/DronePickup.cc (modified) * code/trunk/src/modules/pickup/items/DronePickup.h (modified) * code/trunk/src/modules/pickup/items/HealthPickup.cc (modified) * code/trunk/src/modules/pickup/items/HealthPickup.h (modified) * code/trunk/src/modules/pickup/items/InvisiblePickup.cc (modified) * code/trunk/src/modules/pickup/items/InvisiblePickup.h (modified) * code/trunk/src/modules/pickup/items/MetaPickup.cc (modified) * code/trunk/src/modules/pickup/items/MetaPickup.h (modified) * code/trunk/src/modules/pickup/items/ShieldPickup.cc (modified) * code/trunk/src/modules/pickup/items/ShieldPickup.h (modified) * code/trunk/src/modules/pickup/items/ShrinkPickup.cc (modified) * code/trunk/src/modules/pickup/items/ShrinkPickup.h (modified) * code/trunk/src/modules/pickup/items/SpeedPickup.cc (modified) * code/trunk/src/modules/pickup/items/SpeedPickup.h (modified) * code/trunk/src/modules/pong/Pong.cc (modified) * code/trunk/src/modules/pong/Pong.h (modified) * code/trunk/src/modules/tetris/CMakeLists.txt (modified) * code/trunk/src/modules/tetris/Tetris.cc (modified) * code/trunk/src/modules/tetris/Tetris.h (modified) * code/trunk/src/modules/tetris/TetrisBrick.cc (copied) * code/trunk/src/modules/tetris/TetrisBrick.h (copied) * code/trunk/src/modules/tetris/TetrisCenterpoint.cc (modified) * code/trunk/src/modules/tetris/TetrisCenterpoint.h (modified) * code/trunk/src/modules/tetris/TetrisPrereqs.h (modified) * code/trunk/src/modules/tetris/TetrisScore.cc (copied) * code/trunk/src/modules/tetris/TetrisScore.h (copied) * code/trunk/src/modules/tetris/TetrisStone.cc (modified) * code/trunk/src/modules/tetris/TetrisStone.h (modified) * code/trunk/src/modules/towerdefense (copied) * code/trunk/src/modules/weapons/RocketController.cc (modified) * code/trunk/src/orxonox/CMakeLists.txt (modified) * code/trunk/src/orxonox/CameraManager.cc (modified) * code/trunk/src/orxonox/LevelInfo.cc (modified) * code/trunk/src/orxonox/LevelInfo.h (modified) * code/trunk/src/orxonox/OrxonoxPrereqs.h (modified) * code/trunk/src/orxonox/Scene.cc (modified) * code/trunk/src/orxonox/controllers/FormationController.cc (modified) * code/trunk/src/orxonox/controllers/FormationController.h (modified) * code/trunk/src/orxonox/controllers/NewHumanController.cc (modified) * code/trunk/src/orxonox/gamestates/GSRoot.cc (modified) * code/trunk/src/orxonox/gametypes/Deathmatch.cc (modified) * code/trunk/src/orxonox/gametypes/Deathmatch.h (modified) * code/trunk/src/orxonox/gametypes/Dynamicmatch.cc (modified) * code/trunk/src/orxonox/gametypes/Dynamicmatch.h (modified) * code/trunk/src/orxonox/gametypes/Gametype.cc (modified) * code/trunk/src/orxonox/gametypes/Gametype.h (modified) * code/trunk/src/orxonox/gametypes/LastManStanding.cc (modified) * code/trunk/src/orxonox/gametypes/LastTeamStanding.cc (modified) * code/trunk/src/orxonox/gametypes/Mission.cc (modified) * code/trunk/src/orxonox/gametypes/Mission.h (modified) * code/trunk/src/orxonox/gametypes/TeamBaseMatch.cc (modified) * code/trunk/src/orxonox/gametypes/TeamBaseMatch.h (modified) * code/trunk/src/orxonox/gametypes/TeamDeathmatch.cc (modified) * code/trunk/src/orxonox/gametypes/TeamDeathmatch.h (modified) * code/trunk/src/orxonox/gametypes/TeamGametype.cc (modified) * code/trunk/src/orxonox/gametypes/TeamGametype.h (modified) * code/trunk/src/orxonox/gametypes/UnderAttack.cc (modified) * code/trunk/src/orxonox/infos/GametypeInfo.cc (modified) * code/trunk/src/orxonox/infos/GametypeInfo.h (modified) * code/trunk/src/orxonox/infos/PlayerInfo.cc (modified) * code/trunk/src/orxonox/interfaces/Pickupable.cc (modified) * code/trunk/src/orxonox/interfaces/Pickupable.h (modified) * code/trunk/src/orxonox/interfaces/RadarViewable.h (modified) * code/trunk/src/orxonox/pickup (deleted) * code/trunk/src/orxonox/worldentities/ControllableEntity.cc (modified) * code/trunk/src/orxonox/worldentities/ControllableEntity.h (modified) * code/trunk/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/Pawn.h (modified) * code/trunk/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) merged branch presentation2012merge back to trunk Sat, 02 Jun 2012 22:12:32 GMT landauf [9264] * code/trunk/src/modules/pong/PongScore.cc (modified) fixed warning