#
# ChangeLog for code/branches/pickup/src/libraries
#
# Generated by Trac 1.0.9
# Dec 26, 2024, 8:04:00 PM

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

	Some cleanup. Ready for merge.


Mon, 28 Mar 2011 13:31:45 GMT dafrick [8144]
	* code/branches/pickup (copied)

	Brnach to work on new pickups.


Wed, 23 Mar 2011 20:57:54 GMT dafrick [8108]
	* code/trunk (modified)
	* code/trunk/doc/api/Groups.dox (modified)
	* code/trunk/doc/api/groups (copied)
	* code/trunk/doc/api/groups/Notifications.dox (copied)
	* code/trunk/doc/api/groups/Pickup.dox (copied)
	* code/trunk/doc/api/groups/Questsystem.dox (copied)
	* code/trunk/doc/api/groups/Triggers.dox (copied)
	* code/trunk/src/libraries/core/Loader.cc (modified)
	* code/trunk/src/libraries/network/Host.cc (modified)
	* code/trunk/src/libraries/network/MasterServerComm.h (modified)
	* code/trunk/src/modules/designtools/ScreenshotManager.cc (modified)
	* code/trunk/src/modules/pickup/Pickup.h (modified)
	* code/trunk/src/modules/pong/Pong.cc (modified)
	* code/trunk/src/modules/pong/Pong.h (modified)
	* code/trunk/src/modules/pong/PongAI.cc (modified)
	* code/trunk/src/modules/pong/PongAI.h (modified)
	* code/trunk/src/modules/pong/PongBall.cc (modified)
	* code/trunk/src/modules/pong/PongBall.h (modified)
	* code/trunk/src/modules/pong/PongBat.cc (modified)
	* code/trunk/src/modules/pong/PongBat.h (modified)
	* code/trunk/src/modules/pong/PongBot.cc (modified)
	* code/trunk/src/modules/pong/PongBot.h (modified)
	* code/trunk/src/modules/pong/PongCenterpoint.cc (modified)
	* code/trunk/src/modules/pong/PongCenterpoint.h (modified)
	* code/trunk/src/modules/pong/PongScore.cc (modified)
	* code/trunk/src/modules/pong/PongScore.h (modified)

	Merging changes from tetris branch into trunk, since they are also ...