#
# ChangeLog for code/branches/presentation3
#
# Generated by Trac 1.0.9
# Jun 1, 2024, 1:54:51 PM

Thu, 20 May 2010 12:40:53 GMT scheusso [6933]
	* code/branches/presentation3/src/orxonox/LevelManager.cc (modified)

	make sure this won't happen again


Thu, 20 May 2010 12:38:40 GMT scheusso [6932]
	* code/branches/presentation3/data/levels/templates/lodinformation.oxt (modified)

	this way the default values will not be set when applying this
	template


Thu, 20 May 2010 09:33:07 GMT scheusso [6928]
	* code/branches/presentation3 (modified)
	* code/branches/presentation3/data/defaultConfig/keybindings.ini (modified)
	* code/branches/presentation3/data/gui/layouts/ChatBox-inputonly.layout (copied)
	* code/branches/presentation3/data/gui/layouts/ChatBox.layout (copied)
	* code/branches/presentation3/data/gui/schemes/OrxonoxGUIScheme.scheme (modified)
	* code/branches/presentation3/data/gui/scripts/ChatBox-inputonly.lua (copied)
	* code/branches/presentation3/data/gui/scripts/ChatBox.lua (copied)
	* code/branches/presentation3/src/libraries/network/ChatListener.cc (modified)
	* code/branches/presentation3/src/libraries/network/ChatListener.h (modified)
	* code/branches/presentation3/src/libraries/network/Host.h (modified)
	* code/branches/presentation3/src/libraries/network/packet/Chat.cc (modified)
	* code/branches/presentation3/src/libraries/network/packet/Chat.h (modified)
	* code/branches/presentation3/src/orxonox/CMakeLists.txt (modified)
	* code/branches/presentation3/src/orxonox/ChatHistory.cc (copied)
	* code/branches/presentation3/src/orxonox/ChatHistory.h (copied)
	* code/branches/presentation3/src/orxonox/ChatInputHandler.cc (copied)
	* code/branches/presentation3/src/orxonox/ChatInputHandler.h (copied)
	* code/branches/presentation3/src/orxonox/graphics/CEGuiSample.cc (copied)
	* code/branches/presentation3/src/orxonox/graphics/CEGuiSample.h (copied)

	mergine chat2 into presentation merger branch


Thu, 20 May 2010 08:28:10 GMT scheusso [6927]
	* code/branches/presentation3/src/orxonox/LevelManager.cc (modified)

	fix in levelmanager: if a template was assigned to the Level the ...


Thu, 20 May 2010 08:23:22 GMT scheusso [6926]
	* code/branches/presentation3 (modified)
	* code/branches/presentation3/data/levels/empty_level.oxw (modified)
	* code/branches/presentation3/data/levels/gametype_asteroids.oxw (modified)
	* code/branches/presentation3/data/levels/gametype_underattack.oxw (modified)
	* code/branches/presentation3/data/levels/presentationLOD.oxw (copied)
	* code/branches/presentation3/data/levels/presentationLODdif.oxw (copied)
	* code/branches/presentation3/data/levels/teambasematchlevel.oxw (modified)
	* code/branches/presentation3/data/levels/teamdeathmatch.oxw (modified)
	* code/branches/presentation3/data/levels/templates/lodinformation.oxt (copied)
	* code/branches/presentation3/src/libraries/core/BaseObject.cc (modified)
	* code/branches/presentation3/src/libraries/core/BaseObject.h (modified)
	* code/branches/presentation3/src/orxonox/Level.cc (modified)
	* code/branches/presentation3/src/orxonox/Level.h (modified)
	* code/branches/presentation3/src/orxonox/LevelManager.cc (modified)
	* code/branches/presentation3/src/orxonox/graphics/CMakeLists.txt (modified)
	* code/branches/presentation3/src/orxonox/graphics/MeshLodInformation.cc (copied)
	* code/branches/presentation3/src/orxonox/graphics/MeshLodInformation.h (copied)
	* code/branches/presentation3/src/orxonox/graphics/Model.cc (modified)
	* code/branches/presentation3/src/orxonox/graphics/Model.h (modified)

	merging lod branch into presentation3 merger branch


Mon, 17 May 2010 14:57:26 GMT stmathia [6920]
	* code/branches/presentation3/data/levels/Level(Deathmatch).oxw (added)
	* code/branches/presentation3/data/levels/Level(UnderAttack).oxw (added)
	* code/branches/presentation3/data/levels/mylevel.oxw (added)
	* code/branches/presentation3/src/orxonox/gametypes/TeamDeathmatch.cc (modified)

	Changes in level files. Addition to TemaDeathmatch, should now be ...


Mon, 17 May 2010 13:31:49 GMT scheusso [6912]
	* code/branches/presentation3 (copied)

	creating new presentation merger branch


Mon, 17 May 2010 11:22:26 GMT dafrick [6906]
	* code/trunk/data/gui/scripts/PickupInventory.lua (modified)
	* code/trunk/src/modules/objects/ObjectsPrereqs.h (modified)
	* code/trunk/src/modules/objects/triggers/CMakeLists.txt (modified)
	* code/trunk/src/modules/objects/triggers/DistanceMultiTrigger.cc (modified)
	* code/trunk/src/modules/objects/triggers/DistanceMultiTrigger.h (modified)
	* code/trunk/src/modules/objects/triggers/DistanceTrigger.cc (modified)
	* code/trunk/src/modules/objects/triggers/DistanceTrigger.h (modified)
	* code/trunk/src/modules/objects/triggers/DistanceTriggerBeacon.cc (added)
	* code/trunk/src/modules/objects/triggers/DistanceTriggerBeacon.h (added)
	* code/trunk/src/modules/questsystem/QuestEffectBeacon.cc (modified)

	Added DistanceTriggerBeacon, which is a device which can be attached ...