#
# ChangeLog for code/branches/presentation3/src
#
# Generated by Trac 1.0.9
# Jun 3, 2024, 10:20:22 AM

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 ...