#
# ChangeLog for code/branches/presentationFS15/data/levels/includes
#
# Generated by Trac 1.0.9
# May 1, 2024, 4:20:46 AM

Wed, 27 May 2015 11:11:01 GMT maxima [10498]
	* code/branches/presentationFS15/data/levels/includes/weaponSettingsFS15.oxi (modified)
	* code/branches/presentationFS15/data/levels/includes/weaponSettingsRing.oxi (modified)
	* code/branches/presentationFS15/data/levels/presentationFS15.oxw (modified)
	* code/branches/presentationFS15/data/levels/templates/spaceshipFS15.oxt (modified)
	* code/branches/presentationFS15/data/levels/templates/spaceshipHeartAttack.oxt (modified)
	* code/branches/presentationFS15/data/levels/templates/spaceshipRing.oxt (modified)

	Pres level modified


Wed, 27 May 2015 08:45:56 GMT maxima [10497]
	* code/branches/presentationFS15/data/gui/scripts/MultiplayerMenu.lua (modified)
	* code/branches/presentationFS15/data/levels/includes/weaponSettingsHeartAttack.oxi (modified)
	* code/branches/presentationFS15/src/libraries/network/GamestateManager.h (modified)
	* code/branches/presentationFS15/src/libraries/network/LANDiscoverable.cc (modified)
	* code/branches/presentationFS15/src/libraries/network/LANDiscoverable.h (modified)
	* code/branches/presentationFS15/src/libraries/network/LANDiscovery.cc (modified)
	* code/branches/presentationFS15/src/libraries/network/LANDiscovery.h (modified)
	* code/branches/presentationFS15/src/libraries/network/MasterServer.cc (modified)
	* code/branches/presentationFS15/src/libraries/network/MasterServer.h (modified)
	* code/branches/presentationFS15/src/libraries/network/MasterServerProtocol.h (modified)
	* code/branches/presentationFS15/src/libraries/network/PeerList.cc (modified)
	* code/branches/presentationFS15/src/libraries/network/PeerList.h (modified)
	* code/branches/presentationFS15/src/libraries/network/Server.cc (modified)
	* code/branches/presentationFS15/src/libraries/network/Server.h (modified)
	* code/branches/presentationFS15/src/libraries/network/ServerList.cc (modified)
	* code/branches/presentationFS15/src/libraries/network/ServerList.h (modified)
	* code/branches/presentationFS15/src/libraries/network/WANDiscoverable.cc (modified)
	* code/branches/presentationFS15/src/libraries/network/WANDiscoverable.h (modified)
	* code/branches/presentationFS15/src/libraries/network/WANDiscovery.cc (modified)
	* code/branches/presentationFS15/src/libraries/network/WANDiscovery.h (modified)
	* code/branches/presentationFS15/src/libraries/network/packet/ServerInformation.cc (modified)
	* code/branches/presentationFS15/src/libraries/network/packet/ServerInformation.h (modified)

	multiplayer branch merged to presentation


Wed, 27 May 2015 08:21:55 GMT maxima [10496]
	* code/branches/presentationFS15/data/levels/clangenb.oxw (copied)
	* code/branches/presentationFS15/data/levels/emptyLevel.oxw (modified)
	* code/branches/presentationFS15/data/levels/includes/weaponSettingsAssff.oxi (modified)
	* code/branches/presentationFS15/data/levels/includes/weaponSettingsHeartAttack.oxi (copied)
	* code/branches/presentationFS15/data/levels/templates/spaceshipHeartAttack.oxt (copied)
	* code/branches/presentationFS15/src/modules/weapons/weaponmodes/EnergyDrink.cc (modified)
	* code/branches/presentationFS15/src/modules/weapons/weaponmodes/FusionFire.cc (modified)
	* code/branches/presentationFS15/src/modules/weapons/weaponmodes/LaserFire.cc (modified)

	clangenb: new spaceship heartattack merged to presentation


Tue, 26 May 2015 12:33:47 GMT maxima [10491]
	* code/branches/presentationFS15/data/levels/includes/weaponSettingsRing.oxi (added)
	* code/branches/presentationFS15/data/levels/simone.oxw (added)
	* code/branches/presentationFS15/data/levels/templates/spaceshipRing.oxt (added)

	new spaceship by ssimone


Tue, 26 May 2015 10:53:08 GMT maxima [10486]
	* code/branches/presentationFS15 (modified)
	* code/branches/presentationFS15/data/levels/includes/weaponSettingsFS15.oxi (modified)
	* code/branches/presentationFS15/data/particle/FieldExplosion.particle (copied)
	* code/branches/presentationFS15/data/particle/GravityBombField.particle (copied)
	* code/branches/presentationFS15/src/modules/objects/ForceField.h (modified)
	* code/branches/presentationFS15/src/modules/weapons/WeaponsPrereqs.h (modified)
	* code/branches/presentationFS15/src/modules/weapons/munitions/CMakeLists.txt (modified)
	* code/branches/presentationFS15/src/modules/weapons/munitions/GravityBombMunition.cc (copied)
	* code/branches/presentationFS15/src/modules/weapons/munitions/GravityBombMunition.h (copied)
	* code/branches/presentationFS15/src/modules/weapons/projectiles/CMakeLists.txt (modified)
	* code/branches/presentationFS15/src/modules/weapons/projectiles/GravityBomb.cc (copied)
	* code/branches/presentationFS15/src/modules/weapons/projectiles/GravityBomb.h (copied)
	* code/branches/presentationFS15/src/modules/weapons/projectiles/GravityBombField.cc (copied)
	* code/branches/presentationFS15/src/modules/weapons/projectiles/GravityBombField.h (copied)
	* code/branches/presentationFS15/src/modules/weapons/projectiles/LightningGunProjectile.cc (modified)
	* code/branches/presentationFS15/src/modules/weapons/weaponmodes/CMakeLists.txt (modified)
	* code/branches/presentationFS15/src/modules/weapons/weaponmodes/GravityBombFire.cc (copied)
	* code/branches/presentationFS15/src/modules/weapons/weaponmodes/GravityBombFire.h (copied)

	weaponFS15 branch merged to presentation. spaceshipFS15 has ...


Tue, 26 May 2015 10:40:33 GMT maxima [10485]
	* code/branches/presentationFS15 (modified)
	* code/branches/presentationFS15/data/defaultConfig/keybindings.ini (modified)
	* code/branches/presentationFS15/data/levels/emptyLevel.oxw (modified)
	* code/branches/presentationFS15/data/levels/includes/weaponSettingsAssff.oxi (modified)
	* code/branches/presentationFS15/data/levels/includes/weaponSettingsFS15.oxi (added)
	* code/branches/presentationFS15/data/levels/presentationFS15.oxw (added)
	* code/branches/presentationFS15/data/levels/templates/spaceshipFS15.oxt (added)
	* code/branches/presentationFS15/data/particle/orxonox_explosionAfterglow.particle (copied)
	* code/branches/presentationFS15/data/particle/orxonox_explosionFlame.particle (copied)
	* code/branches/presentationFS15/data/particle/orxonox_explosionFlame2.particle (copied)
	* code/branches/presentationFS15/data/particle/orxonox_explosionFlash.particle (copied)
	* code/branches/presentationFS15/data/particle/orxonox_explosionFlash2.particle (copied)
	* code/branches/presentationFS15/data/particle/orxonox_explosionShockwave.particle (copied)
	* code/branches/presentationFS15/data/particle/orxonox_explosionShockwave2.particle (copied)
	* code/branches/presentationFS15/data/particle/orxonox_explosionSparks.particle (copied)
	* code/branches/presentationFS15/data/particle/orxonox_explosionSparks2.particle (copied)
	* code/branches/presentationFS15/data/particle/orxonox_explosionStreak1.particle (copied)
	* code/branches/presentationFS15/data/particle/orxonox_explosionStreak2.particle (copied)
	* code/branches/presentationFS15/src/external/ogreceguirenderer/CMakeLists.txt (modified)
	* code/branches/presentationFS15/src/modules/weapons/CMakeLists.txt (modified)
	* code/branches/presentationFS15/src/modules/weapons/WeaponsPrereqs.h (modified)
	* code/branches/presentationFS15/src/modules/weapons/projectiles/CMakeLists.txt (modified)
	* code/branches/presentationFS15/src/modules/weapons/projectiles/Rocket.cc (modified)
	* code/branches/presentationFS15/src/modules/weapons/projectiles/RocketOld.cc (copied)
	* code/branches/presentationFS15/src/modules/weapons/projectiles/RocketOld.h (copied)
	* code/branches/presentationFS15/src/modules/weapons/weaponmodes/CMakeLists.txt (modified)
	* code/branches/presentationFS15/src/modules/weapons/weaponmodes/RocketFireOld.cc (copied)
	* code/branches/presentationFS15/src/modules/weapons/weaponmodes/RocketFireOld.h (copied)
	* code/branches/presentationFS15/src/orxonox/worldentities/pawns/Pawn.cc (modified)

	ParticleEffects branch merged to presentation. New level ...


Thu, 21 May 2015 10:44:57 GMT maxima [10444]
	* code/branches/presentationFS15 (copied)

	New branch for the presentation.


Fri, 06 Feb 2015 22:30:26 GMT landauf [10262]
	* code/trunk/data/defaultConfig/orxonox.ini (modified)
	* code/trunk/data/gui/layouts/CampaignMenu.layout (modified)
	* code/trunk/data/gui/scripts/CampaignMenu.lua (modified)
	* code/trunk/data/gui/scripts/testscript.lua (modified)
	* code/trunk/data/levels/4Dtest.oxw (modified)
	* code/trunk/data/levels/AnihilationThreat.oxw (modified)
	* code/trunk/data/levels/DodgeRace.oxw (modified)
	* code/trunk/data/levels/FPS_Level_HS14.oxw (modified)
	* code/trunk/data/levels/ModularShipsTest0.oxw (modified)
	* code/trunk/data/levels/ModularShipsTest1.oxw (modified)
	* code/trunk/data/levels/collisionShapes.oxw (modified)
	* code/trunk/data/levels/includes/weaponSettingsFPS_HS14.oxi (modified)
	* code/trunk/data/levels/includes/weaponSettingsTurret1.oxi (modified)
	* code/trunk/data/levels/jump.oxw (modified)
	* code/trunk/data/levels/kecks.oxw (modified)
	* code/trunk/data/levels/levelTry.oxw (modified)
	* code/trunk/data/levels/michaelstestfile.lua (modified)
	* code/trunk/data/levels/scriptController.oxw (modified)
	* code/trunk/data/levels/templates/DodgeRacePattern.oxt (modified)
	* code/trunk/data/levels/templates/FPS_HS14.oxt (modified)
	* code/trunk/data/levels/templates/ModularSpaceShipTest.oxt (modified)
	* code/trunk/data/levels/templates/enemytowerdefense.oxt (modified)
	* code/trunk/data/levels/templates/spaceshipDodgeRace.oxt (modified)
	* code/trunk/data/levels/templates/spacestation_elements.oxt (modified)
	* code/trunk/data/levels/templates/ss_tube01.oxt (modified)
	* code/trunk/data/levels/templates/standardTurret.oxt (modified)
	* code/trunk/data/overlays/DodgeRaceHUD.oxo (modified)
	* code/trunk/data/overlays/jumpHUD.oxo (modified)
	* code/trunk/src/libraries/tools/BulletDebugDrawer.cc (modified)
	* code/trunk/src/libraries/tools/BulletDebugDrawer.h (modified)
	* code/trunk/src/libraries/tools/DebugDrawer.cc (modified)
	* code/trunk/src/libraries/tools/DebugDrawer.h (modified)
	* code/trunk/src/libraries/tools/IcoSphere.cc (modified)
	* code/trunk/src/libraries/tools/IcoSphere.h (modified)
	* code/trunk/src/libraries/tools/OgreBulletUtils.h (modified)
	* code/trunk/src/modules/gametypes/SpaceRaceBot.cc (modified)
	* code/trunk/src/modules/gametypes/SpaceRaceBot.h (modified)
	* code/trunk/src/modules/gametypes/SpaceRaceController.cc (modified)
	* code/trunk/src/modules/gametypes/SpaceRaceController.h (modified)
	* code/trunk/src/modules/jump/CMakeLists.txt (modified)
	* code/trunk/src/modules/jump/Jump.cc (modified)
	* code/trunk/src/modules/jump/Jump.h (modified)
	* code/trunk/src/modules/jump/JumpBoots.cc (modified)
	* code/trunk/src/modules/jump/JumpBoots.h (modified)
	* code/trunk/src/modules/jump/JumpCenterpoint.cc (modified)
	* code/trunk/src/modules/jump/JumpCenterpoint.h (modified)
	* code/trunk/src/modules/jump/JumpEnemy.cc (modified)
	* code/trunk/src/modules/jump/JumpEnemy.h (modified)
	* code/trunk/src/modules/jump/JumpFigure.cc (modified)
	* code/trunk/src/modules/jump/JumpFigure.h (modified)
	* code/trunk/src/modules/jump/JumpItem.cc (modified)
	* code/trunk/src/modules/jump/JumpItem.h (modified)
	* code/trunk/src/modules/jump/JumpPlatform.cc (modified)
	* code/trunk/src/modules/jump/JumpPlatform.h (modified)
	* code/trunk/src/modules/jump/JumpPlatformDisappear.cc (modified)
	* code/trunk/src/modules/jump/JumpPlatformDisappear.h (modified)
	* code/trunk/src/modules/jump/JumpPlatformFake.cc (modified)
	* code/trunk/src/modules/jump/JumpPlatformFake.h (modified)
	* code/trunk/src/modules/jump/JumpPlatformHMove.cc (modified)
	* code/trunk/src/modules/jump/JumpPlatformHMove.h (modified)
	* code/trunk/src/modules/jump/JumpPlatformStatic.cc (modified)
	* code/trunk/src/modules/jump/JumpPlatformStatic.h (modified)
	* code/trunk/src/modules/jump/JumpPlatformTimer.cc (modified)
	* code/trunk/src/modules/jump/JumpPlatformTimer.h (modified)
	* code/trunk/src/modules/jump/JumpPlatformVMove.cc (modified)
	* code/trunk/src/modules/jump/JumpPlatformVMove.h (modified)
	* code/trunk/src/modules/jump/JumpPrereqs.h (modified)
	* code/trunk/src/modules/jump/JumpProjectile.cc (modified)
	* code/trunk/src/modules/jump/JumpProjectile.h (modified)
	* code/trunk/src/modules/jump/JumpPropeller.cc (modified)
	* code/trunk/src/modules/jump/JumpPropeller.h (modified)
	* code/trunk/src/modules/jump/JumpRocket.cc (modified)
	* code/trunk/src/modules/jump/JumpRocket.h (modified)
	* code/trunk/src/modules/jump/JumpScore.cc (modified)
	* code/trunk/src/modules/jump/JumpScore.h (modified)
	* code/trunk/src/modules/jump/JumpShield.cc (modified)
	* code/trunk/src/modules/jump/JumpShield.h (modified)
	* code/trunk/src/modules/jump/JumpSpring.cc (modified)
	* code/trunk/src/modules/jump/JumpSpring.h (modified)
	* code/trunk/src/modules/objects/Turret.cc (modified)
	* code/trunk/src/modules/objects/Turret.h (modified)
	* code/trunk/src/modules/objects/collisionshapes/CylinderCollisionShape.cc (modified)
	* code/trunk/src/modules/objects/collisionshapes/CylinderCollisionShape.h (modified)
	* code/trunk/src/modules/objects/controllers/CMakeLists.txt (modified)
	* code/trunk/src/modules/objects/controllers/TeamTargetProxy.cc (modified)
	* code/trunk/src/modules/objects/controllers/TeamTargetProxy.h (modified)
	* code/trunk/src/modules/objects/controllers/TurretController.cc (modified)
	* code/trunk/src/modules/objects/controllers/TurretController.h (modified)
	* code/trunk/src/modules/tetris/TetrisBrick.cc (modified)
	* code/trunk/src/modules/tetris/TetrisBrick.h (modified)
	* code/trunk/src/modules/tetris/TetrisScore.cc (modified)
	* code/trunk/src/modules/tetris/TetrisScore.h (modified)
	* code/trunk/src/orxonox/ShipPartManager.cc (modified)
	* code/trunk/src/orxonox/ShipPartManager.h (modified)
	* code/trunk/src/orxonox/controllers/ControllerDirector.cc (modified)
	* code/trunk/src/orxonox/controllers/ControllerDirector.h (modified)
	* code/trunk/src/orxonox/controllers/ScriptController.cc (modified)
	* code/trunk/src/orxonox/controllers/ScriptController.h (modified)
	* code/trunk/src/orxonox/controllers/testscript.lua (modified)
	* code/trunk/src/orxonox/items/PartDestructionEvent.cc (modified)
	* code/trunk/src/orxonox/items/PartDestructionEvent.h (modified)
	* code/trunk/src/orxonox/items/ShipPart.cc (modified)
	* code/trunk/src/orxonox/items/ShipPart.h (modified)
	* code/trunk/src/orxonox/worldentities/pawns/ModularSpaceShip.cc (modified)
	* code/trunk/src/orxonox/worldentities/pawns/ModularSpaceShip.h (modified)

	eol-style native. no changes in code.