#
# ChangeLog for code/branches/ppspickups1
#
# Generated by Trac 1.0.9
# Nov 28, 2024, 3:45:02 AM

Mon, 12 Apr 2010 22:41:52 GMT dafrick [6706]
	* code/branches/ppspickups1/src/modules/pickup/items/SpeedPickup.cc (modified)
	* code/branches/ppspickups1/src/modules/pickup/items/SpeedPickup.h (modified)

	Small adaptations in SpeedPickup.


Mon, 12 Apr 2010 22:09:10 GMT dafrick [6705]
	* code/branches/ppspickups1/src/modules/pickup/Pickup.cc (modified)
	* code/branches/ppspickups1/src/modules/pickup/Pickup.h (modified)
	* code/branches/ppspickups1/src/modules/pickup/items/SpeedPickup.h (modified)
	* code/branches/ppspickups1/src/orxonox/items/Engine.h (modified)
	* code/branches/ppspickups1/src/orxonox/worldentities/pawns/SpaceShip.cc (modified)

	Minor cleanup.


Mon, 12 Apr 2010 21:01:35 GMT dafrick [6703]
	* code/branches/ppspickups1/src/orxonox/items/MultiStateEngine.cc (modified)

	Removed warning (and possible error, I'm not sure) in
	MultiStateEngine.


Mon, 12 Apr 2010 14:08:15 GMT ebeier [6694]
	* code/branches/ppspickups1/data/levels/includes/pickups_speed.oxi (modified)
	* code/branches/ppspickups1/data/levels/pickup_ppstest1.oxw (modified)
	* code/branches/ppspickups1/data/levels/templates/pickup_representation_templates_speed.oxt (modified)
	* code/branches/ppspickups1/src/modules/pickup/items/SpeedPickup.cc (modified)
	* code/branches/ppspickups1/svntest.txt (deleted)

	added some speedpickup templates


Sun, 11 Apr 2010 14:29:06 GMT ebeier [6681]
	* code/branches/ppspickups1/src/modules/pickup/items/HealthPickup.cc (modified)
	* code/branches/ppspickups1/src/modules/pickup/items/HealthPickup.h (modified)
	* code/branches/ppspickups1/src/modules/pickup/items/MetaPickup.cc (modified)
	* code/branches/ppspickups1/src/modules/pickup/items/MetaPickup.h (modified)
	* code/branches/ppspickups1/src/modules/pickup/items/SpeedPickup.cc (modified)
	* code/branches/ppspickups1/src/modules/pickup/items/SpeedPickup.h (modified)

	added svn:eol-style native


Mon, 29 Mar 2010 14:44:54 GMT ebeier [6648]
	* code/branches/ppspickups1/svntest.txt (modified)




Mon, 29 Mar 2010 14:44:24 GMT ebeier [6647]
	* code/branches/ppspickups1/svntest.txt (modified)




Mon, 29 Mar 2010 14:43:20 GMT benedict [6646]
	* code/branches/ppspickups1/svntest.txt (modified)

	test 1


Mon, 29 Mar 2010 14:41:31 GMT ebeier [6645]
	* code/branches/ppspickups1/svntest.txt (added)

	a svn test


Mon, 29 Mar 2010 14:39:25 GMT ebeier [6643]
	* code/branches/ppspickups1/data/levels/templates/pickup_representation_templates_speed.oxt (modified)
	* code/branches/ppspickups1/src/modules/pickup/Pickup.cc (modified)
	* code/branches/ppspickups1/src/modules/pickup/items/SpeedPickup.cc (modified)
	* code/branches/ppspickups1/src/orxonox/interfaces/PickupCarrier.h (modified)
	* code/branches/ppspickups1/src/orxonox/items/Engine.h (modified)
	* code/branches/ppspickups1/src/orxonox/items/MultiStateEngine.cc (modified)

	engine stripes now working correctly


Mon, 22 Mar 2010 21:45:09 GMT ebeier [6607]
	* code/branches/ppspickups1/data/levels/templates/pickup_representation_templates_speed.oxt (modified)
	* code/branches/ppspickups1/src/modules/pickup/Pickup.cc (modified)
	* code/branches/ppspickups1/src/modules/pickup/Pickup.h (modified)
	* code/branches/ppspickups1/src/modules/pickup/PickupPrereqs.h (modified)
	* code/branches/ppspickups1/src/modules/pickup/items/SpeedPickup.cc (modified)
	* code/branches/ppspickups1/src/modules/pickup/items/SpeedPickup.h (modified)
	* code/branches/ppspickups1/src/orxonox/interfaces/PickupCarrier.h (modified)
	* code/branches/ppspickups1/src/orxonox/items/Engine.cc (modified)
	* code/branches/ppspickups1/src/orxonox/items/Engine.h (modified)
	* code/branches/ppspickups1/src/orxonox/worldentities/pawns/SpaceShip.cc (modified)
	* code/branches/ppspickups1/src/orxonox/worldentities/pawns/SpaceShip.h (modified)

	first working version of the SpeedPickup, needs some more work for ...


Sun, 21 Mar 2010 23:13:41 GMT rgrieder [6579]
	* code/branches/ppspickups1/data/levels/pickup_ppstest1.oxw (modified)

	svn:eol-style "native"  for all text based files.


Sat, 20 Mar 2010 18:45:01 GMT ebeier [6575]
	* code/branches/ppspickups1/data/levels/includes/pickups_speed.oxi (modified)
	* code/branches/ppspickups1/data/levels/pickup_ppstest1.oxw (modified)
	* code/branches/ppspickups1/data/levels/templates/pickup_representation_templates_speed.oxt (modified)
	* code/branches/ppspickups1/src/modules/pickup/items/SpeedPickup.cc (modified)

	SpeedPickup Class is now "working" (able to spawn/be picked up), but ...


Sat, 20 Mar 2010 17:36:00 GMT ebeier [6574]
	* code/branches/ppspickups1/data/levels/pickup_ppstest1.oxw (moved)
	* code/branches/ppspickups1/data/levels/pickuptest.oxw (deleted)
	* code/branches/ppspickups1/src/modules/pickup/items/SpeedPickup.cc (modified)
	* code/branches/ppspickups1/src/modules/pickup/items/SpeedPickup.h (modified)

	adapted SpeedPickup from HealthPickup


Thu, 18 Mar 2010 12:01:56 GMT scheusso [6552]
	* code/branches/ppspickups1/data/levels/includes/pickups_speed.oxi (added)
	* code/branches/ppspickups1/data/levels/pickup_ppstest.oxw (added)
	* code/branches/ppspickups1/data/levels/templates/pickup_representation_templates_speed.oxt (added)
	* code/branches/ppspickups1/src/modules/pickup/items/CMakeLists.txt (modified)
	* code/branches/ppspickups1/src/modules/pickup/items/SpeedPickup.cc (added)
	* code/branches/ppspickups1/src/modules/pickup/items/SpeedPickup.h (added)

	merged revisions 6525:6543 from ppspickups1 into ppspickups1


Thu, 18 Mar 2010 11:46:49 GMT scheusso [6551]
	* code/branches/ppspickups1 (copied)

	recreating ppspickups1 branch


Thu, 18 Mar 2010 11:30:08 GMT dafrick [6549]
	* code/trunk/data/gui/scripts/KeyBindMenu.lua (modified)

	Fixed Keybind GUI bug.