#
# ChangeLog for code/branches/presentationFS15merge/src/modules/weapons/projectiles
#
# Generated by Trac 1.0.9
# May 21, 2024, 2:32:30 AM

Sun, 04 Oct 2015 12:23:33 GMT landauf [10618]
	* code/branches/presentationFS15merge/src/libraries/network/WANDiscovery.cc (modified)
	* code/branches/presentationFS15merge/src/modules/weapons/projectiles/RocketOld.cc (modified)
	* code/branches/presentationFS15merge/src/orxonox/controllers/testscript.lua (modified)

	tabs -> spaces


Sun, 04 Oct 2015 10:20:35 GMT landauf [10616]
	* code/branches/presentationFS15merge (modified)
	* code/branches/presentationFS15merge/data/particle/FieldExplosion.particle (copied)
	* code/branches/presentationFS15merge/data/particle/GravityBombField.particle (copied)
	* code/branches/presentationFS15merge/src/modules/objects/ForceField.h (modified)
	* code/branches/presentationFS15merge/src/modules/weapons/WeaponsPrereqs.h (modified)
	* code/branches/presentationFS15merge/src/modules/weapons/munitions/CMakeLists.txt (modified)
	* code/branches/presentationFS15merge/src/modules/weapons/munitions/GravityBombMunition.cc (copied)
	* code/branches/presentationFS15merge/src/modules/weapons/munitions/GravityBombMunition.h (copied)
	* code/branches/presentationFS15merge/src/modules/weapons/projectiles/CMakeLists.txt (modified)
	* code/branches/presentationFS15merge/src/modules/weapons/projectiles/GravityBomb.cc (copied)
	* code/branches/presentationFS15merge/src/modules/weapons/projectiles/GravityBomb.h (copied)
	* code/branches/presentationFS15merge/src/modules/weapons/projectiles/GravityBombField.cc (copied)
	* code/branches/presentationFS15merge/src/modules/weapons/projectiles/GravityBombField.h (copied)
	* code/branches/presentationFS15merge/src/modules/weapons/projectiles/LightningGunProjectile.cc (modified)
	* code/branches/presentationFS15merge/src/modules/weapons/weaponmodes/CMakeLists.txt (modified)
	* code/branches/presentationFS15merge/src/modules/weapons/weaponmodes/GravityBombFire.cc (copied)
	* code/branches/presentationFS15merge/src/modules/weapons/weaponmodes/GravityBombFire.h (copied)

	merged branch weaponFS15 (but without changes in
	weaponSettingsAssff.oxi)


Sun, 04 Oct 2015 10:15:43 GMT landauf [10613]
	* code/branches/presentationFS15merge (modified)
	* code/branches/presentationFS15merge/data/levels/includes/weaponSettingsAssff.oxi (modified)
	* code/branches/presentationFS15merge/data/particle/orxonox_explosionAfterglow.particle (copied)
	* code/branches/presentationFS15merge/data/particle/orxonox_explosionFlame.particle (copied)
	* code/branches/presentationFS15merge/data/particle/orxonox_explosionFlame2.particle (copied)
	* code/branches/presentationFS15merge/data/particle/orxonox_explosionFlash.particle (copied)
	* code/branches/presentationFS15merge/data/particle/orxonox_explosionFlash2.particle (copied)
	* code/branches/presentationFS15merge/data/particle/orxonox_explosionShockwave.particle (copied)
	* code/branches/presentationFS15merge/data/particle/orxonox_explosionShockwave2.particle (copied)
	* code/branches/presentationFS15merge/data/particle/orxonox_explosionSparks.particle (copied)
	* code/branches/presentationFS15merge/data/particle/orxonox_explosionSparks2.particle (copied)
	* code/branches/presentationFS15merge/data/particle/orxonox_explosionStreak1.particle (copied)
	* code/branches/presentationFS15merge/data/particle/orxonox_explosionStreak2.particle (copied)
	* code/branches/presentationFS15merge/src/modules/weapons/WeaponsPrereqs.h (modified)
	* code/branches/presentationFS15merge/src/modules/weapons/projectiles/CMakeLists.txt (modified)
	* code/branches/presentationFS15merge/src/modules/weapons/projectiles/Rocket.cc (modified)
	* code/branches/presentationFS15merge/src/modules/weapons/projectiles/RocketOld.cc (copied)
	* code/branches/presentationFS15merge/src/modules/weapons/projectiles/RocketOld.h (copied)
	* code/branches/presentationFS15merge/src/modules/weapons/weaponmodes/CMakeLists.txt (modified)
	* code/branches/presentationFS15merge/src/modules/weapons/weaponmodes/RocketFireOld.cc (copied)
	* code/branches/presentationFS15merge/src/modules/weapons/weaponmodes/RocketFireOld.h (copied)
	* code/branches/presentationFS15merge/src/orxonox/worldentities/pawns/Pawn.cc (modified)

	merged branch ParticleEffectsFS15 (but without changes in ...


Sun, 27 Sep 2015 10:11:43 GMT landauf [10595]
	* code/branches/presentationFS15merge (copied)

	created new branch to merge all branches from FS15 in a clean way


Mon, 02 Mar 2015 22:19:32 GMT landauf [10299]
	* code/trunk/src/modules/weapons/projectiles/SimpleRocket.cc (modified)
	* code/trunk/src/orxonox/gamestates/GSLevel.cc (modified)

	fixed crash in SimpleRocket (during level-unloading).
	improved debug ...