# # ChangeLog for code/branches/pickup # # Generated by Trac 1.0.9 # Jun 3, 2024, 1:01:12 AM Mon, 23 May 2011 21:37:17 GMT dafrick [8555] * code/branches/pickup/src/modules/pickup/items/ShrinkPickup.cc (modified) Some additional cleanup. 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, 23 May 2011 14:01:49 GMT ssgier [8543] * 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) copypasted templates for medium and huge in ... Mon, 23 May 2011 12:52:25 GMT ssgier [8536] * code/branches/pickup/src/modules/pickup/items/ShrinkPickup.h (modified) added comments Mon, 23 May 2011 12:39:49 GMT ssgier [8535] * code/branches/pickup/src/modules/pickup/items/ShrinkPickup.cc (modified) * code/branches/pickup/src/modules/pickup/items/ShrinkPickup.h (modified) corrected comments Mon, 23 May 2011 12:37:08 GMT ssgier [8534] * code/branches/pickup/data/levels/pickups.oxw (modified) * code/branches/pickup/src/modules/pickup/items/ShrinkPickup.cc (modified) * code/branches/pickup/src/modules/pickup/items/ShrinkPickup.h (modified) finished code for ShrinkPickup, adapted XML file\ Wed, 18 May 2011 10:36:59 GMT dafrick [8502] * code/branches/pickup/data/levels/pickups.oxw (modified) * code/branches/pickup/src/modules/pickup/items/ShrinkPickup.cc (modified) * code/branches/pickup/src/modules/pickup/items/ShrinkPickup.h (modified) Minor changes. Mon, 16 May 2011 13:49:59 GMT ssgier [8489] * code/branches/pickup/src/modules/pickup/items/ShrinkPickup.cc (modified) * code/branches/pickup/src/modules/pickup/items/ShrinkPickup.h (modified) finished code for shrinking and growing Mon, 16 May 2011 11:27:03 GMT dafrick [8486] * code/branches/pickup/src/modules/pickup/items/ShrinkPickup.cc (modified) ... Mon, 09 May 2011 13:58:48 GMT ssgier [8433] * code/branches/pickup/src/modules/pickup/items/ShrinkPickup.cc (modified) * code/branches/pickup/src/modules/pickup/items/ShrinkPickup.h (modified) working on continuous shrinking Sun, 08 May 2011 21:45:32 GMT dafrick [8422] * code/branches/pickup/src/modules/objects/collisionshapes/BoxCollisionShape.cc (modified) * code/branches/pickup/src/modules/objects/collisionshapes/BoxCollisionShape.h (modified) * code/branches/pickup/src/modules/objects/collisionshapes/ConeCollisionShape.cc (modified) * code/branches/pickup/src/modules/objects/collisionshapes/ConeCollisionShape.h (modified) * code/branches/pickup/src/modules/objects/collisionshapes/PlaneCollisionShape.cc (modified) * code/branches/pickup/src/modules/objects/collisionshapes/PlaneCollisionShape.h (modified) * code/branches/pickup/src/modules/objects/collisionshapes/SphereCollisionShape.cc (modified) * code/branches/pickup/src/modules/objects/collisionshapes/SphereCollisionShape.h (modified) * code/branches/pickup/src/orxonox/collisionshapes/CollisionShape.cc (modified) * code/branches/pickup/src/orxonox/collisionshapes/CollisionShape.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) Documenting collision shapes in an effort to understand them and ... Mon, 02 May 2011 13:58:10 GMT ssgier [8381] * code/branches/pickup/src/modules/pickup/items/ShrinkPickup.cc (modified) * code/branches/pickup/src/modules/pickup/items/ShrinkPickup.h (modified) started creating a more efficient code structure Mon, 02 May 2011 11:22:15 GMT ssgier [8375] * code/branches/pickup/src/modules/pickup/items/ShrinkPickup.cc (added) * code/branches/pickup/src/modules/pickup/items/ShrinkPickup.h (added) added source files for ShrinkPickup Mon, 18 Apr 2011 14:08:46 GMT ssgier [8255] * code/branches/pickup/data/levels/pickups.oxw (modified) * code/branches/pickup/src/modules/pickup/PickupPrereqs.h (modified) * code/branches/pickup/src/modules/pickup/items/CMakeLists.txt (modified) No Comment 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 ...