#
# ChangeLog for code/branches/mergeFS18/data/overlays
#
# Generated by Trac 1.0.9
# Dec 21, 2024, 4:15:25 AM

Thu, 28 Feb 2019 11:56:53 GMT merholzl [12194]
	* code/branches/mergeFS18 (modified)
	* code/branches/mergeFS18/data/levels/OrxoKart1.oxw (copied)
	* code/branches/mergeFS18/data/levels/OrxoKart2.oxw (copied)
	* code/branches/mergeFS18/data/levels/includes/weaponSettingsHover.oxi (modified)
	* code/branches/mergeFS18/data/levels/kart_alpha0.1.oxw (copied)
	* code/branches/mergeFS18/data/levels/templates/OrxoKartKart.oxt (copied)
	* code/branches/mergeFS18/data/overlays/OrxoKartHUD.oxo (copied)
	* code/branches/mergeFS18/data/tcl/orxokart_highscores.txt (copied)
	* code/branches/mergeFS18/src/modules/CMakeLists.txt (modified)
	* code/branches/mergeFS18/src/modules/orxokart (copied)
	* code/branches/mergeFS18/src/orxonox/controllers/CMakeLists.txt (modified)

	Merging OrxoKart


Thu, 21 Feb 2019 14:46:15 GMT merholzl [12191]
	* code/branches/mergeFS18 (modified)
	* code/branches/mergeFS18/data/levels/Wagnis.oxw (copied)
	* code/branches/mergeFS18/data/levels/templates/wagnisCursor.oxt (copied)
	* code/branches/mergeFS18/data/overlays/WagnisHUD.oxo (copied)
	* code/branches/mergeFS18/src/libraries/tools/Timer.cc (modified)
	* code/branches/mergeFS18/src/libraries/tools/Timer.h (modified)
	* code/branches/mergeFS18/src/modules/CMakeLists.txt (modified)
	* code/branches/mergeFS18/src/modules/wagnis (copied)
	* code/branches/mergeFS18/src/modules/weapons/projectiles/CMakeLists.txt (modified)
	* code/branches/mergeFS18/src/modules/weapons/projectiles/WagnisProjectile.cc (copied)
	* code/branches/mergeFS18/src/modules/weapons/projectiles/WagnisProjectile.h (copied)
	* code/branches/mergeFS18/src/modules/weapons/weaponmodes/CMakeLists.txt (modified)
	* code/branches/mergeFS18/src/modules/weapons/weaponmodes/WagnisGun.cc (copied)
	* code/branches/mergeFS18/src/modules/weapons/weaponmodes/WagnisGun.h (copied)

	merged Wagnis


Wed, 17 Oct 2018 09:38:23 GMT merholzl [12045]
	* code/branches/mergeFS18 (modified)
	* code/branches/mergeFS18/data/levels/3DPacman.oxw (copied)
	* code/branches/mergeFS18/data/levels/templates/PacmanGelb.oxt (copied)
	* code/branches/mergeFS18/data/overlays/PacmanHUD.oxo (copied)
	* code/branches/mergeFS18/src/modules/CMakeLists.txt (modified)
	* code/branches/mergeFS18/src/modules/dodgerace/DodgeRaceShip.cc (modified)
	* code/branches/mergeFS18/src/modules/pacman (copied)

	merged pacman


Wed, 10 Oct 2018 13:55:21 GMT merholzl [12030]
	* code/branches/mergeFS18 (modified)
	* code/branches/mergeFS18/data/levels/OrxyRoad.oxw (copied)
	* code/branches/mergeFS18/data/levels/templates/OrxyRoadPattern.oxt (copied)
	* code/branches/mergeFS18/data/levels/templates/spaceshipOrxyRoad.oxt (copied)
	* code/branches/mergeFS18/data/overlays/OrxyRoadHUD.oxo (copied)
	* code/branches/mergeFS18/src/modules/CMakeLists.txt (modified)
	* code/branches/mergeFS18/src/modules/orxyroad (copied)

	added OrxyRoad


Wed, 10 Oct 2018 13:06:55 GMT merholzl [12027]
	* code/branches/mergeFS18 (modified)
	* code/branches/mergeFS18/data/levels/testMultiplayerLevel.oxw (copied)
	* code/branches/mergeFS18/data/levels/testMultiplayerLevelLTS.oxw (copied)
	* code/branches/mergeFS18/data/overlays/lastTeamStandingHUD.oxo (modified)
	* code/branches/mergeFS18/src/libraries/network/Client.cc (modified)
	* code/branches/mergeFS18/src/libraries/network/Client.h (modified)
	* code/branches/mergeFS18/src/libraries/network/ClientConnection.cc (modified)
	* code/branches/mergeFS18/src/libraries/network/ClientConnection.h (modified)
	* code/branches/mergeFS18/src/libraries/network/ClientConnectionListener.cc (modified)
	* code/branches/mergeFS18/src/libraries/network/ClientConnectionListener.h (modified)
	* code/branches/mergeFS18/src/libraries/network/Connection.cc (modified)
	* code/branches/mergeFS18/src/libraries/network/Connection.h (modified)
	* code/branches/mergeFS18/src/libraries/network/FunctionCallManager.cc (modified)
	* code/branches/mergeFS18/src/libraries/network/FunctionCallManager.h (modified)
	* code/branches/mergeFS18/src/libraries/network/GamestateHandler.cc (modified)
	* code/branches/mergeFS18/src/libraries/network/GamestateHandler.h (modified)
	* code/branches/mergeFS18/src/libraries/network/GamestateManager.cc (modified)
	* code/branches/mergeFS18/src/libraries/network/GamestateManager.h (modified)
	* code/branches/mergeFS18/src/libraries/network/Host.cc (modified)
	* code/branches/mergeFS18/src/libraries/network/Host.h (modified)
	* code/branches/mergeFS18/src/libraries/network/LANDiscoverable.cc (modified)
	* code/branches/mergeFS18/src/libraries/network/LANDiscoverable.h (modified)
	* code/branches/mergeFS18/src/libraries/network/LANDiscovery.cc (modified)
	* code/branches/mergeFS18/src/libraries/network/MasterServer.cc (modified)
	* code/branches/mergeFS18/src/libraries/network/MasterServerComm.cc (modified)
	* code/branches/mergeFS18/src/libraries/network/Server.cc (modified)
	* code/branches/mergeFS18/src/libraries/network/Server.h (modified)
	* code/branches/mergeFS18/src/libraries/network/ServerConnection.cc (modified)
	* code/branches/mergeFS18/src/libraries/network/ServerConnection.h (modified)
	* code/branches/mergeFS18/src/libraries/network/packet/Acknowledgement.cc (modified)
	* code/branches/mergeFS18/src/libraries/network/packet/Acknowledgement.h (modified)
	* code/branches/mergeFS18/src/libraries/network/packet/Chat.cc (modified)
	* code/branches/mergeFS18/src/libraries/network/packet/Chat.h (modified)
	* code/branches/mergeFS18/src/libraries/network/packet/ClassID.cc (modified)
	* code/branches/mergeFS18/src/libraries/network/packet/DeleteObjects.cc (modified)
	* code/branches/mergeFS18/src/libraries/network/packet/FunctionCalls.cc (modified)
	* code/branches/mergeFS18/src/libraries/network/packet/Gamestate.cc (modified)
	* code/branches/mergeFS18/src/libraries/network/packet/Gamestate.h (modified)
	* code/branches/mergeFS18/src/libraries/network/packet/Packet.cc (modified)
	* code/branches/mergeFS18/src/libraries/network/packet/Packet.h (modified)
	* code/branches/mergeFS18/src/libraries/network/packet/ServerInformation.cc (modified)
	* code/branches/mergeFS18/src/libraries/network/synchronisable/Synchronisable.cc (modified)
	* code/branches/mergeFS18/src/libraries/network/synchronisable/Synchronisable.h (modified)
	* code/branches/mergeFS18/src/modules/overlays/hud/HUDWeaponSystem.cc (modified)
	* code/branches/mergeFS18/src/orxonox/graphics/Model.cc (modified)

	Merged Masterserver, refresh button had to be removed


Wed, 10 Oct 2018 09:13:30 GMT merholzl [12026]
	* code/branches/mergeFS18 (copied)

	new merge branch to cequi 0.8 and ogre 1.9


Tue, 20 Feb 2018 20:23:01 GMT landauf [11787]
	* code/branches/cegui0.8_ogre1.9 (copied)

	created new branch to merge cegui0.8 and ogre1.9 with the recent ...