#
# ChangeLog for trunk/src/lib/script_engine/object.cc in orxonox.OLD
#
# Generated by Trac 1.0.9
# May 29, 2024, 1:37:57 AM

Wed, 14 Jun 2006 15:50:18 GMT bensch [8408]
	* trunk/src/lib/script_engine/Makefile.am (modified)
	* trunk/src/lib/script_engine/account.cc (modified)
	* trunk/src/lib/script_engine/lunar.h (modified)
	* trunk/src/lib/script_engine/lunartest2.lua (modified)
	* trunk/src/lib/script_engine/object.cc (modified)
	* trunk/src/lib/script_engine/script.cc (modified)
	* trunk/src/lib/script_engine/script.h (modified)
	* trunk/src/lib/script_engine/script_class.cc (modified)
	* trunk/src/lib/script_engine/script_class.h (modified)
	* trunk/src/lib/script_engine/script_manager.cc (modified)
	* trunk/src/lib/util/executor/executor.h (modified)
	* trunk/src/lib/util/executor/executor_functional.cc (modified)
	* trunk/src/lib/util/executor/executor_lua.cc (modified)
	* trunk/src/lib/util/executor/executor_lua.h (modified)
	* trunk/src/lib/util/loading/load_param.cc (modified)
	* trunk/src/lib/util/substring.h (modified)
	* trunk/src/story_entities/game_world.cc (modified)
	* trunk/src/util/state.h (modified)
	* trunk/src/world_entities/script_trigger.cc (modified)
	* trunk/src/world_entities/script_trigger.h (modified)
	* trunk/src/world_entities/space_ships/helicopter.cc (modified)
	* trunk/src/world_entities/space_ships/helicopter.h (modified)

	trunk: merged the script_engine branche back here
	merged with ...


Thu, 08 Jun 2006 14:50:50 GMT bensch [8271]
	* trunk/src/Makefile.am (modified)
	* trunk/src/defs/class_id.h (modified)
	* trunk/src/defs/include_paths.am (modified)
	* trunk/src/lib/BuildLibs.am (modified)
	* trunk/src/lib/Makefile.am (modified)
	* trunk/src/lib/gui/gl/signal_connector.cc (modified)
	* trunk/src/lib/lang/class_list.cc (modified)
	* trunk/src/lib/lang/class_list.h (modified)
	* trunk/src/lib/script_engine/Makefile.am (modified)
	* trunk/src/lib/script_engine/OLD (deleted)
	* trunk/src/lib/script_engine/Script.cc (deleted)
	* trunk/src/lib/script_engine/Script.h (deleted)
	* trunk/src/lib/script_engine/account.cc (copied)
	* trunk/src/lib/script_engine/example.cc (copied)
	* trunk/src/lib/script_engine/luna (deleted)
	* trunk/src/lib/script_engine/lunar.h (modified)
	* trunk/src/lib/script_engine/lunartest2.lua (modified)
	* trunk/src/lib/script_engine/object.cc (copied)
	* trunk/src/lib/script_engine/script.cc (copied)
	* trunk/src/lib/script_engine/script.h (copied)
	* trunk/src/lib/script_engine/script_class.cc (copied)
	* trunk/src/lib/script_engine/script_class.h (copied)
	* trunk/src/lib/script_engine/script_manager.cc (copied)
	* trunk/src/lib/script_engine/script_manager.h (copied)
	* trunk/src/lib/scripting (deleted)
	* trunk/src/lib/util/executor/executor.h (modified)
	* trunk/src/lib/util/executor/executor_functional.h (modified)
	* trunk/src/lib/util/executor/executor_lua.cc (modified)
	* trunk/src/lib/util/executor/executor_lua.h (modified)
	* trunk/src/lib/util/executor/executor_xml.h (modified)
	* trunk/src/lib/util/loading/resource.cc (modified)
	* trunk/src/story_entities/game_world.cc (modified)
	* trunk/src/story_entities/game_world.h (modified)
	* trunk/src/util/state.cc (modified)
	* trunk/src/util/state.h (modified)
	* trunk/src/world_entities/WorldEntities.am (modified)
	* trunk/src/world_entities/script_trigger.cc (copied)
	* trunk/src/world_entities/script_trigger.h (copied)

	merge


Thu, 08 Jun 2006 13:06:29 GMT bensch [8250]
	* branches/script_engine/src/defs/include_paths.am (modified)
	* branches/script_engine/src/lib/script_engine/Makefile.am (modified)
	* branches/script_engine/src/lib/script_engine/account.cc (moved)
	* branches/script_engine/src/lib/script_engine/object.cc (moved)
	* branches/script_engine/src/lib/script_engine/script_class.h (modified)

	linking