#
# ChangeLog for code/branches/presentation/src
#
# Generated by Trac 1.0.9
# Aug 12, 2025, 6:14:32 PM

Mon, 23 May 2011 21:40:58 GMT dafrick [8556]
	* code/branches/presentation (modified)
	* code/branches/presentation/data/levels/includes/pickups.oxi (modified)
	* code/branches/presentation/data/levels/pickups.oxw (modified)
	* code/branches/presentation/data/levels/templates/pickupRepresentationTemplates.oxt (modified)
	* code/branches/presentation/src/libraries/util/SubString.h (modified)
	* code/branches/presentation/src/modules/objects/collisionshapes/BoxCollisionShape.cc (modified)
	* code/branches/presentation/src/modules/objects/collisionshapes/BoxCollisionShape.h (modified)
	* code/branches/presentation/src/modules/objects/collisionshapes/ConeCollisionShape.cc (modified)
	* code/branches/presentation/src/modules/objects/collisionshapes/ConeCollisionShape.h (modified)
	* code/branches/presentation/src/modules/objects/collisionshapes/PlaneCollisionShape.cc (modified)
	* code/branches/presentation/src/modules/objects/collisionshapes/PlaneCollisionShape.h (modified)
	* code/branches/presentation/src/modules/objects/collisionshapes/SphereCollisionShape.cc (modified)
	* code/branches/presentation/src/modules/objects/collisionshapes/SphereCollisionShape.h (modified)
	* code/branches/presentation/src/modules/pickup/PickupPrereqs.h (modified)
	* code/branches/presentation/src/modules/pickup/items/CMakeLists.txt (modified)
	* code/branches/presentation/src/modules/pickup/items/ShrinkPickup.cc (copied)
	* code/branches/presentation/src/modules/pickup/items/ShrinkPickup.h (copied)
	* code/branches/presentation/src/orxonox/collisionshapes/CollisionShape.cc (modified)
	* code/branches/presentation/src/orxonox/collisionshapes/CollisionShape.h (modified)
	* code/branches/presentation/src/orxonox/collisionshapes/CompoundCollisionShape.cc (modified)
	* code/branches/presentation/src/orxonox/collisionshapes/CompoundCollisionShape.h (modified)
	* code/branches/presentation/src/orxonox/worldentities/WorldEntity.cc (modified)

	Merging pickup branch into presentation branch.


Wed, 18 May 2011 08:57:00 GMT dafrick [8499]
	* code/branches/presentation (copied)

	Creating new presentation branch.


Sat, 14 May 2011 15:30:26 GMT dafrick [8484]
	* code/trunk/data/gui/scripts/SheetManager.lua (modified)
	* code/trunk/src/orxonox/overlays/InGameConsole.cc (modified)

	Turns out my pervious fix actually induced a bug, this fix should ...