#
# ChangeLog for code/branches/levelMichael/src
#
# Generated by Trac 1.0.9
# Nov 23, 2024, 6:06:14 AM

Thu, 05 Dec 2013 19:46:18 GMT jo [9872]
	* code/branches/levelMichael/data/levels/Spacefight.oxw (modified)
	* code/branches/levelMichael/src/modules/overlays/hud/CountDown.cc (modified)
	* code/branches/levelMichael/src/modules/overlays/hud/CountDown.h (modified)

	Making the countdown speed configurable.


Tue, 03 Dec 2013 21:02:24 GMT jo [9870]
	* code/branches/levelMichael/data/levels/Spacefight.oxw (modified)
	* code/branches/levelMichael/data/levels/quests.oxw (modified)
	* code/branches/levelMichael/src/modules/overlays/OverlaysPrereqs.h (modified)
	* code/branches/levelMichael/src/modules/overlays/hud/CMakeLists.txt (modified)
	* code/branches/levelMichael/src/modules/overlays/hud/CountDown.cc (added)
	* code/branches/levelMichael/src/modules/overlays/hud/CountDown.h (added)

	Adding a countdown to the SpaceFight Level.


Mon, 25 Nov 2013 15:10:21 GMT jo [9823]
	* code/branches/levelMichael (modified)
	* code/branches/levelMichael/cmake/LibraryConfig.cmake (modified)
	* code/branches/levelMichael/data/gui/layouts/SingleplayerMenu.layout (modified)
	* code/branches/levelMichael/data/levels/gallery.oxw (modified)
	* code/branches/levelMichael/data/levels/includes/weaponSettingsEscort.oxi (modified)
	* code/branches/levelMichael/data/levels/templates/lodInformation.oxt (modified)
	* code/branches/levelMichael/src/libraries/core/GUIManager.cc (modified)
	* code/branches/levelMichael/src/libraries/util/CMakeLists.txt (modified)
	* code/branches/levelMichael/src/modules/tetris/TetrisBrick.cc (modified)

	merging latest trunk into branch 'levelMichael'


Thu, 31 Oct 2013 23:17:13 GMT jo [9731]
	* code/branches/levelMichael (modified)
	* code/branches/levelMichael/src/libraries/core/CorePrereqs.h (modified)
	* code/branches/levelMichael/src/orxonox/controllers/WaypointPatrolController.cc (modified)
	* code/branches/levelMichael/src/orxonox/controllers/WaypointPatrolController.h (modified)
	* code/branches/levelMichael/src/orxonox/gametypes/Mission.cc (modified)
	* code/branches/levelMichael/src/orxonox/gametypes/Mission.h (modified)

	Merged trunk into branch levelMichael to add new features.


Mon, 07 Oct 2013 12:51:35 GMT jo [9696]
	* code/branches/levelMichael (copied)

	Creating new PPS branch.


Thu, 03 Oct 2013 20:29:44 GMT landauf [9684]
	* code/trunk/src/libraries/core/config/ConfigFileEntryValue.h (modified)
	* code/trunk/src/libraries/core/config/ConfigFileSection.h (modified)
	* code/trunk/src/libraries/core/config/SettingsConfigFile.h (modified)

	added missing includes