#
# ChangeLog for code/branches/presentation2012merge/src/modules/pickup/items/SpeedPickup.h
#
# Generated by Trac 1.0.9
# Jun 3, 2024, 5:22:56 AM

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 ...


Sun, 03 Jun 2012 14:33:13 GMT landauf [9269]
	* code/branches/presentation2012merge (modified)
	* code/branches/presentation2012merge/data/gui/layouts/ShipSelectionMenu.layout (copied)
	* code/branches/presentation2012merge/data/gui/scripts/AudioMenu.lua (modified)
	* code/branches/presentation2012merge/data/gui/scripts/ShipSelectionMenu.lua (copied)
	* code/branches/presentation2012merge/data/gui/scripts/SingleplayerMenu.lua (modified)
	* code/branches/presentation2012merge/data/levels/SurfaceRacePresentation.oxw (copied)
	* code/branches/presentation2012merge/data/levels/includes/pickups.oxi (modified)
	* code/branches/presentation2012merge/data/levels/includes/towerWeaponSettings.oxi (copied)
	* code/branches/presentation2012merge/data/levels/pickups.oxw (modified)
	* code/branches/presentation2012merge/data/levels/portals.oxw (modified)
	* code/branches/presentation2012merge/data/levels/surfaceRace.oxw (copied)
	* code/branches/presentation2012merge/data/levels/teamDeathMatch.oxw (modified)
	* code/branches/presentation2012merge/data/levels/templates/pickupRepresentationTemplates.oxt (modified)
	* code/branches/presentation2012merge/data/levels/templates/spaceshipPirate.oxt (modified)
	* code/branches/presentation2012merge/data/levels/templates/spaceshipRace.oxt (copied)
	* code/branches/presentation2012merge/data/levels/templates/tower.oxt (copied)
	* code/branches/presentation2012merge/data/levels/theTimeMachine.oxw (modified)
	* code/branches/presentation2012merge/data/levels/towerDefense.oxw (copied)
	* code/branches/presentation2012merge/data/levels/tutorial.oxw (modified)
	* code/branches/presentation2012merge/data/overlays/towerdefenseHUD.oxo (copied)
	* code/branches/presentation2012merge/src/modules/CMakeLists.txt (modified)
	* code/branches/presentation2012merge/src/modules/pickup/PickupPrereqs.h (modified)
	* code/branches/presentation2012merge/src/modules/pickup/items/CMakeLists.txt (modified)
	* code/branches/presentation2012merge/src/modules/pickup/items/DamageBoostPickup.cc (copied)
	* code/branches/presentation2012merge/src/modules/pickup/items/DamageBoostPickup.h (copied)
	* code/branches/presentation2012merge/src/modules/pickup/items/SpeedPickup.h (modified)
	* code/branches/presentation2012merge/src/modules/towerdefense (copied)
	* code/branches/presentation2012merge/src/orxonox/LevelInfo.cc (modified)
	* code/branches/presentation2012merge/src/orxonox/LevelInfo.h (modified)
	* code/branches/presentation2012merge/src/orxonox/ShipManager.cc (copied)
	* code/branches/presentation2012merge/src/orxonox/ShipManager.h (copied)
	* code/branches/presentation2012merge/src/orxonox/controllers/FormationController.cc (modified)
	* code/branches/presentation2012merge/src/orxonox/worldentities/pawns/Pawn.cc (modified)
	* code/branches/presentation2012merge/src/orxonox/worldentities/pawns/Pawn.h (modified)

	merged presentation2012 to presentation2012merge


Sun, 03 Jun 2012 13:38:49 GMT landauf [9266]
	* code/branches/presentation2012merge (copied)

	created branch from trunk to merge the cleanup of presentation2011 ...


Sun, 03 Jul 2011 15:42:19 GMT dafrick [8727]
	* code/trunk/data/levels/templates/spaceshipAssff.oxt (modified)
	* code/trunk/data/levels/templates/spaceshipAssff2.oxt (modified)
	* code/trunk/src/modules/pickup/items/SpeedPickup.cc (modified)
	* code/trunk/src/modules/pickup/items/SpeedPickup.h (modified)
	* code/trunk/src/orxonox/gametypes/Dynamicmatch.cc (modified)
	* code/trunk/src/orxonox/gametypes/Dynamicmatch.h (modified)
	* code/trunk/src/orxonox/items/Engine.cc (modified)
	* code/trunk/src/orxonox/items/Engine.h (modified)
	* code/trunk/src/orxonox/items/MultiStateEngine.cc (modified)
	* code/trunk/src/orxonox/items/MultiStateEngine.h (modified)
	* code/trunk/src/orxonox/worldentities/MobileEntity.cc (modified)
	* code/trunk/src/orxonox/worldentities/MobileEntity.h (modified)
	* code/trunk/src/orxonox/worldentities/pawns/SpaceShip.cc (modified)
	* code/trunk/src/orxonox/worldentities/pawns/SpaceShip.h (modified)

	Cleaning up in SpaceShip and Engine. Fixed several bugs.
	Kicked ...