#
# ChangeLog for code/branches/presentationFS14/data/levels/includes/weaponSettingsTurret.oxi
#
# Generated by Trac 1.0.9
# May 29, 2024, 12:55:15 PM

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


Sun, 25 Aug 2013 08:05:10 GMT landauf [9664]
	* code/trunk/data/levels/bigshipPresentation.oxw (modified)
	* code/trunk/data/levels/collateralDamageDemo.oxw (modified)
	* code/trunk/data/levels/gallery.oxw (modified)
	* code/trunk/data/levels/includes/weaponSettingsCollateral.oxi (modified)
	* code/trunk/data/levels/includes/weaponSettingsEscort.oxi (modified)
	* code/trunk/data/levels/includes/weaponSettingsTurret.oxi (modified)
	* code/trunk/data/levels/includes/weaponSettingsbigship.oxi (modified)
	* code/trunk/data/levels/maxim.oxw (modified)
	* code/trunk/data/levels/presentationHS12.oxw (modified)
	* code/trunk/data/levels/templates/bigship.oxt (modified)
	* code/trunk/data/levels/templates/spaceshipCollateralDamage.oxt (modified)
	* code/trunk/data/levels/templates/spaceshipEscort.oxt (modified)
	* code/trunk/data/levels/templates/spaceshipTurret.oxt (modified)
	* code/trunk/data/levels/turretTest.oxw (modified)
	* code/trunk/data/overlays/tetrisHUD.oxo (modified)

	eol-style native