#
# ChangeLog for code/branches/mergeFS18/data/levels/presentationHS12.oxw
#
# Generated by Trac 1.0.9
# Jun 1, 2024, 6:41:44 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


Sat, 24 Feb 2018 00:49:10 GMT landauf [11802]
	* code/branches/cegui0.8_ogre1.9/data/gui/scripts/NotificationLayer.lua (modified)
	* code/branches/cegui0.8_ogre1.9/data/levels/AnihilationThreat.oxw (modified)
	* code/branches/cegui0.8_ogre1.9/data/levels/ArrowLevel.oxw (modified)
	* code/branches/cegui0.8_ogre1.9/data/levels/ProtectBoss.oxw (modified)
	* code/branches/cegui0.8_ogre1.9/data/levels/expeditionSector.oxw (modified)
	* code/branches/cegui0.8_ogre1.9/data/levels/iJohnVane_TriptoArea51.oxw (modified)
	* code/branches/cegui0.8_ogre1.9/data/levels/iiJohnVane_Area51UnderFire.oxw (modified)
	* code/branches/cegui0.8_ogre1.9/data/levels/iiiJohnVane_EscapeTheBastards.oxw (modified)
	* code/branches/cegui0.8_ogre1.9/data/levels/includes/notifications.oxi (modified)
	* code/branches/cegui0.8_ogre1.9/data/levels/kecks.oxw (modified)
	* code/branches/cegui0.8_ogre1.9/data/levels/maxim.oxw (modified)
	* code/branches/cegui0.8_ogre1.9/data/levels/missionOne.oxw (modified)
	* code/branches/cegui0.8_ogre1.9/data/levels/notifications.oxw (modified)
	* code/branches/cegui0.8_ogre1.9/data/levels/presentationFS11.oxw (modified)
	* code/branches/cegui0.8_ogre1.9/data/levels/presentationHS11.oxw (modified)
	* code/branches/cegui0.8_ogre1.9/data/levels/presentationHS12.oxw (modified)
	* code/branches/cegui0.8_ogre1.9/data/levels/shuttleAttack.oxw (modified)
	* code/branches/cegui0.8_ogre1.9/data/levels/shuttleRetaliation.oxw (modified)
	* code/branches/cegui0.8_ogre1.9/src/modules/notifications/NotificationManager.cc (modified)

	migrated NotificationLayer.lua to cegui 0.8