#
# ChangeLog for code/branches/rocket2/data
#
# Generated by Trac 1.0.9
# Nov 25, 2024, 1:00:48 PM

Fri, 21 May 2010 08:26:31 GMT scheusso [6952]
	* code/branches/rocket2 (copied)

	creating new rocket2 branch


Fri, 21 May 2010 08:25:27 GMT scheusso [6951]
	* code/branches/presentation3 (modified)
	* code/branches/presentation3/data/levels/includes/weaponsettings3.oxi (modified)
	* code/branches/presentation3/data/levels/tutorial.oxw (modified)
	* code/branches/presentation3/data/particle/rocketfire2.particle (copied)
	* code/branches/presentation3/src/modules/weapons/CMakeLists.txt (modified)
	* code/branches/presentation3/src/modules/weapons/RocketController.cc (copied)
	* code/branches/presentation3/src/modules/weapons/RocketController.h (copied)
	* code/branches/presentation3/src/modules/weapons/projectiles/CMakeLists.txt (modified)
	* code/branches/presentation3/src/modules/weapons/projectiles/SimpleRocket.cc (copied)
	* code/branches/presentation3/src/modules/weapons/projectiles/SimpleRocket.h (copied)
	* code/branches/presentation3/src/modules/weapons/weaponmodes/CMakeLists.txt (modified)
	* code/branches/presentation3/src/modules/weapons/weaponmodes/DroneFire.cc (copied)
	* code/branches/presentation3/src/modules/weapons/weaponmodes/DroneFire.h (copied)
	* code/branches/presentation3/src/modules/weapons/weaponmodes/SimpleRocketFire.cc (copied)
	* code/branches/presentation3/src/modules/weapons/weaponmodes/SimpleRocketFire.h (copied)
	* code/branches/presentation3/src/orxonox/controllers/AIController.cc (modified)
	* code/branches/presentation3/src/orxonox/controllers/CMakeLists.txt (modified)
	* code/branches/presentation3/src/orxonox/controllers/DroneController.cc (copied)
	* code/branches/presentation3/src/orxonox/controllers/DroneController.h (copied)
	* code/branches/presentation3/src/orxonox/controllers/NewHumanController.cc (modified)
	* code/branches/presentation3/src/orxonox/controllers/NewHumanController.h (modified)
	* code/branches/presentation3/src/orxonox/gametypes/Testgame.cc (copied)
	* code/branches/presentation3/src/orxonox/gametypes/Testgame.h (copied)
	* code/branches/presentation3/src/orxonox/worldentities/CMakeLists.txt (modified)
	* code/branches/presentation3/src/orxonox/worldentities/Drone.cc (copied)
	* code/branches/presentation3/src/orxonox/worldentities/Drone.h (copied)
	* code/branches/presentation3/src/orxonox/worldentities/RocketDrone.cc (copied)
	* code/branches/presentation3/src/orxonox/worldentities/RocketDrone.h (copied)

	merged rocket branch into presentation3 and cleaned up some things ...