#
# ChangeLog for code/branches/presentation2/data
#
# Generated by Trac 1.0.9
# Nov 22, 2024, 5:09:02 AM

Fri, 20 Nov 2009 16:20:11 GMT rgrieder [6107]
	* code/branches/presentation2 (modified)
	* code/branches/presentation2/data/levels/empty_level.oxw (modified)
	* code/branches/presentation2/data/levels/includes/weaponsettings3.oxi (modified)
	* code/branches/presentation2/data/particle/explosion4.particle (copied)
	* code/branches/presentation2/data/particle/laser.particle (copied)
	* code/branches/presentation2/data/particle/load.particle (copied)
	* code/branches/presentation2/data/particle/particlecanon.particle (copied)
	* code/branches/presentation2/data/particle/rocketfire.particle (copied)
	* code/branches/presentation2/data/particle/smoke.particle (copied)
	* code/branches/presentation2/data/particle/tes3.particle (copied)
	* code/branches/presentation2/src/modules/weapons/projectiles/CMakeLists.txt (modified)
	* code/branches/presentation2/src/modules/weapons/projectiles/Rocket.cc (copied)
	* code/branches/presentation2/src/modules/weapons/projectiles/Rocket.h (copied)
	* code/branches/presentation2/src/modules/weapons/weaponmodes/CMakeLists.txt (modified)
	* code/branches/presentation2/src/modules/weapons/weaponmodes/RocketFire.cc (copied)
	* code/branches/presentation2/src/modules/weapons/weaponmodes/RocketFire.h (copied)
	* code/branches/presentation2/src/orxonox/OrxonoxPrereqs.h (modified)
	* code/branches/presentation2/src/orxonox/Scene.cc (modified)
	* code/branches/presentation2/src/orxonox/controllers/Controller.h (modified)
	* code/branches/presentation2/src/orxonox/infos/PlayerInfo.cc (modified)
	* code/branches/presentation2/src/orxonox/infos/PlayerInfo.h (modified)
	* code/branches/presentation2/src/orxonox/weaponsystem/WeaponPack.cc (modified)
	* code/branches/presentation2/src/orxonox/weaponsystem/WeaponPack.h (modified)
	* code/branches/presentation2/src/orxonox/weaponsystem/WeaponSystem.cc (modified)
	* code/branches/presentation2/src/orxonox/weaponsystem/WeaponSystem.h (modified)
	* code/branches/presentation2/src/orxonox/worldentities/ControllableEntity.cc (modified)
	* code/branches/presentation2/src/orxonox/worldentities/ControllableEntity.h (modified)
	* code/branches/presentation2/src/orxonox/worldentities/pawns/Pawn.cc (modified)
	* code/branches/presentation2/src/orxonox/worldentities/pawns/Pawn.h (modified)
	* code/branches/presentation2/src/orxonox/worldentities/pawns/Spectator.cc (modified)
	* code/branches/presentation2/src/orxonox/worldentities/pawns/Spectator.h (modified)

	Merged particles2 branch to presentation2.


Fri, 20 Nov 2009 16:13:48 GMT rgrieder [6106]
	* code/branches/presentation2 (copied)

	Created merger branch for the HS09 presentation.


Fri, 23 Oct 2009 11:17:42 GMT dave [5989]
	* code/trunk/data/levels/includes/weaponsettings_ghost.oxi (added)
	* code/trunk/data/levels/templates/spaceship_ghost.oxt (modified)
	* code/trunk/data/levels/test_ghost.oxw (modified)

	ghost weapons added