# # ChangeLog for code/trunk/data/levels/ModularShipsTest1.oxw # # Generated by Trac 1.0.9 # Dec 24, 2024, 4:01:16 PM Fri, 06 Feb 2015 22:30:26 GMT landauf [10262] * code/trunk/data/defaultConfig/orxonox.ini (modified) * code/trunk/data/gui/layouts/CampaignMenu.layout (modified) * code/trunk/data/gui/scripts/CampaignMenu.lua (modified) * code/trunk/data/gui/scripts/testscript.lua (modified) * code/trunk/data/levels/4Dtest.oxw (modified) * code/trunk/data/levels/AnihilationThreat.oxw (modified) * code/trunk/data/levels/DodgeRace.oxw (modified) * code/trunk/data/levels/FPS_Level_HS14.oxw (modified) * code/trunk/data/levels/ModularShipsTest0.oxw (modified) * code/trunk/data/levels/ModularShipsTest1.oxw (modified) * code/trunk/data/levels/collisionShapes.oxw (modified) * code/trunk/data/levels/includes/weaponSettingsFPS_HS14.oxi (modified) * code/trunk/data/levels/includes/weaponSettingsTurret1.oxi (modified) * code/trunk/data/levels/jump.oxw (modified) * code/trunk/data/levels/kecks.oxw (modified) * code/trunk/data/levels/levelTry.oxw (modified) * code/trunk/data/levels/michaelstestfile.lua (modified) * code/trunk/data/levels/scriptController.oxw (modified) * code/trunk/data/levels/templates/DodgeRacePattern.oxt (modified) * code/trunk/data/levels/templates/FPS_HS14.oxt (modified) * code/trunk/data/levels/templates/ModularSpaceShipTest.oxt (modified) * code/trunk/data/levels/templates/enemytowerdefense.oxt (modified) * code/trunk/data/levels/templates/spaceshipDodgeRace.oxt (modified) * code/trunk/data/levels/templates/spacestation_elements.oxt (modified) * code/trunk/data/levels/templates/ss_tube01.oxt (modified) * code/trunk/data/levels/templates/standardTurret.oxt (modified) * code/trunk/data/overlays/DodgeRaceHUD.oxo (modified) * code/trunk/data/overlays/jumpHUD.oxo (modified) * code/trunk/src/libraries/tools/BulletDebugDrawer.cc (modified) * code/trunk/src/libraries/tools/BulletDebugDrawer.h (modified) * code/trunk/src/libraries/tools/DebugDrawer.cc (modified) * code/trunk/src/libraries/tools/DebugDrawer.h (modified) * code/trunk/src/libraries/tools/IcoSphere.cc (modified) * code/trunk/src/libraries/tools/IcoSphere.h (modified) * code/trunk/src/libraries/tools/OgreBulletUtils.h (modified) * code/trunk/src/modules/gametypes/SpaceRaceBot.cc (modified) * code/trunk/src/modules/gametypes/SpaceRaceBot.h (modified) * code/trunk/src/modules/gametypes/SpaceRaceController.cc (modified) * code/trunk/src/modules/gametypes/SpaceRaceController.h (modified) * code/trunk/src/modules/jump/CMakeLists.txt (modified) * code/trunk/src/modules/jump/Jump.cc (modified) * code/trunk/src/modules/jump/Jump.h (modified) * code/trunk/src/modules/jump/JumpBoots.cc (modified) * code/trunk/src/modules/jump/JumpBoots.h (modified) * code/trunk/src/modules/jump/JumpCenterpoint.cc (modified) * code/trunk/src/modules/jump/JumpCenterpoint.h (modified) * code/trunk/src/modules/jump/JumpEnemy.cc (modified) * code/trunk/src/modules/jump/JumpEnemy.h (modified) * code/trunk/src/modules/jump/JumpFigure.cc (modified) * code/trunk/src/modules/jump/JumpFigure.h (modified) * code/trunk/src/modules/jump/JumpItem.cc (modified) * code/trunk/src/modules/jump/JumpItem.h (modified) * code/trunk/src/modules/jump/JumpPlatform.cc (modified) * code/trunk/src/modules/jump/JumpPlatform.h (modified) * code/trunk/src/modules/jump/JumpPlatformDisappear.cc (modified) * code/trunk/src/modules/jump/JumpPlatformDisappear.h (modified) * code/trunk/src/modules/jump/JumpPlatformFake.cc (modified) * code/trunk/src/modules/jump/JumpPlatformFake.h (modified) * code/trunk/src/modules/jump/JumpPlatformHMove.cc (modified) * code/trunk/src/modules/jump/JumpPlatformHMove.h (modified) * code/trunk/src/modules/jump/JumpPlatformStatic.cc (modified) * code/trunk/src/modules/jump/JumpPlatformStatic.h (modified) * code/trunk/src/modules/jump/JumpPlatformTimer.cc (modified) * code/trunk/src/modules/jump/JumpPlatformTimer.h (modified) * code/trunk/src/modules/jump/JumpPlatformVMove.cc (modified) * code/trunk/src/modules/jump/JumpPlatformVMove.h (modified) * code/trunk/src/modules/jump/JumpPrereqs.h (modified) * code/trunk/src/modules/jump/JumpProjectile.cc (modified) * code/trunk/src/modules/jump/JumpProjectile.h (modified) * code/trunk/src/modules/jump/JumpPropeller.cc (modified) * code/trunk/src/modules/jump/JumpPropeller.h (modified) * code/trunk/src/modules/jump/JumpRocket.cc (modified) * code/trunk/src/modules/jump/JumpRocket.h (modified) * code/trunk/src/modules/jump/JumpScore.cc (modified) * code/trunk/src/modules/jump/JumpScore.h (modified) * code/trunk/src/modules/jump/JumpShield.cc (modified) * code/trunk/src/modules/jump/JumpShield.h (modified) * code/trunk/src/modules/jump/JumpSpring.cc (modified) * code/trunk/src/modules/jump/JumpSpring.h (modified) * code/trunk/src/modules/objects/Turret.cc (modified) * code/trunk/src/modules/objects/Turret.h (modified) * code/trunk/src/modules/objects/collisionshapes/CylinderCollisionShape.cc (modified) * code/trunk/src/modules/objects/collisionshapes/CylinderCollisionShape.h (modified) * code/trunk/src/modules/objects/controllers/CMakeLists.txt (modified) * code/trunk/src/modules/objects/controllers/TeamTargetProxy.cc (modified) * code/trunk/src/modules/objects/controllers/TeamTargetProxy.h (modified) * code/trunk/src/modules/objects/controllers/TurretController.cc (modified) * code/trunk/src/modules/objects/controllers/TurretController.h (modified) * code/trunk/src/modules/tetris/TetrisBrick.cc (modified) * code/trunk/src/modules/tetris/TetrisBrick.h (modified) * code/trunk/src/modules/tetris/TetrisScore.cc (modified) * code/trunk/src/modules/tetris/TetrisScore.h (modified) * code/trunk/src/orxonox/ShipPartManager.cc (modified) * code/trunk/src/orxonox/ShipPartManager.h (modified) * code/trunk/src/orxonox/controllers/ControllerDirector.cc (modified) * code/trunk/src/orxonox/controllers/ControllerDirector.h (modified) * code/trunk/src/orxonox/controllers/ScriptController.cc (modified) * code/trunk/src/orxonox/controllers/ScriptController.h (modified) * code/trunk/src/orxonox/controllers/testscript.lua (modified) * code/trunk/src/orxonox/items/PartDestructionEvent.cc (modified) * code/trunk/src/orxonox/items/PartDestructionEvent.h (modified) * code/trunk/src/orxonox/items/ShipPart.cc (modified) * code/trunk/src/orxonox/items/ShipPart.h (modified) * code/trunk/src/orxonox/worldentities/pawns/ModularSpaceShip.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/ModularSpaceShip.h (modified) eol-style native. no changes in code. 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 Thu, 22 May 2014 12:49:16 GMT smerkli [10073] * code/branches/presentationFS14 (modified) * code/branches/presentationFS14/data/levels/ModularShipsTest0.oxw (copied) * code/branches/presentationFS14/data/levels/ModularShipsTest1.oxw (copied) * code/branches/presentationFS14/data/levels/templates/HeavyCruiser.oxt (modified) * code/branches/presentationFS14/data/levels/templates/ModularSpaceShipTest.oxt (copied) * code/branches/presentationFS14/src/external/bullet/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp (modified) * code/branches/presentationFS14/src/modules/weapons/projectiles/BasicProjectile.cc (modified) * code/branches/presentationFS14/src/modules/weapons/projectiles/BasicProjectile.h (modified) * code/branches/presentationFS14/src/modules/weapons/projectiles/Projectile.cc (modified) * code/branches/presentationFS14/src/modules/weapons/projectiles/Projectile.h (modified) * code/branches/presentationFS14/src/modules/weapons/projectiles/Rocket.cc (modified) * code/branches/presentationFS14/src/modules/weapons/projectiles/Rocket.h (modified) * code/branches/presentationFS14/src/modules/weapons/projectiles/SimpleRocket.cc (modified) * code/branches/presentationFS14/src/modules/weapons/projectiles/SimpleRocket.h (modified) * code/branches/presentationFS14/src/orxonox/CMakeLists.txt (modified) * code/branches/presentationFS14/src/orxonox/OrxonoxPrereqs.h (modified) * code/branches/presentationFS14/src/orxonox/Scene.cc (modified) * code/branches/presentationFS14/src/orxonox/Scene.h (modified) * code/branches/presentationFS14/src/orxonox/ShipPartManager.cc (copied) * code/branches/presentationFS14/src/orxonox/ShipPartManager.h (copied) * code/branches/presentationFS14/src/orxonox/collisionshapes/CollisionShape.h (modified) * code/branches/presentationFS14/src/orxonox/collisionshapes/CompoundCollisionShape.cc (modified) * code/branches/presentationFS14/src/orxonox/collisionshapes/CompoundCollisionShape.h (modified) * code/branches/presentationFS14/src/orxonox/controllers/NewHumanController.cc (modified) * code/branches/presentationFS14/src/orxonox/items/CMakeLists.txt (modified) * code/branches/presentationFS14/src/orxonox/items/PartDestructionEvent.cc (copied) * code/branches/presentationFS14/src/orxonox/items/PartDestructionEvent.h (copied) * code/branches/presentationFS14/src/orxonox/items/ShipPart.cc (copied) * code/branches/presentationFS14/src/orxonox/items/ShipPart.h (copied) * code/branches/presentationFS14/src/orxonox/worldentities/MovableEntity.cc (modified) * code/branches/presentationFS14/src/orxonox/worldentities/MovableEntity.h (modified) * code/branches/presentationFS14/src/orxonox/worldentities/StaticEntity.cc (modified) * code/branches/presentationFS14/src/orxonox/worldentities/WorldEntity.cc (modified) * code/branches/presentationFS14/src/orxonox/worldentities/WorldEntity.h (modified) * code/branches/presentationFS14/src/orxonox/worldentities/pawns/CMakeLists.txt (modified) * code/branches/presentationFS14/src/orxonox/worldentities/pawns/ModularSpaceShip.cc (copied) * code/branches/presentationFS14/src/orxonox/worldentities/pawns/ModularSpaceShip.h (copied) * code/branches/presentationFS14/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/branches/presentationFS14/src/orxonox/worldentities/pawns/Pawn.h (modified) * code/branches/presentationFS14/src/orxonox/worldentities/pawns/SpaceShip.h (modified) Merged modularships branch