#
# ChangeLog for code/branches/presentationFS15merge/data/gui/scripts/presentation.lua
#
# Generated by Trac 1.0.9
# May 4, 2024, 7:06:42 PM

Sun, 04 Oct 2015 12:18:02 GMT landauf [10617]
	* code/branches/presentationFS15merge/data/defaultConfig/keybindings.ini (modified)
	* code/branches/presentationFS15merge/data/gui/scripts/presentation.lua (modified)
	* code/branches/presentationFS15merge/data/gui/scripts/testscript.lua (modified)
	* code/branches/presentationFS15merge/data/levels/clangenb.oxw (modified)
	* code/branches/presentationFS15merge/data/levels/includes/weaponSettingsFS15.oxi (copied)
	* code/branches/presentationFS15merge/data/levels/includes/weaponSettingsHeartAttack.oxi (modified)
	* code/branches/presentationFS15merge/data/levels/includes/weaponSettingsRing.oxi (copied)
	* code/branches/presentationFS15merge/data/levels/presentationFS15.oxw (copied)
	* code/branches/presentationFS15merge/data/levels/simone.oxw (copied)
	* code/branches/presentationFS15merge/data/levels/templates/spaceshipFS15.oxt (copied)
	* code/branches/presentationFS15merge/data/levels/templates/spaceshipHeartAttack.oxt (modified)
	* code/branches/presentationFS15merge/data/levels/templates/spaceshipRing.oxt (copied)

	added new levels and modified ship definitions from branch ...


Sun, 04 Oct 2015 10:16:42 GMT landauf [10614]
	* code/branches/presentationFS15merge (modified)
	* code/branches/presentationFS15merge/data/gui/scripts/presentation.lua (copied)
	* code/branches/presentationFS15merge/data/gui/scripts/testscript.lua (modified)
	* code/branches/presentationFS15merge/data/levels/scriptController.oxw (modified)
	* code/branches/presentationFS15merge/src/orxonox/controllers/ControllerDirector.cc (modified)
	* code/branches/presentationFS15merge/src/orxonox/controllers/ControllerDirector.h (modified)
	* code/branches/presentationFS15merge/src/orxonox/controllers/ScriptController.cc (modified)
	* code/branches/presentationFS15merge/src/orxonox/controllers/ScriptController.h (modified)

	merged branch SciptableControllerFS15


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