# # ChangeLog for code/branches/presentation2012merge/src/orxonox/interfaces/Pickupable.cc # # Generated by Trac 1.0.9 # Jun 17, 2024, 4:42:58 AM Sat, 21 Jul 2012 13:51:06 GMT landauf [9320] * code/branches/presentation2012merge/src/libraries/core/Super.h (modified) * code/branches/presentation2012merge/src/modules/pickup/Pickup.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/Pickup.h (modified) * code/branches/presentation2012merge/src/modules/pickup/PickupCollection.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/PickupCollection.h (modified) * code/branches/presentation2012merge/src/modules/pickup/items/DamageBoostPickup.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/items/DamageBoostPickup.h (modified) * code/branches/presentation2012merge/src/modules/pickup/items/DronePickup.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/items/DronePickup.h (modified) * code/branches/presentation2012merge/src/modules/pickup/items/HealthPickup.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/items/HealthPickup.h (modified) * code/branches/presentation2012merge/src/modules/pickup/items/InvisiblePickup.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/items/InvisiblePickup.h (modified) * code/branches/presentation2012merge/src/modules/pickup/items/MetaPickup.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/items/MetaPickup.h (modified) * code/branches/presentation2012merge/src/modules/pickup/items/ShieldPickup.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/items/ShieldPickup.h (modified) * code/branches/presentation2012merge/src/modules/pickup/items/ShrinkPickup.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/items/ShrinkPickup.h (modified) * code/branches/presentation2012merge/src/modules/pickup/items/SpeedPickup.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/items/SpeedPickup.h (modified) * code/branches/presentation2012merge/src/orxonox/interfaces/Pickupable.cc (modified) * code/branches/presentation2012merge/src/orxonox/interfaces/Pickupable.h (modified) removed Pickupable::clone() because it is not needed anymore Wed, 18 Jul 2012 20:36:24 GMT landauf [9318] * code/branches/presentation2012merge/data/gui/scripts/PickupInventory.lua (modified) * code/branches/presentation2012merge/data/levels/includes/pickups.oxi (modified) * code/branches/presentation2012merge/data/levels/pickups.oxw (modified) * code/branches/presentation2012merge/data/levels/presentation09b.oxw (modified) * code/branches/presentation2012merge/data/levels/presentationFS10.oxw (modified) * code/branches/presentation2012merge/data/levels/presentationHS09.oxw (modified) * code/branches/presentation2012merge/data/levels/templates/pickupRepresentationTemplates.oxt (modified) * code/branches/presentation2012merge/src/modules/pickup/CMakeLists.txt (modified) * code/branches/presentation2012merge/src/modules/pickup/Pickup.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/Pickup.h (modified) * code/branches/presentation2012merge/src/modules/pickup/PickupCollection.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/PickupCollection.h (modified) * code/branches/presentation2012merge/src/modules/pickup/PickupCollectionIdentifier.cc (deleted) * code/branches/presentation2012merge/src/modules/pickup/PickupCollectionIdentifier.h (deleted) * code/branches/presentation2012merge/src/modules/pickup/PickupManager.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/PickupManager.h (modified) * code/branches/presentation2012merge/src/modules/pickup/PickupPrereqs.h (modified) * code/branches/presentation2012merge/src/modules/pickup/PickupRepresentation.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/PickupRepresentation.h (modified) * code/branches/presentation2012merge/src/modules/pickup/PickupSpawner.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/items/DamageBoostPickup.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/items/DamageBoostPickup.h (modified) * code/branches/presentation2012merge/src/modules/pickup/items/DronePickup.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/items/DronePickup.h (modified) * code/branches/presentation2012merge/src/modules/pickup/items/HealthPickup.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/items/HealthPickup.h (modified) * code/branches/presentation2012merge/src/modules/pickup/items/InvisiblePickup.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/items/InvisiblePickup.h (modified) * code/branches/presentation2012merge/src/modules/pickup/items/MetaPickup.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/items/MetaPickup.h (modified) * code/branches/presentation2012merge/src/modules/pickup/items/ShieldPickup.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/items/ShieldPickup.h (modified) * code/branches/presentation2012merge/src/modules/pickup/items/ShrinkPickup.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/items/ShrinkPickup.h (modified) * code/branches/presentation2012merge/src/modules/pickup/items/SpeedPickup.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/items/SpeedPickup.h (modified) * code/branches/presentation2012merge/src/orxonox/CMakeLists.txt (modified) * code/branches/presentation2012merge/src/orxonox/OrxonoxPrereqs.h (modified) * code/branches/presentation2012merge/src/orxonox/interfaces/Pickupable.cc (modified) * code/branches/presentation2012merge/src/orxonox/interfaces/Pickupable.h (modified) * code/branches/presentation2012merge/src/orxonox/pickup (deleted) removed PickupIdentifier for a number of reasons (I talked to Damian ... Mon, 11 Jun 2012 20:57:40 GMT dafrick [9293] * code/branches/presentation2012merge/src/modules/pickup/PickupCollection.cc (modified) * code/branches/presentation2012merge/src/orxonox/interfaces/Pickupable.cc (modified) * code/branches/presentation2012merge/src/orxonox/interfaces/Pickupable.h (modified) Should fix internal warnig (and compile error introduced in last commit) Mon, 04 Jun 2012 20:50:28 GMT landauf [9279] * code/branches/presentation2012merge/src/libraries/core/Super.h (modified) * code/branches/presentation2012merge/src/libraries/core/XMLPort.h (modified) * code/branches/presentation2012merge/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/branches/presentation2012merge/src/modules/overlays/hud/HUDRadar.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/Pickup.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/PickupCollection.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/PickupSpawner.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/items/DamageBoostPickup.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/items/DronePickup.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/items/HealthPickup.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/items/InvisiblePickup.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/items/MetaPickup.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/items/ShieldPickup.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/items/ShrinkPickup.cc (modified) * code/branches/presentation2012merge/src/modules/pickup/items/SpeedPickup.cc (modified) * code/branches/presentation2012merge/src/modules/weapons/RocketController.cc (modified) * code/branches/presentation2012merge/src/orxonox/controllers/NewHumanController.cc (modified) * code/branches/presentation2012merge/src/orxonox/gamestates/GSRoot.cc (modified) * code/branches/presentation2012merge/src/orxonox/gametypes/Dynamicmatch.cc (modified) * code/branches/presentation2012merge/src/orxonox/gametypes/LastManStanding.cc (modified) * code/branches/presentation2012merge/src/orxonox/gametypes/LastTeamStanding.cc (modified) * code/branches/presentation2012merge/src/orxonox/interfaces/Pickupable.cc (modified) * code/branches/presentation2012merge/src/orxonox/worldentities/ControllableEntity.cc (modified) use orxonox_cast instead of dynamic_cast wherever possible Sun, 03 Jun 2012 13:38:49 GMT landauf [9266] * code/branches/presentation2012merge (copied) created branch from trunk to merge the cleanup of presentation2011 ... Wed, 24 Aug 2011 13:28:55 GMT dafrick [8866] * code/trunk/src/libraries/core/OrxonoxClass.h (modified) * code/trunk/src/libraries/core/Super.h (modified) * code/trunk/src/orxonox/interfaces/Pickupable.cc (modified) * code/trunk/src/orxonox/interfaces/Pickupable.h (modified) Moved clone base method into Pickupable to avoid ambiguity.