#
# ChangeLog for code/branches/presentationFS15merge
#
# Generated by Trac 1.0.9
# Nov 22, 2024, 10:07:37 AM

Sun, 04 Oct 2015 12:18:02 GMT landauf [10617]
	* code/branches/presentationFS15merge/data/defaultConfig/keybindings.ini (modified)
	* code/branches/presentationFS15merge/data/gui/scripts/presentation.lua (modified)
	* code/branches/presentationFS15merge/data/gui/scripts/testscript.lua (modified)
	* code/branches/presentationFS15merge/data/levels/clangenb.oxw (modified)
	* code/branches/presentationFS15merge/data/levels/includes/weaponSettingsFS15.oxi (copied)
	* code/branches/presentationFS15merge/data/levels/includes/weaponSettingsHeartAttack.oxi (modified)
	* code/branches/presentationFS15merge/data/levels/includes/weaponSettingsRing.oxi (copied)
	* code/branches/presentationFS15merge/data/levels/presentationFS15.oxw (copied)
	* code/branches/presentationFS15merge/data/levels/simone.oxw (copied)
	* code/branches/presentationFS15merge/data/levels/templates/spaceshipFS15.oxt (copied)
	* code/branches/presentationFS15merge/data/levels/templates/spaceshipHeartAttack.oxt (modified)
	* code/branches/presentationFS15merge/data/levels/templates/spaceshipRing.oxt (copied)

	added new levels and modified ship definitions from branch ...


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:18:01 GMT landauf [10615]
	* code/branches/presentationFS15merge (modified)
	* code/branches/presentationFS15merge/data/levels/templates/enemytowerdefense.oxt (modified)
	* code/branches/presentationFS15merge/data/levels/templates/tower.oxt (deleted)
	* code/branches/presentationFS15merge/data/levels/templates/towerdefensetower.oxt (copied)
	* code/branches/presentationFS15merge/data/levels/towerDefense.oxw (modified)
	* code/branches/presentationFS15merge/src/modules/objects/Turret.cc (modified)
	* code/branches/presentationFS15merge/src/modules/objects/Turret.h (modified)
	* code/branches/presentationFS15merge/src/modules/objects/controllers/TurretController.cc (modified)
	* code/branches/presentationFS15merge/src/modules/tetris/Tetris.h (modified)
	* code/branches/presentationFS15merge/src/modules/towerdefense/CMakeLists.txt (modified)
	* code/branches/presentationFS15merge/src/modules/towerdefense/TDCoordinate.cc (modified)
	* code/branches/presentationFS15merge/src/modules/towerdefense/TDCoordinate.h (modified)
	* code/branches/presentationFS15merge/src/modules/towerdefense/Tower.cc (deleted)
	* code/branches/presentationFS15merge/src/modules/towerdefense/Tower.h (deleted)
	* code/branches/presentationFS15merge/src/modules/towerdefense/TowerDefense.cc (modified)
	* code/branches/presentationFS15merge/src/modules/towerdefense/TowerDefense.h (modified)
	* code/branches/presentationFS15merge/src/modules/towerdefense/TowerDefenseCenterpoint.cc (modified)
	* code/branches/presentationFS15merge/src/modules/towerdefense/TowerDefenseCenterpoint.h (modified)
	* code/branches/presentationFS15merge/src/modules/towerdefense/TowerDefenseEnemy.cc (modified)
	* code/branches/presentationFS15merge/src/modules/towerdefense/TowerDefenseSelecter.cc (copied)
	* code/branches/presentationFS15merge/src/modules/towerdefense/TowerDefenseSelecter.h (copied)
	* code/branches/presentationFS15merge/src/modules/towerdefense/TowerDefenseTower.cc (modified)
	* code/branches/presentationFS15merge/src/modules/towerdefense/TowerDefenseTower.h (modified)
	* code/branches/presentationFS15merge/src/modules/towerdefense/TowerTurret.cc (deleted)
	* code/branches/presentationFS15merge/src/modules/towerdefense/TowerTurret.h (deleted)
	* code/branches/presentationFS15merge/src/orxonox/controllers/FormationController.cc (modified)

	merged branch towerdefenseFS15


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:13:42 GMT landauf [10612]
	* code/branches/presentationFS15merge (modified)
	* code/branches/presentationFS15merge/data/gui/scripts/MultiplayerMenu.lua (modified)
	* code/branches/presentationFS15merge/src/libraries/network/GamestateManager.h (modified)
	* code/branches/presentationFS15merge/src/libraries/network/LANDiscoverable.cc (modified)
	* code/branches/presentationFS15merge/src/libraries/network/LANDiscoverable.h (modified)
	* code/branches/presentationFS15merge/src/libraries/network/LANDiscovery.cc (modified)
	* code/branches/presentationFS15merge/src/libraries/network/LANDiscovery.h (modified)
	* code/branches/presentationFS15merge/src/libraries/network/MasterServer.cc (modified)
	* code/branches/presentationFS15merge/src/libraries/network/MasterServer.h (modified)
	* code/branches/presentationFS15merge/src/libraries/network/MasterServerProtocol.h (modified)
	* code/branches/presentationFS15merge/src/libraries/network/PeerList.cc (modified)
	* code/branches/presentationFS15merge/src/libraries/network/PeerList.h (modified)
	* code/branches/presentationFS15merge/src/libraries/network/Server.cc (modified)
	* code/branches/presentationFS15merge/src/libraries/network/Server.h (modified)
	* code/branches/presentationFS15merge/src/libraries/network/ServerList.cc (modified)
	* code/branches/presentationFS15merge/src/libraries/network/ServerList.h (modified)
	* code/branches/presentationFS15merge/src/libraries/network/WANDiscoverable.cc (modified)
	* code/branches/presentationFS15merge/src/libraries/network/WANDiscoverable.h (modified)
	* code/branches/presentationFS15merge/src/libraries/network/WANDiscovery.cc (modified)
	* code/branches/presentationFS15merge/src/libraries/network/WANDiscovery.h (modified)
	* code/branches/presentationFS15merge/src/libraries/network/packet/ServerInformation.cc (modified)
	* code/branches/presentationFS15merge/src/libraries/network/packet/ServerInformation.h (modified)

	merged branch multiplayerFS15


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


Thu, 30 Jul 2015 12:13:21 GMT muemart [10546]
	* code/trunk/src/libraries/tools/TextureGenerator.cc (modified)

	Fix MSVC14/Visual Studio 2015 build: std::less must be constexpr