#
# ChangeLog for code/branches/PresentationFS18/data/gui
#
# Generated by Trac 1.0.9
# Nov 14, 2024, 8:48:51 AM

Wed, 30 May 2018 12:56:24 GMT patricwi [12020]
	* code/branches/PresentationFS18 (modified)
	* code/branches/PresentationFS18/data/gui/layouts/MultiplayerMenu.layout (modified)
	* code/branches/PresentationFS18/data/levels/testMultiplayerLevel.oxw (copied)
	* code/branches/PresentationFS18/data/levels/testMultiplayerLevelLTS.oxw (copied)
	* code/branches/PresentationFS18/data/overlays/lastTeamStandingHUD.oxo (modified)
	* code/branches/PresentationFS18/src/libraries/network/Client.cc (modified)
	* code/branches/PresentationFS18/src/libraries/network/Client.h (modified)
	* code/branches/PresentationFS18/src/libraries/network/ClientConnection.cc (modified)
	* code/branches/PresentationFS18/src/libraries/network/ClientConnection.h (modified)
	* code/branches/PresentationFS18/src/libraries/network/ClientConnectionListener.cc (modified)
	* code/branches/PresentationFS18/src/libraries/network/ClientConnectionListener.h (modified)
	* code/branches/PresentationFS18/src/libraries/network/Connection.cc (modified)
	* code/branches/PresentationFS18/src/libraries/network/Connection.h (modified)
	* code/branches/PresentationFS18/src/libraries/network/FunctionCallManager.cc (modified)
	* code/branches/PresentationFS18/src/libraries/network/FunctionCallManager.h (modified)
	* code/branches/PresentationFS18/src/libraries/network/GamestateHandler.cc (modified)
	* code/branches/PresentationFS18/src/libraries/network/GamestateHandler.h (modified)
	* code/branches/PresentationFS18/src/libraries/network/GamestateManager.cc (modified)
	* code/branches/PresentationFS18/src/libraries/network/GamestateManager.h (modified)
	* code/branches/PresentationFS18/src/libraries/network/Host.cc (modified)
	* code/branches/PresentationFS18/src/libraries/network/Host.h (modified)
	* code/branches/PresentationFS18/src/libraries/network/LANDiscoverable.cc (modified)
	* code/branches/PresentationFS18/src/libraries/network/LANDiscoverable.h (modified)
	* code/branches/PresentationFS18/src/libraries/network/LANDiscovery.cc (modified)
	* code/branches/PresentationFS18/src/libraries/network/MasterServer.cc (modified)
	* code/branches/PresentationFS18/src/libraries/network/MasterServerComm.cc (modified)
	* code/branches/PresentationFS18/src/libraries/network/Server.cc (modified)
	* code/branches/PresentationFS18/src/libraries/network/Server.h (modified)
	* code/branches/PresentationFS18/src/libraries/network/ServerConnection.cc (modified)
	* code/branches/PresentationFS18/src/libraries/network/ServerConnection.h (modified)
	* code/branches/PresentationFS18/src/libraries/network/packet/Acknowledgement.cc (modified)
	* code/branches/PresentationFS18/src/libraries/network/packet/Acknowledgement.h (modified)
	* code/branches/PresentationFS18/src/libraries/network/packet/Chat.cc (modified)
	* code/branches/PresentationFS18/src/libraries/network/packet/Chat.h (modified)
	* code/branches/PresentationFS18/src/libraries/network/packet/ClassID.cc (modified)
	* code/branches/PresentationFS18/src/libraries/network/packet/DeleteObjects.cc (modified)
	* code/branches/PresentationFS18/src/libraries/network/packet/FunctionCalls.cc (modified)
	* code/branches/PresentationFS18/src/libraries/network/packet/Gamestate.cc (modified)
	* code/branches/PresentationFS18/src/libraries/network/packet/Gamestate.h (modified)
	* code/branches/PresentationFS18/src/libraries/network/packet/Packet.cc (modified)
	* code/branches/PresentationFS18/src/libraries/network/packet/Packet.h (modified)
	* code/branches/PresentationFS18/src/libraries/network/packet/ServerInformation.cc (modified)
	* code/branches/PresentationFS18/src/libraries/network/synchronisable/Synchronisable.cc (modified)
	* code/branches/PresentationFS18/src/libraries/network/synchronisable/Synchronisable.h (modified)
	* code/branches/PresentationFS18/src/modules/overlays/hud/HUDWeaponSystem.cc (modified)
	* code/branches/PresentationFS18/src/orxonox/graphics/Model.cc (modified)

	Merged Masterserver


Wed, 30 May 2018 11:01:48 GMT patricwi [12012]
	* code/branches/PresentationFS18 (copied)

	Created presentation branch


Mon, 19 Feb 2018 23:14:40 GMT landauf [11783]
	* code/trunk (modified)
	* code/trunk/data/gui/layouts/Dialog.layout (copied)
	* code/trunk/data/gui/layouts/Dialogue.layout (deleted)
	* code/trunk/data/gui/layouts/HighscoreMenu.layout (modified)
	* code/trunk/data/gui/scripts/Dialog.lua (copied)
	* code/trunk/data/gui/scripts/Dialogue.lua (deleted)
	* code/trunk/data/gui/scripts/HighscoreMenu.lua (modified)
	* code/trunk/data/gui/scripts/TestDialogButttons.lua (modified)
	* code/trunk/data/levels/ArrowLevel.oxw (copied)
	* code/trunk/data/levels/AsteroidFarming.oxw (copied)
	* code/trunk/data/levels/Asteroids2D.oxw (copied)
	* code/trunk/data/levels/DialogShowcase.oxw (copied)
	* code/trunk/data/levels/DialogueShowcase.oxw (deleted)
	* code/trunk/data/levels/Endurancefinal.oxw (modified)
	* code/trunk/data/levels/FlappyOrx.oxw (copied)
	* code/trunk/data/levels/MilleniumFalconTest.oxw (modified)
	* code/trunk/data/levels/NC_StoryModeLevel.oxw (copied)
	* code/trunk/data/levels/ProtectBoss.oxw (copied)
	* code/trunk/data/levels/SOB.oxw (modified)
	* code/trunk/data/levels/StoryModeMap.oxw (modified)
	* code/trunk/data/levels/includes/MFalconWeapon.oxi (modified)
	* code/trunk/data/levels/includes/asteroids2DWeapon.oxi (copied)
	* code/trunk/data/levels/newnewnewspacerace.oxw (modified)
	* code/trunk/data/levels/templates/MFalcon.oxt (modified)
	* code/trunk/data/levels/templates/StoryMode.oxt (modified)
	* code/trunk/data/levels/templates/StoryModeEscort.oxt (copied)
	* code/trunk/data/levels/templates/asteroidsAsteroids2D.oxt (copied)
	* code/trunk/data/levels/templates/endurancetest_template.oxt (modified)
	* code/trunk/data/levels/templates/enemyFlappyOrx.oxt (copied)
	* code/trunk/data/levels/templates/fastship.oxt (modified)
	* code/trunk/data/levels/templates/spaceshipAsteroids2D.oxt (copied)
	* code/trunk/data/levels/templates/spaceshipFlappyOrx.oxt (copied)
	* code/trunk/data/overlays/Asteroids2DHUD.oxo (copied)
	* code/trunk/data/overlays/FlappyOrxHUD.oxo (copied)
	* code/trunk/data/overlays/HUDTemplates3.oxo (modified)
	* code/trunk/data/overlays/HUDTemplatesFPS.oxo (modified)
	* code/trunk/data/overlays/SOBHUD.oxo (modified)
	* code/trunk/data/overlays/StoryModeHUD.oxo (modified)
	* code/trunk/data/overlays/StoryModeHUD2.oxo (copied)
	* code/trunk/data/particle/fire3.particle (modified)
	* code/trunk/src/libraries/tools/Mesh.cc (modified)
	* code/trunk/src/libraries/tools/Mesh.h (modified)
	* code/trunk/src/modules/CMakeLists.txt (modified)
	* code/trunk/src/modules/asteroidmining (copied)
	* code/trunk/src/modules/asteroids2D (copied)
	* code/trunk/src/modules/dialog (copied)
	* code/trunk/src/modules/dialogue (deleted)
	* code/trunk/src/modules/dodgerace/DodgeRace.cc (modified)
	* code/trunk/src/modules/dodgerace/DodgeRace.h (modified)
	* code/trunk/src/modules/flappyorx (copied)
	* code/trunk/src/modules/overlays/hud/CMakeLists.txt (modified)
	* code/trunk/src/modules/overlays/hud/HUDPickupSystem.cc (modified)
	* code/trunk/src/modules/overlays/hud/HUDPickupSystem.h (modified)
	* code/trunk/src/modules/overlays/hud/StoryModeHUD.cc (copied)
	* code/trunk/src/modules/overlays/hud/StoryModeHUD.h (copied)
	* code/trunk/src/modules/pickup/PickupPrereqs.h (modified)
	* code/trunk/src/modules/pickup/PickupSpawner.cc (modified)
	* code/trunk/src/modules/pickup/PickupSpawner.h (modified)
	* code/trunk/src/modules/superorxobros/CMakeLists.txt (modified)
	* code/trunk/src/modules/superorxobros/Orxo.cc (deleted)
	* code/trunk/src/modules/superorxobros/Orxo.h (deleted)
	* code/trunk/src/modules/superorxobros/SOB.cc (modified)
	* code/trunk/src/modules/superorxobros/SOB.h (modified)
	* code/trunk/src/modules/superorxobros/SOBCastlestone.cc (modified)
	* code/trunk/src/modules/superorxobros/SOBCastlestone.h (modified)
	* code/trunk/src/modules/superorxobros/SOBCenterpoint.cc (modified)
	* code/trunk/src/modules/superorxobros/SOBCenterpoint.h (modified)
	* code/trunk/src/modules/superorxobros/SOBCoin.cc (modified)
	* code/trunk/src/modules/superorxobros/SOBCoin.h (modified)
	* code/trunk/src/modules/superorxobros/SOBFigure.cc (modified)
	* code/trunk/src/modules/superorxobros/SOBFigure.h (modified)
	* code/trunk/src/modules/superorxobros/SOBFireball.cc (copied)
	* code/trunk/src/modules/superorxobros/SOBFireball.h (copied)
	* code/trunk/src/modules/superorxobros/SOBFlagstone.cc (modified)
	* code/trunk/src/modules/superorxobros/SOBFlagstone.h (modified)
	* code/trunk/src/modules/superorxobros/SOBGumba.cc (modified)
	* code/trunk/src/modules/superorxobros/SOBGumba.h (modified)
	* code/trunk/src/modules/superorxobros/SOBGumbaBoss.cc (copied)
	* code/trunk/src/modules/superorxobros/SOBGumbaBoss.h (copied)
	* code/trunk/src/modules/superorxobros/SOBHUDInfo.cc (modified)
	* code/trunk/src/modules/superorxobros/SOBHUDInfo.h (modified)
	* code/trunk/src/modules/superorxobros/SOBItem.cc (modified)
	* code/trunk/src/modules/superorxobros/SOBItem.h (modified)
	* code/trunk/src/modules/superorxobros/SOBMushroom.cc (modified)
	* code/trunk/src/modules/superorxobros/SOBMushroom.h (modified)
	* code/trunk/src/modules/superorxobros/SOBPrereqs.h (modified)
	* code/trunk/src/modules/superorxobros/SOBQBlock.cc (modified)
	* code/trunk/src/modules/superorxobros/SOBQBlock.h (modified)
	* code/trunk/src/modules/weapons/munitions/FlameMunition.cc (modified)
	* code/trunk/src/modules/weapons/munitions/FlameMunition.h (modified)
	* code/trunk/src/modules/weapons/projectiles/FlameGunProjectile.cc (modified)
	* code/trunk/src/modules/weapons/projectiles/FlameGunProjectile.h (modified)
	* code/trunk/src/modules/weapons/weaponmodes/FlameGun.cc (modified)
	* code/trunk/src/modules/weapons/weaponmodes/FlameGun.h (modified)
	* code/trunk/src/orxonox/Highscore.cc (modified)
	* code/trunk/src/orxonox/Highscore.h (modified)
	* code/trunk/src/orxonox/OrxonoxPrereqs.h (modified)
	* code/trunk/src/orxonox/controllers/ArrowController.cc (copied)
	* code/trunk/src/orxonox/controllers/ArrowController.h (copied)
	* code/trunk/src/orxonox/controllers/CMakeLists.txt (modified)
	* code/trunk/src/orxonox/controllers/DroneController.cc (modified)
	* code/trunk/src/orxonox/controllers/HumanController.h (modified)
	* code/trunk/src/orxonox/gametypes/StoryMode.cc (modified)
	* code/trunk/src/orxonox/gametypes/StoryMode.h (modified)
	* code/trunk/src/orxonox/graphics/Model.cc (modified)
	* code/trunk/src/orxonox/graphics/Model.h (modified)
	* code/trunk/src/orxonox/interfaces/RadarViewable.h (modified)
	* code/trunk/src/orxonox/worldentities/Arrow.cc (copied)
	* code/trunk/src/orxonox/worldentities/Arrow.h (copied)
	* code/trunk/src/orxonox/worldentities/CMakeLists.txt (modified)
	* code/trunk/src/orxonox/worldentities/NameableStaticEntity.cc (copied)
	* code/trunk/src/orxonox/worldentities/NameableStaticEntity.h (copied)
	* code/trunk/src/orxonox/worldentities/pawns/CMakeLists.txt (modified)
	* code/trunk/src/orxonox/worldentities/pawns/Pawn.cc (modified)
	* code/trunk/src/orxonox/worldentities/pawns/Pawn.h (modified)
	* code/trunk/src/orxonox/worldentities/pawns/ShootableObstacle.cc (copied)
	* code/trunk/src/orxonox/worldentities/pawns/ShootableObstacle.h (copied)
	* code/trunk/src/orxonox/worldentities/pawns/StoryModePawn.cc (copied)
	* code/trunk/src/orxonox/worldentities/pawns/StoryModePawn.h (copied)

	merged Presentation_HS17_merge back to trunk