#
# ChangeLog for code/trunk/data/levels/ModularShipsTest0.oxw
#
# Generated by Trac 1.0.9
# Nov 17, 2024, 9:24:13 PM

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