# # ChangeLog for code/trunk/data/levels/towerDefense.oxw # # Generated by Trac 1.0.9 # Nov 24, 2024, 2:42:35 PM 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, 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 ... 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, 05 Feb 2015 22:47:13 GMT landauf [10258] * code/trunk (modified) * code/trunk/cmake/LibraryConfig.cmake (modified) * code/trunk/data/defaultConfig/orxonox.ini (copied) * code/trunk/data/gui/layouts/CampaignMenu.layout (copied) * code/trunk/data/gui/layouts/SingleplayerMenu.layout (modified) * code/trunk/data/gui/scripts/CampaignMenu.lua (copied) * code/trunk/data/gui/scripts/SingleplayerMenu.lua (modified) * code/trunk/data/levels/4Dtest.oxw (copied) * code/trunk/data/levels/AnihilationThreat.oxw (copied) * code/trunk/data/levels/DodgeRace.oxw (copied) * code/trunk/data/levels/FPS_Level_HS14.oxw (copied) * code/trunk/data/levels/includes/weaponSettingsFPS_HS14.oxi (copied) * code/trunk/data/levels/includes/weaponSettingsTurret1.oxi (copied) * code/trunk/data/levels/kecks.oxw (copied) * code/trunk/data/levels/presentationHS13.oxw (modified) * code/trunk/data/levels/templates/DodgeRacePattern.oxt (copied) * code/trunk/data/levels/templates/FPS.oxt (modified) * code/trunk/data/levels/templates/FPS_HS14.oxt (copied) * code/trunk/data/levels/templates/enemytowerdefense.oxt (copied) * code/trunk/data/levels/templates/spaceshipDodgeRace.oxt (copied) * code/trunk/data/levels/templates/spacestation_elements.oxt (copied) * code/trunk/data/levels/templates/ss_tube01.oxt (copied) * code/trunk/data/levels/templates/tower.oxt (modified) * code/trunk/data/levels/towerDefense.oxw (modified) * code/trunk/data/overlays/DodgeRaceHUD.oxo (copied) * code/trunk/data/overlays/HUDTemplates3.oxo (modified) * code/trunk/data/overlays/towerdefenseHUD.oxo (modified) * code/trunk/src/modules/CMakeLists.txt (modified) * code/trunk/src/modules/dodgerace (copied) * code/trunk/src/modules/mini4dgame (copied) * code/trunk/src/modules/notifications/NotificationQueueCEGUI.cc (modified) * code/trunk/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/trunk/src/modules/overlays/hud/HUDNavigation.h (modified) * code/trunk/src/modules/towerdefense/CMakeLists.txt (modified) * code/trunk/src/modules/towerdefense/TDCoordinate.cc (copied) * code/trunk/src/modules/towerdefense/TDCoordinate.h (copied) * code/trunk/src/modules/towerdefense/TDEnemy.h (modified) * code/trunk/src/modules/towerdefense/Tower.cc (modified) * code/trunk/src/modules/towerdefense/TowerDefense.cc (modified) * code/trunk/src/modules/towerdefense/TowerDefense.h (modified) * code/trunk/src/modules/towerdefense/TowerDefenseController.cc (modified) * code/trunk/src/modules/towerdefense/TowerDefenseEnemy.cc (copied) * code/trunk/src/modules/towerdefense/TowerDefenseEnemy.h (copied) * code/trunk/src/modules/towerdefense/TowerDefenseHUDController.cc (modified) * code/trunk/src/modules/towerdefense/TowerDefenseHUDController.h (modified) * code/trunk/src/modules/towerdefense/TowerDefensePlayerStats.cc (modified) * code/trunk/src/modules/towerdefense/TowerDefensePlayerStats.h (modified) * code/trunk/src/modules/towerdefense/TowerDefensePrereqs.h (modified) * code/trunk/src/modules/towerdefense/TowerDefenseTower.cc (copied) * code/trunk/src/modules/towerdefense/TowerDefenseTower.h (copied) * code/trunk/src/modules/towerdefense/TowerTurret.cc (copied) * code/trunk/src/modules/towerdefense/TowerTurret.h (copied) * code/trunk/src/modules/weapons/RocketController.cc (modified) * code/trunk/src/orxonox/LevelManager.cc (modified) * code/trunk/src/orxonox/LevelManager.h (modified) * code/trunk/src/orxonox/gametypes/Mission.cc (modified) merged presentationHS14merge back to trunk Thu, 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 Thu, 30 Aug 2012 15:11:07 GMT jo [9346] * code/branches/presentation2012merge/data/levels/towerDefense.oxw (modified) * code/branches/presentation2012merge/data/overlays/lastManStandingHUD.oxo (modified) * code/branches/presentation2012merge/data/overlays/lastTeamStandingHUD.oxo (modified) Bugfix: Previously the LastManStandingHUD wasn't displayed properly ...