#
# ChangeLog for code/branches/presentationFS14/src/modules/objects/controllers/TurretController.h
#
# Generated by Trac 1.0.9
# May 19, 2024, 8:39:15 AM

Sat, 31 Jan 2015 16:31:23 GMT landauf [10215]
	* code/branches/presentationFS14/src/modules/jump/Jump.cc (modified)
	* code/branches/presentationFS14/src/modules/jump/JumpBoots.cc (modified)
	* code/branches/presentationFS14/src/modules/jump/JumpEnemy.cc (modified)
	* code/branches/presentationFS14/src/modules/jump/JumpFigure.cc (modified)
	* code/branches/presentationFS14/src/modules/jump/JumpFigure.h (modified)
	* code/branches/presentationFS14/src/modules/jump/JumpItem.cc (modified)
	* code/branches/presentationFS14/src/modules/jump/JumpPlatform.cc (modified)
	* code/branches/presentationFS14/src/modules/jump/JumpPlatformDisappear.cc (modified)
	* code/branches/presentationFS14/src/modules/jump/JumpPlatformDisappear.h (modified)
	* code/branches/presentationFS14/src/modules/jump/JumpPlatformFake.h (modified)
	* code/branches/presentationFS14/src/modules/jump/JumpPlatformHMove.cc (modified)
	* code/branches/presentationFS14/src/modules/jump/JumpPlatformHMove.h (modified)
	* code/branches/presentationFS14/src/modules/jump/JumpPlatformStatic.cc (modified)
	* code/branches/presentationFS14/src/modules/jump/JumpPlatformStatic.h (modified)
	* code/branches/presentationFS14/src/modules/jump/JumpPlatformTimer.cc (modified)
	* code/branches/presentationFS14/src/modules/jump/JumpPlatformTimer.h (modified)
	* code/branches/presentationFS14/src/modules/jump/JumpPlatformVMove.cc (modified)
	* code/branches/presentationFS14/src/modules/jump/JumpPlatformVMove.h (modified)
	* code/branches/presentationFS14/src/modules/jump/JumpProjectile.cc (modified)
	* code/branches/presentationFS14/src/modules/jump/JumpPropeller.cc (modified)
	* code/branches/presentationFS14/src/modules/jump/JumpRocket.cc (modified)
	* code/branches/presentationFS14/src/modules/jump/JumpScore.cc (modified)
	* code/branches/presentationFS14/src/modules/jump/JumpShield.cc (modified)
	* code/branches/presentationFS14/src/modules/jump/JumpSpring.cc (modified)
	* code/branches/presentationFS14/src/modules/objects/controllers/TeamTargetProxy.cc (modified)
	* code/branches/presentationFS14/src/modules/objects/controllers/TeamTargetProxy.h (modified)
	* code/branches/presentationFS14/src/modules/objects/controllers/TurretController.cc (modified)
	* code/branches/presentationFS14/src/modules/objects/controllers/TurretController.h (modified)
	* code/branches/presentationFS14/src/orxonox/controllers/ControllerDirector.cc (modified)
	* code/branches/presentationFS14/src/orxonox/controllers/ControllerDirector.h (modified)

	replaced tabs with spaces. no changes in code.


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, 15 May 2014 15:10:55 GMT muemart [10060]
	* code/branches/turretFS14/data/levels/turretTest.oxw (modified)
	* code/branches/turretFS14/src/modules/objects/Turret.cc (modified)
	* code/branches/turretFS14/src/modules/objects/Turret.h (modified)
	* code/branches/turretFS14/src/modules/objects/controllers/TeamTargetProxy.cc (modified)
	* code/branches/turretFS14/src/modules/objects/controllers/TeamTargetProxy.h (modified)
	* code/branches/turretFS14/src/modules/objects/controllers/TurretController.cc (modified)
	* code/branches/turretFS14/src/modules/objects/controllers/TurretController.h (modified)
	* code/branches/turretFS14/src/orxonox/worldentities/WorldEntity.cc (modified)

	Fix team acquisition, edit test level and start to try to make a
	raytest