# # ChangeLog for code/branches/presentationHS15/data/gui # # Generated by Trac 1.0.9 # Nov 18, 2024, 5:46:24 PM Fri, 11 Dec 2015 14:26:20 GMT maxima [10970] * code/branches/presentationHS15 (modified) * code/branches/presentationHS15/data/defaultConfig/orxonox.ini (modified) * code/branches/presentationHS15/data/gui/layouts/CampaignMenu.layout (modified) * code/branches/presentationHS15/data/gui/scripts/CampaignMenu.lua (modified) * code/branches/presentationHS15/data/levels/AITest.oxw (copied) * code/branches/presentationHS15/data/levels/expeditionSector.oxw (copied) * code/branches/presentationHS15/data/levels/missionOne.oxw (modified) * code/branches/presentationHS15/data/levels/shuttleAttack.oxw (copied) * code/branches/presentationHS15/data/levels/shuttleRetaliation.oxw (copied) * code/branches/presentationHS15/data/levels/templates/spaceshipShuttle.oxt (copied) * code/branches/presentationHS15/src/libraries/util/Math.cc (modified) * code/branches/presentationHS15/src/libraries/util/Math.h (modified) * code/branches/presentationHS15/src/modules/docking/DockingController.cc (modified) * code/branches/presentationHS15/src/modules/overlays/hud/HUDRadar.cc (modified) * code/branches/presentationHS15/src/modules/weapons/weaponmodes/MineGun.cc (modified) * code/branches/presentationHS15/src/orxonox/controllers/ActionpointController.cc (copied) * code/branches/presentationHS15/src/orxonox/controllers/ActionpointController.h (copied) * code/branches/presentationHS15/src/orxonox/controllers/CMakeLists.txt (modified) * code/branches/presentationHS15/src/orxonox/controllers/CommonController.cc (copied) * code/branches/presentationHS15/src/orxonox/controllers/CommonController.h (copied) * code/branches/presentationHS15/src/orxonox/controllers/DivisionController.cc (copied) * code/branches/presentationHS15/src/orxonox/controllers/DivisionController.h (copied) * code/branches/presentationHS15/src/orxonox/controllers/FightingController.cc (copied) * code/branches/presentationHS15/src/orxonox/controllers/FightingController.h (copied) * code/branches/presentationHS15/src/orxonox/controllers/FlyingController.cc (copied) * code/branches/presentationHS15/src/orxonox/controllers/FlyingController.h (copied) * code/branches/presentationHS15/src/orxonox/controllers/FormationController.cc (modified) * code/branches/presentationHS15/src/orxonox/controllers/MasterController.cc (copied) * code/branches/presentationHS15/src/orxonox/controllers/MasterController.h (copied) * code/branches/presentationHS15/src/orxonox/controllers/SectionController.cc (copied) * code/branches/presentationHS15/src/orxonox/controllers/SectionController.h (copied) * code/branches/presentationHS15/src/orxonox/controllers/WingmanController.cc (copied) * code/branches/presentationHS15/src/orxonox/controllers/WingmanController.h (copied) * code/branches/presentationHS15/src/orxonox/worldentities/Actionpoint.cc (copied) * code/branches/presentationHS15/src/orxonox/worldentities/Actionpoint.h (copied) * code/branches/presentationHS15/src/orxonox/worldentities/CMakeLists.txt (modified) * code/branches/presentationHS15/src/orxonox/worldentities/SpawnPoint.h (modified) * code/branches/presentationHS15/src/orxonox/worldentities/TeamSpawnPoint.cc (modified) * code/branches/presentationHS15/src/orxonox/worldentities/TeamSpawnPoint.h (modified) * code/branches/presentationHS15/src/orxonox/worldentities/pawns/Pawn.h (modified) * code/branches/presentationHS15/test/util/MathTest.cc (modified) Merged campaign and presentation. Everything seems to work fine. Wed, 09 Dec 2015 13:45:58 GMT maxima [10961] * code/branches/presentationHS15 (modified) * code/branches/presentationHS15/data/gui/layouts/InGameMenu.layout (modified) * code/branches/presentationHS15/data/gui/scripts/InGameMenu.lua (modified) * code/branches/presentationHS15/data/levels/FPS_Level_HS14.oxw (modified) * code/branches/presentationHS15/data/levels/iJohnVane_TriptoArea51.oxw (modified) * code/branches/presentationHS15/data/levels/includes/invaderWeapon.oxi (modified) * code/branches/presentationHS15/data/levels/includes/invaderWeaponEnemy.oxi (modified) * code/branches/presentationHS15/data/levels/includes/pickups.oxi (modified) * code/branches/presentationHS15/data/levels/includes/towerWeaponSettings.oxi (deleted) * code/branches/presentationHS15/data/levels/includes/weaponSettingsAssff.oxi (modified) * code/branches/presentationHS15/data/levels/includes/weaponSettingsAssff2.oxi (modified) * code/branches/presentationHS15/data/levels/includes/weaponSettingsCollateral.oxi (modified) * code/branches/presentationHS15/data/levels/includes/weaponSettingsEscort.oxi (modified) * code/branches/presentationHS15/data/levels/includes/weaponSettingsFPS.oxi (modified) * code/branches/presentationHS15/data/levels/includes/weaponSettingsFPS_HS14.oxi (modified) * code/branches/presentationHS15/data/levels/includes/weaponSettingsFS15.oxi (modified) * code/branches/presentationHS15/data/levels/includes/weaponSettingsGhost.oxi (modified) * code/branches/presentationHS15/data/levels/includes/weaponSettingsH2.oxi (modified) * code/branches/presentationHS15/data/levels/includes/weaponSettingsHXY.oxi (modified) * code/branches/presentationHS15/data/levels/includes/weaponSettingsHeartAttack.oxi (modified) * code/branches/presentationHS15/data/levels/includes/weaponSettingsHeavyCruiser.oxi (modified) * code/branches/presentationHS15/data/levels/includes/weaponSettingsHeavyCruiserBody.oxi (modified) * code/branches/presentationHS15/data/levels/includes/weaponSettingsHover.oxi (modified) * code/branches/presentationHS15/data/levels/includes/weaponSettingsImmTest.oxi (modified) * code/branches/presentationHS15/data/levels/includes/weaponSettingsPirate.oxi (modified) * code/branches/presentationHS15/data/levels/includes/weaponSettingsRing.oxi (modified) * code/branches/presentationHS15/data/levels/includes/weaponSettingsSpacecruiser.oxi (modified) * code/branches/presentationHS15/data/levels/includes/weaponSettingsSwallow.oxi (modified) * code/branches/presentationHS15/data/levels/includes/weaponSettingsTransporter.oxi (modified) * code/branches/presentationHS15/data/levels/includes/weaponSettingsTurret.oxi (modified) * code/branches/presentationHS15/data/levels/includes/weaponSettingsTurret1.oxi (modified) * code/branches/presentationHS15/data/levels/includes/weaponSettingsbigship.oxi (modified) * code/branches/presentationHS15/data/levels/missionOne.oxw (modified) * code/branches/presentationHS15/data/levels/pickups.oxw (modified) * code/branches/presentationHS15/data/levels/presentationHS13.oxw (modified) * code/branches/presentationHS15/data/levels/shieldTest.oxw (modified) * code/branches/presentationHS15/data/levels/templates/HeavyCruiser.oxt (modified) * code/branches/presentationHS15/data/levels/templates/HeavyCruiserBody.oxt (modified) * code/branches/presentationHS15/data/levels/templates/ModularSpaceShipTest.oxt (modified) * code/branches/presentationHS15/data/levels/templates/bigship.oxt (modified) * code/branches/presentationHS15/data/levels/templates/enemyInvader.oxt (modified) * code/branches/presentationHS15/data/levels/templates/pickupRepresentationTemplates.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipAssff.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipAssff2.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipCollateralDamage.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipDodgeRace.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipEscort.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipGhost.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipHeartAttack.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipInvader.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipPirate.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipRace.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipRing.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipSpacecruiser.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipSwallow.oxt (modified) * code/branches/presentationHS15/data/levels/templates/spaceshipTurret.oxt (modified) * code/branches/presentationHS15/data/levels/templates/towerdefensetower.oxt (modified) * code/branches/presentationHS15/data/levels/towerDefense.oxw (modified) * code/branches/presentationHS15/data/overlays/HUDTemplates3.oxo (modified) * code/branches/presentationHS15/data/overlays/HoverHUD.oxo (modified) * code/branches/presentationHS15/data/overlays/InvaderHUD.oxo (modified) * code/branches/presentationHS15/data/overlays/jumpHUD.oxo (modified) * code/branches/presentationHS15/src/modules/overlays/CMakeLists.txt (modified) * code/branches/presentationHS15/src/modules/overlays/OverlaysPrereqs.h (modified) * code/branches/presentationHS15/src/modules/overlays/hud/CMakeLists.txt (modified) * code/branches/presentationHS15/src/modules/overlays/hud/HUDBar.cc (modified) * code/branches/presentationHS15/src/modules/overlays/hud/HUDBar.h (modified) * code/branches/presentationHS15/src/modules/overlays/hud/HUDBoostBar.cc (modified) * code/branches/presentationHS15/src/modules/overlays/hud/HUDEnemyShieldBar.cc (copied) * code/branches/presentationHS15/src/modules/overlays/hud/HUDEnemyShieldBar.h (copied) * code/branches/presentationHS15/src/modules/overlays/hud/HUDHealthBar.cc (modified) * code/branches/presentationHS15/src/modules/overlays/hud/HUDHealthBar.h (modified) * code/branches/presentationHS15/src/modules/overlays/hud/HUDRocketFuelBar.cc (copied) * code/branches/presentationHS15/src/modules/overlays/hud/HUDRocketFuelBar.h (copied) * code/branches/presentationHS15/src/modules/overlays/hud/HUDShieldBar.cc (copied) * code/branches/presentationHS15/src/modules/overlays/hud/HUDShieldBar.h (copied) * code/branches/presentationHS15/src/modules/overlays/hud/HUDWeapon.cc (copied) * code/branches/presentationHS15/src/modules/overlays/hud/HUDWeapon.h (copied) * code/branches/presentationHS15/src/modules/overlays/hud/HUDWeaponMode.cc (copied) * code/branches/presentationHS15/src/modules/overlays/hud/HUDWeaponMode.h (copied) * code/branches/presentationHS15/src/modules/overlays/hud/HUDWeaponSystem.cc (copied) * code/branches/presentationHS15/src/modules/overlays/hud/HUDWeaponSystem.h (copied) * code/branches/presentationHS15/src/modules/pickup/PickupPrereqs.h (modified) * code/branches/presentationHS15/src/modules/pickup/PickupRepresentation.cc (modified) * code/branches/presentationHS15/src/modules/pickup/items/BoostPickup.cc (copied) * code/branches/presentationHS15/src/modules/pickup/items/BoostPickup.h (copied) * code/branches/presentationHS15/src/modules/pickup/items/CMakeLists.txt (modified) * code/branches/presentationHS15/src/modules/pickup/items/DronePickup.h (modified) * code/branches/presentationHS15/src/modules/pickup/items/MunitionContainer.cc (copied) * code/branches/presentationHS15/src/modules/pickup/items/MunitionContainer.h (copied) * code/branches/presentationHS15/src/modules/pickup/items/MunitionPickup.cc (copied) * code/branches/presentationHS15/src/modules/pickup/items/MunitionPickup.h (copied) * code/branches/presentationHS15/src/modules/towerdefense/TowerDefenseTower.cc (modified) * code/branches/presentationHS15/src/modules/weapons/WeaponsPrereqs.h (modified) * code/branches/presentationHS15/src/modules/weapons/munitions/CMakeLists.txt (modified) * code/branches/presentationHS15/src/modules/weapons/munitions/FusionMunition.cc (modified) * code/branches/presentationHS15/src/modules/weapons/munitions/FusionMunition.h (modified) * code/branches/presentationHS15/src/modules/weapons/munitions/GravityBombMunition.cc (modified) * code/branches/presentationHS15/src/modules/weapons/munitions/GravityBombMunition.h (modified) * code/branches/presentationHS15/src/modules/weapons/munitions/IceMunition.cc (modified) * code/branches/presentationHS15/src/modules/weapons/munitions/IceMunition.h (modified) * code/branches/presentationHS15/src/modules/weapons/munitions/LaserMunition.cc (modified) * code/branches/presentationHS15/src/modules/weapons/munitions/LaserMunition.h (modified) * code/branches/presentationHS15/src/modules/weapons/munitions/LightningMunition.cc (copied) * code/branches/presentationHS15/src/modules/weapons/munitions/LightningMunition.h (copied) * code/branches/presentationHS15/src/modules/weapons/munitions/ReplenishingMunition.cc (deleted) * code/branches/presentationHS15/src/modules/weapons/munitions/ReplenishingMunition.h (deleted) * code/branches/presentationHS15/src/modules/weapons/munitions/RocketMunition.cc (modified) * code/branches/presentationHS15/src/modules/weapons/munitions/RocketMunition.h (modified) * code/branches/presentationHS15/src/modules/weapons/munitions/SplitMunition.cc (modified) * code/branches/presentationHS15/src/modules/weapons/munitions/SplitMunition.h (modified) * code/branches/presentationHS15/src/modules/weapons/projectiles/BasicProjectile.cc (modified) * code/branches/presentationHS15/src/modules/weapons/projectiles/GravityBombField.cc (modified) * code/branches/presentationHS15/src/modules/weapons/projectiles/Rocket.cc (modified) * code/branches/presentationHS15/src/modules/weapons/projectiles/Rocket.h (modified) * code/branches/presentationHS15/src/modules/weapons/projectiles/SimpleRocket.cc (modified) * code/branches/presentationHS15/src/modules/weapons/weaponmodes/EnergyDrink.cc (modified) * code/branches/presentationHS15/src/modules/weapons/weaponmodes/FusionFire.cc (modified) * code/branches/presentationHS15/src/modules/weapons/weaponmodes/GravityBombFire.cc (modified) * code/branches/presentationHS15/src/modules/weapons/weaponmodes/HsW01.cc (modified) * code/branches/presentationHS15/src/modules/weapons/weaponmodes/IceGun.cc (modified) * code/branches/presentationHS15/src/modules/weapons/weaponmodes/LaserFire.cc (modified) * code/branches/presentationHS15/src/modules/weapons/weaponmodes/LightningGun.cc (modified) * code/branches/presentationHS15/src/modules/weapons/weaponmodes/RocketFire.cc (modified) * code/branches/presentationHS15/src/modules/weapons/weaponmodes/RocketFire.h (modified) * code/branches/presentationHS15/src/modules/weapons/weaponmodes/RocketFireOld.cc (modified) * code/branches/presentationHS15/src/modules/weapons/weaponmodes/SimpleRocketFire.cc (modified) * code/branches/presentationHS15/src/modules/weapons/weaponmodes/SplitGun.cc (modified) * code/branches/presentationHS15/src/orxonox/OrxonoxPrereqs.h (modified) * code/branches/presentationHS15/src/orxonox/controllers/HumanController.cc (modified) * code/branches/presentationHS15/src/orxonox/infos/PlayerInfo.cc (modified) * code/branches/presentationHS15/src/orxonox/overlays/OrxonoxOverlay.cc (modified) * code/branches/presentationHS15/src/orxonox/overlays/OrxonoxOverlay.h (modified) * code/branches/presentationHS15/src/orxonox/weaponsystem/CMakeLists.txt (modified) * code/branches/presentationHS15/src/orxonox/weaponsystem/Munition.cc (modified) * code/branches/presentationHS15/src/orxonox/weaponsystem/Munition.h (modified) * code/branches/presentationHS15/src/orxonox/weaponsystem/ReplenishingMunition.cc (copied) * code/branches/presentationHS15/src/orxonox/weaponsystem/ReplenishingMunition.h (copied) * code/branches/presentationHS15/src/orxonox/weaponsystem/Weapon.cc (modified) * code/branches/presentationHS15/src/orxonox/weaponsystem/Weapon.h (modified) * code/branches/presentationHS15/src/orxonox/weaponsystem/WeaponMode.cc (modified) * code/branches/presentationHS15/src/orxonox/weaponsystem/WeaponMode.h (modified) * code/branches/presentationHS15/src/orxonox/weaponsystem/WeaponPack.cc (modified) * code/branches/presentationHS15/src/orxonox/weaponsystem/WeaponPack.h (modified) * code/branches/presentationHS15/src/orxonox/weaponsystem/WeaponSystem.cc (modified) * code/branches/presentationHS15/src/orxonox/weaponsystem/WeaponSystem.h (modified) * code/branches/presentationHS15/src/orxonox/worldentities/MobileEntity.h (modified) * code/branches/presentationHS15/src/orxonox/worldentities/StaticEntity.h (modified) * code/branches/presentationHS15/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/branches/presentationHS15/src/orxonox/worldentities/pawns/Pawn.h (modified) * code/branches/presentationHS15/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) * code/branches/presentationHS15/src/orxonox/worldentities/pawns/SpaceShip.h (modified) Merged presentation and fabiens branch. Had to modify hoverHUD and ... Wed, 09 Dec 2015 11:14:46 GMT maxima [10959] * code/branches/presentationHS15 (copied) New branch for PPS-presentation 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