#
# ChangeLog for code/branches/presentationFS14/data/gui
#
# Generated by Trac 1.0.9
# Dec 27, 2024, 6:23:59 AM

Thu, 22 May 2014 13:59:14 GMT smerkli [10076]
	* code/branches/presentationFS14 (modified)
	* code/branches/presentationFS14/data/gui/scripts/testscript.lua (copied)
	* code/branches/presentationFS14/data/levels/levelTry.oxw (copied)
	* code/branches/presentationFS14/data/levels/michaelstestfile.lua (copied)
	* code/branches/presentationFS14/data/levels/scriptController.oxw (copied)
	* code/branches/presentationFS14/src/orxonox/CMakeLists.txt (modified)
	* code/branches/presentationFS14/src/orxonox/controllers/CMakeLists.txt (modified)
	* code/branches/presentationFS14/src/orxonox/controllers/ControllerDirector.cc (copied)
	* code/branches/presentationFS14/src/orxonox/controllers/ControllerDirector.h (copied)
	* code/branches/presentationFS14/src/orxonox/controllers/ScriptController.cc (copied)
	* code/branches/presentationFS14/src/orxonox/controllers/ScriptController.h (copied)
	* code/branches/presentationFS14/src/orxonox/controllers/testscript.lua (copied)

	Merged scriptcontroller branch


Thu, 22 May 2014 11:36:06 GMT smerkli [10069]
	* code/branches/presentationFS14 (copied)

	Created a presentation branch


Sat, 04 Jan 2014 20:42:47 GMT jo [9977]
	* code/trunk/data/gui/scripts/MiscConfigMenu.lua (modified)
	* code/trunk/src/orxonox/gametypes/Gametype.cc (modified)
	* code/trunk/src/orxonox/gametypes/Gametype.h (modified)

	So far so good. Unfortunately I did not figure out what is wrong with ...