#
# ChangeLog for code/branches/presentationFS14
#
# Generated by Trac 1.0.9
# Apr 30, 2024, 2:21:44 AM

Thu, 22 May 2014 13:59:14 GMT smerkli [10076]
	* code/branches/presentationFS14 (modified)
	* code/branches/presentationFS14/data/gui/scripts/testscript.lua (copied)
	* code/branches/presentationFS14/data/levels/levelTry.oxw (copied)
	* code/branches/presentationFS14/data/levels/michaelstestfile.lua (copied)
	* code/branches/presentationFS14/data/levels/scriptController.oxw (copied)
	* code/branches/presentationFS14/src/orxonox/CMakeLists.txt (modified)
	* code/branches/presentationFS14/src/orxonox/controllers/CMakeLists.txt (modified)
	* code/branches/presentationFS14/src/orxonox/controllers/ControllerDirector.cc (copied)
	* code/branches/presentationFS14/src/orxonox/controllers/ControllerDirector.h (copied)
	* code/branches/presentationFS14/src/orxonox/controllers/ScriptController.cc (copied)
	* code/branches/presentationFS14/src/orxonox/controllers/ScriptController.h (copied)
	* code/branches/presentationFS14/src/orxonox/controllers/testscript.lua (copied)

	Merged scriptcontroller branch


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


Thu, 22 May 2014 12:35:02 GMT smerkli [10072]
	* code/branches/presentationFS14 (modified)
	* code/branches/presentationFS14/data/levels/includes/weaponSettingsTurret.oxi (modified)
	* code/branches/presentationFS14/data/levels/templates/spaceshipTurret.oxt (deleted)
	* code/branches/presentationFS14/data/levels/templates/standardTurret.oxt (copied)
	* code/branches/presentationFS14/data/levels/turretTest.oxw (modified)
	* code/branches/presentationFS14/src/modules/objects/CMakeLists.txt (modified)
	* code/branches/presentationFS14/src/modules/objects/Turret.cc (modified)
	* code/branches/presentationFS14/src/modules/objects/Turret.h (modified)
	* code/branches/presentationFS14/src/modules/objects/controllers (copied)
	* code/branches/presentationFS14/src/modules/objects/controllers/CMakeLists.txt (copied)
	* code/branches/presentationFS14/src/modules/objects/controllers/TeamTargetProxy.cc (copied)
	* code/branches/presentationFS14/src/modules/objects/controllers/TeamTargetProxy.h (copied)
	* code/branches/presentationFS14/src/modules/objects/controllers/TurretController.cc (copied)
	* code/branches/presentationFS14/src/modules/objects/controllers/TurretController.h (copied)
	* code/branches/presentationFS14/src/orxonox/controllers/ArtificialController.cc (modified)
	* code/branches/presentationFS14/src/orxonox/worldentities/WorldEntity.cc (modified)

	Merged turretFS14 branch


Thu, 22 May 2014 11:36:06 GMT smerkli [10069]
	* code/branches/presentationFS14 (copied)

	Created a presentation branch


Sat, 01 Feb 2014 17:01:47 GMT jo [9992]
	* code/trunk/data/levels/iJohnVane_TriptoArea51.oxw (modified)
	* code/trunk/data/levels/iiJohnVane_Area51UnderFire.oxw (modified)
	* code/trunk/data/levels/iiiJohnVane_EscapeTheBastards.oxw (modified)

	The end of Area51UnderFire is ok. Unfortunately the explosion could ...