#
# ChangeLog for code/branches/presentationFS14/data/levels/scriptController.oxw
#
# Generated by Trac 1.0.9
# May 31, 2024, 10:38:19 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, 03 Apr 2014 11:21:01 GMT mkronig [10012]
	* code/branches/ScriptableController/data/levels/scriptController.oxw (added)
	* code/branches/ScriptableController/src/orxonox/controllers/ControllerDirector.cc (added)
	* code/branches/ScriptableController/src/orxonox/controllers/ControllerDirector.h (added)
	* code/branches/ScriptableController/src/orxonox/controllers/ScriptController.cc (modified)
	* code/branches/ScriptableController/src/orxonox/controllers/ScriptController.h (modified)

	commit 3.4.2014