#
# ChangeLog for code/branches/SciptableControllerFS15
#
# Generated by Trac 1.0.9
# May 1, 2024, 9:20:11 AM

Sun, 04 Oct 2015 09:51:01 GMT landauf [10609]
	* code/branches/SciptableControllerFS15 (modified)
	* code/branches/SciptableControllerFS15/data/gui/scripts/presentation.lua (copied)
	* code/branches/SciptableControllerFS15/data/gui/scripts/testscript.lua (modified)
	* code/branches/SciptableControllerFS15/data/levels/scriptController.oxw (modified)
	* code/branches/SciptableControllerFS15/src/orxonox/controllers/ControllerDirector.cc (modified)
	* code/branches/SciptableControllerFS15/src/orxonox/controllers/ControllerDirector.h (modified)

	merged r10499 from presentationFS15 into this branch


Sun, 27 Sep 2015 20:39:57 GMT landauf [10605]
	* code/branches/SciptableControllerFS15/src/orxonox/controllers/ScriptController.cc (modified)

	added changes from presentationFS15 branch


Sun, 27 Sep 2015 19:11:20 GMT landauf [10600]
	* code/branches/SciptableControllerFS15/src/orxonox/controllers/ScriptController.cc (modified)
	* code/branches/SciptableControllerFS15/src/orxonox/controllers/ScriptController.h (modified)

	fixed warnings


Thu, 21 May 2015 12:55:51 GMT rgraczyk [10448]
	* code/branches/SciptableControllerFS15/data/gui/scripts/testscript.lua (modified)
	* code/branches/SciptableControllerFS15/src/orxonox/controllers/ScriptController.cc (modified)
	* code/branches/SciptableControllerFS15/src/orxonox/controllers/ScriptController.h (modified)

	Various changes, see comments in cpp file


Thu, 12 Mar 2015 14:56:09 GMT rgraczyk [10315]
	* code/branches/SciptableControllerFS15/src/orxonox/controllers/ScriptController.h (modified)

	Added some comments


Thu, 12 Mar 2015 13:19:18 GMT maxima [10308]
	* code/branches/SciptableControllerFS15 (copied)

	new branch for PPS