#
# ChangeLog for code/branches/presentationFS15merge/data/levels
#
# Generated by Trac 1.0.9
# Nov 22, 2024, 9:00:32 PM

Sun, 04 Oct 2015 10:16:42 GMT landauf [10614]
	* code/branches/presentationFS15merge (modified)
	* code/branches/presentationFS15merge/data/gui/scripts/presentation.lua (copied)
	* code/branches/presentationFS15merge/data/gui/scripts/testscript.lua (modified)
	* code/branches/presentationFS15merge/data/levels/scriptController.oxw (modified)
	* code/branches/presentationFS15merge/src/orxonox/controllers/ControllerDirector.cc (modified)
	* code/branches/presentationFS15merge/src/orxonox/controllers/ControllerDirector.h (modified)
	* code/branches/presentationFS15merge/src/orxonox/controllers/ScriptController.cc (modified)
	* code/branches/presentationFS15merge/src/orxonox/controllers/ScriptController.h (modified)

	merged branch SciptableControllerFS15


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, 04 Oct 2015 10:12:42 GMT landauf [10611]
	* code/branches/presentationFS15merge (modified)
	* code/branches/presentationFS15merge/data/levels/templates/orbStation.oxt (copied)

	merged branch formationFS15


Sun, 04 Oct 2015 10:11:03 GMT landauf [10610]
	* code/branches/presentationFS15merge (modified)
	* code/branches/presentationFS15merge/data/levels/clangenb.oxw (copied)
	* code/branches/presentationFS15merge/data/levels/includes/weaponSettingsAssff.oxi (modified)
	* code/branches/presentationFS15merge/data/levels/includes/weaponSettingsHeartAttack.oxi (copied)
	* code/branches/presentationFS15merge/data/levels/templates/spaceshipHeartAttack.oxt (copied)
	* code/branches/presentationFS15merge/src/modules/weapons/weaponmodes/EnergyDrink.cc (modified)
	* code/branches/presentationFS15merge/src/modules/weapons/weaponmodes/FusionFire.cc (modified)
	* code/branches/presentationFS15merge/src/modules/weapons/weaponmodes/LaserFire.cc (modified)

	merged branch clangenb


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


Sun, 01 Mar 2015 21:11:26 GMT landauf [10297]
	* code/trunk/data/levels/underAttack.oxw (modified)

	improved underAttack.oxw - now with lots of turrets attached to the ...