#
# ChangeLog for code/branches/mergeFS18/src/modules/gametypes/SpaceRaceController.h
#
# Generated by Trac 1.0.9
# May 18, 2024, 10:09:23 PM

Wed, 10 Oct 2018 13:36:53 GMT merholzl [12029]
	* code/branches/mergeFS18 (modified)
	* code/branches/mergeFS18/data/levels/newnewnewspacerace.oxw (modified)
	* code/branches/mergeFS18/data/levels/presentationHS12.oxw (modified)
	* code/branches/mergeFS18/data/levels/templates/SpaceRaceTemplates.oxt (copied)
	* code/branches/mergeFS18/data/levels/templates/fastship.oxt (modified)
	* code/branches/mergeFS18/data/levels/templates/spaceshipCollateralDamage.oxt (modified)
	* code/branches/mergeFS18/src/libraries/tools/Timer.h (modified)
	* code/branches/mergeFS18/src/modules/gametypes/SpaceRace.cc (modified)
	* code/branches/mergeFS18/src/modules/gametypes/SpaceRace.h (modified)
	* code/branches/mergeFS18/src/modules/gametypes/SpaceRaceController.cc (modified)
	* code/branches/mergeFS18/src/modules/gametypes/SpaceRaceController.h (modified)
	* code/branches/mergeFS18/src/modules/gametypes/SpaceRaceManager.cc (modified)
	* code/branches/mergeFS18/src/orxonox/items/Engine.cc (modified)
	* code/branches/mergeFS18/src/orxonox/worldentities/pawns/SpaceShip.cc (modified)
	* code/branches/mergeFS18/src/orxonox/worldentities/pawns/SpaceShip.h (modified)

	added space race improvements


Wed, 10 Oct 2018 09:13:30 GMT merholzl [12026]
	* code/branches/mergeFS18 (copied)

	new merge branch to cequi 0.8 and ogre 1.9


Tue, 20 Feb 2018 20:23:01 GMT landauf [11787]
	* code/branches/cegui0.8_ogre1.9 (copied)

	created new branch to merge cegui0.8 and ogre1.9 with the recent ...