#
# ChangeLog for code/branches/mergeFS18/data
#
# Generated by Trac 1.0.9
# Dec 15, 2024, 2:35:19 PM

Thu, 28 Feb 2019 13:30:40 GMT merholzl [12197]
	* code/branches/mergeFS18 (modified)
	* code/branches/mergeFS18/data/levels/BumpMap.oxw (copied)
	* code/branches/mergeFS18/data/levels/kart_alpha0.1.oxw (deleted)
	* code/branches/mergeFS18/data/levels/tutorial.oxw (modified)
	* code/branches/mergeFS18/src/libraries/tools/Mesh.cc (modified)

	Shader merge


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 14:08:48 GMT merholzl [12031]
	* code/branches/mergeFS18 (modified)
	* code/branches/mergeFS18/data/levels/SOB.oxw (modified)
	* code/branches/mergeFS18/src/modules/superorxobros/CMakeLists.txt (modified)
	* code/branches/mergeFS18/src/modules/superorxobros/SOB.cc (modified)
	* code/branches/mergeFS18/src/modules/superorxobros/SOBFigure.cc (modified)
	* code/branches/mergeFS18/src/modules/superorxobros/SOBFigure.h (modified)
	* code/branches/mergeFS18/src/modules/superorxobros/SOBGumba.cc (modified)
	* code/branches/mergeFS18/src/modules/superorxobros/SOBItem.h (modified)
	* code/branches/mergeFS18/src/modules/superorxobros/SOBPrereqs.h (modified)
	* code/branches/mergeFS18/src/modules/superorxobros/SOBTube.cc (copied)
	* code/branches/mergeFS18/src/modules/superorxobros/SOBTube.h (copied)

	merged Tubes into SuperOrxoBros


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:36:53 GMT merholzl [12029]
	* code/branches/mergeFS18 (modified)
	* code/branches/mergeFS18/data/levels/newnewnewspacerace.oxw (modified)
	* code/branches/mergeFS18/data/levels/presentationHS12.oxw (modified)
	* code/branches/mergeFS18/data/levels/templates/SpaceRaceTemplates.oxt (copied)
	* code/branches/mergeFS18/data/levels/templates/fastship.oxt (modified)
	* code/branches/mergeFS18/data/levels/templates/spaceshipCollateralDamage.oxt (modified)
	* code/branches/mergeFS18/src/libraries/tools/Timer.h (modified)
	* code/branches/mergeFS18/src/modules/gametypes/SpaceRace.cc (modified)
	* code/branches/mergeFS18/src/modules/gametypes/SpaceRace.h (modified)
	* code/branches/mergeFS18/src/modules/gametypes/SpaceRaceController.cc (modified)
	* code/branches/mergeFS18/src/modules/gametypes/SpaceRaceController.h (modified)
	* code/branches/mergeFS18/src/modules/gametypes/SpaceRaceManager.cc (modified)
	* code/branches/mergeFS18/src/orxonox/items/Engine.cc (modified)
	* code/branches/mergeFS18/src/orxonox/worldentities/pawns/SpaceShip.cc (modified)
	* code/branches/mergeFS18/src/orxonox/worldentities/pawns/SpaceShip.h (modified)

	added space race improvements


Wed, 10 Oct 2018 13:16:51 GMT merholzl [12028]
	* code/branches/mergeFS18 (modified)
	* code/branches/mergeFS18/data/levels/ScriptableControllerTestMoveKillDrone.oxw (copied)
	* code/branches/mergeFS18/data/levels/ScriptableControllerTestSpawn.oxw (copied)
	* code/branches/mergeFS18/data/levels/scriptController.oxw (modified)
	* code/branches/mergeFS18/data/levels/scriptableControllerTest.oxw (copied)
	* code/branches/mergeFS18/data/levels/scripts (copied)
	* code/branches/mergeFS18/data/levels/templates/ScriptableControllerDroneTemplate.oxt (copied)
	* code/branches/mergeFS18/src/libraries/core/BaseObject.cc (modified)
	* code/branches/mergeFS18/src/libraries/core/BaseObject.h (modified)
	* code/branches/mergeFS18/src/libraries/tools/Timer.cc (modified)
	* code/branches/mergeFS18/src/libraries/tools/Timer.h (modified)
	* code/branches/mergeFS18/src/orxonox/CMakeLists.txt (modified)
	* code/branches/mergeFS18/src/orxonox/Level.cc (modified)
	* code/branches/mergeFS18/src/orxonox/Level.h (modified)
	* code/branches/mergeFS18/src/orxonox/controllers/AutonomousDroneController.cc (copied)
	* code/branches/mergeFS18/src/orxonox/controllers/AutonomousDroneController.h (copied)
	* code/branches/mergeFS18/src/orxonox/controllers/CMakeLists.txt (modified)
	* code/branches/mergeFS18/src/orxonox/controllers/Controller.cc (modified)
	* code/branches/mergeFS18/src/orxonox/infos/GametypeInfo.cc (modified)
	* code/branches/mergeFS18/src/orxonox/infos/GametypeInfo.h (modified)
	* code/branches/mergeFS18/src/orxonox/infos/HumanPlayer.cc (modified)
	* code/branches/mergeFS18/src/orxonox/items/ShipPart.cc (modified)
	* code/branches/mergeFS18/src/orxonox/scriptablecontroller (copied)
	* code/branches/mergeFS18/src/orxonox/worldentities/AutonomousDrone.cc (copied)
	* code/branches/mergeFS18/src/orxonox/worldentities/AutonomousDrone.h (copied)
	* code/branches/mergeFS18/src/orxonox/worldentities/CMakeLists.txt (modified)
	* code/branches/mergeFS18/src/orxonox/worldentities/ControllableEntity.cc (modified)
	* code/branches/mergeFS18/src/orxonox/worldentities/ControllableEntity.h (modified)
	* code/branches/mergeFS18/src/orxonox/worldentities/MobileEntity.cc (modified)
	* code/branches/mergeFS18/src/orxonox/worldentities/WorldEntity.cc (modified)
	* code/branches/mergeFS18/src/orxonox/worldentities/WorldEntity.h (modified)
	* code/branches/mergeFS18/src/orxonox/worldentities/pawns/CMakeLists.txt (modified)
	* code/branches/mergeFS18/src/orxonox/worldentities/pawns/Pawn.cc (modified)
	* code/branches/mergeFS18/src/orxonox/worldentities/pawns/ScriptableControllerDrone.cc (copied)
	* code/branches/mergeFS18/src/orxonox/worldentities/pawns/ScriptableControllerDrone.h (copied)
	* code/branches/mergeFS18/src/orxonox/worldentities/pawns/SpaceShip.cc (modified)
	* code/branches/mergeFS18/src/orxonox/worldentities/pawns/SpaceShip.h (modified)

	added scriptable controller


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


Sat, 24 Feb 2018 15:58:39 GMT landauf [11809]
	* code/branches/cegui0.8_ogre1.9/data/gui/scripts/GUITools.lua (modified)
	* code/branches/cegui0.8_ogre1.9/src/libraries/core/GUIManager.cc (modified)
	* code/branches/cegui0.8_ogre1.9/src/libraries/core/GUIManager.h (modified)

	added work around for a bug in cegui 0.8 (the cegui lua scripts ...