#
# ChangeLog for code/branches/presentation
#
# Generated by Trac 1.0.9
# Nov 26, 2024, 10:14:42 AM

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.


Mon, 23 May 2011 14:14:57 GMT youngk [8546]
	* code/branches/presentation/data/levels/presentationFS11.oxw (modified)

	Minor changes to the realism of planets in the presentation level.


Thu, 19 May 2011 14:13:10 GMT smerkli [8512]
	* code/branches/presentation/data/levels/presentationFS11.oxw (modified)

	changed presentation level a little


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

	Creating new presentation branch.


Wed, 18 May 2011 08:55:36 GMT dafrick [8498]
	* code/trunk/data/levels/earth.oxw (modified)
	* code/trunk/data/levels/planets.oxw (modified)

	Removing some tags because the cause warnings for now, might be re- ...