# # ChangeLog for code/branches/presentationHS15/src/orxonox/worldentities/pawns/SpaceShip.cc # # Generated by Trac 1.0.9 # Jun 2, 2024, 6:51:30 AM 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 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