#
# ChangeLog for code/branches/pickup/bin/masterserver.in
#
# Generated by Trac 1.0.9
# Nov 25, 2024, 7:44:36 AM

Mon, 28 Mar 2011 13:31:45 GMT dafrick [8144]
	* code/branches/pickup (copied)

	Brnach to work on new pickups.


Wed, 22 Dec 2010 18:24:24 GMT dafrick [7801]
	* code/trunk (modified)
	* code/trunk/bin/CMakeLists.txt (modified)
	* code/trunk/bin/masterserver.bat.in (copied)
	* code/trunk/bin/masterserver.in (copied)
	* code/trunk/data/gui/layouts/AudioMenu.layout (modified)
	* code/trunk/data/gui/layouts/CreditsMenu.layout (modified)
	* code/trunk/data/gui/layouts/GraphicsMenu.layout (modified)
	* code/trunk/data/gui/layouts/InGameMenu.layout (modified)
	* code/trunk/data/gui/layouts/MultiplayerMenu.layout (modified)
	* code/trunk/data/gui/schemes/OrxonoxHUDWidgets.scheme (copied)
	* code/trunk/data/gui/schemes/OrxonoxLookHUDWidgets.scheme (deleted)
	* code/trunk/data/gui/schemes/OrxonoxLookMenuWidgets.scheme (deleted)
	* code/trunk/data/gui/schemes/OrxonoxMenuWidgets.scheme (copied)
	* code/trunk/data/gui/scripts/ChatBox-inputonly.lua (modified)
	* code/trunk/data/gui/scripts/ChatBox.lua (modified)
	* code/trunk/data/gui/scripts/GraphicsMenu.lua (modified)
	* code/trunk/data/gui/scripts/InitialiseGUI.lua (modified)
	* code/trunk/data/gui/scripts/MultiplayerMenu.lua (modified)
	* code/trunk/src/libraries/core/GUIManager.cc (modified)
	* code/trunk/src/libraries/core/GUIManager.h (modified)
	* code/trunk/src/libraries/network/CMakeLists.txt (modified)
	* code/trunk/src/libraries/network/Client.cc (modified)
	* code/trunk/src/libraries/network/Client.h (modified)
	* code/trunk/src/libraries/network/ClientConnection.cc (modified)
	* code/trunk/src/libraries/network/ClientConnection.h (modified)
	* code/trunk/src/libraries/network/ClientInformation.cc (modified)
	* code/trunk/src/libraries/network/ClientInformation.h (modified)
	* code/trunk/src/libraries/network/Connection.cc (modified)
	* code/trunk/src/libraries/network/Connection.h (modified)
	* code/trunk/src/libraries/network/FunctionCallManager.cc (modified)
	* code/trunk/src/libraries/network/FunctionCallManager.h (modified)
	* code/trunk/src/libraries/network/GamestateClient.cc (modified)
	* code/trunk/src/libraries/network/GamestateClient.h (modified)
	* code/trunk/src/libraries/network/GamestateHandler.cc (modified)
	* code/trunk/src/libraries/network/GamestateHandler.h (modified)
	* code/trunk/src/libraries/network/GamestateManager.cc (modified)
	* code/trunk/src/libraries/network/GamestateManager.h (modified)
	* code/trunk/src/libraries/network/Host.cc (modified)
	* code/trunk/src/libraries/network/Host.h (modified)
	* code/trunk/src/libraries/network/LANDiscoverable.cc (modified)
	* code/trunk/src/libraries/network/MasterServer.cc (copied)
	* code/trunk/src/libraries/network/MasterServer.h (copied)
	* code/trunk/src/libraries/network/MasterServerComm.cc (copied)
	* code/trunk/src/libraries/network/MasterServerComm.h (copied)
	* code/trunk/src/libraries/network/MasterServerProtocol.h (copied)
	* code/trunk/src/libraries/network/NetworkPrereqs.h (modified)
	* code/trunk/src/libraries/network/PeerList.cc (copied)
	* code/trunk/src/libraries/network/PeerList.h (copied)
	* code/trunk/src/libraries/network/Server.cc (modified)
	* code/trunk/src/libraries/network/Server.h (modified)
	* code/trunk/src/libraries/network/ServerConnection.cc (modified)
	* code/trunk/src/libraries/network/ServerConnection.h (modified)
	* code/trunk/src/libraries/network/ServerList.cc (copied)
	* code/trunk/src/libraries/network/ServerList.h (copied)
	* code/trunk/src/libraries/network/WANDiscoverable.cc (copied)
	* code/trunk/src/libraries/network/WANDiscoverable.h (copied)
	* code/trunk/src/libraries/network/WANDiscovery.cc (copied)
	* code/trunk/src/libraries/network/WANDiscovery.h (copied)
	* code/trunk/src/libraries/network/packet/Acknowledgement.cc (modified)
	* code/trunk/src/libraries/network/packet/Acknowledgement.h (modified)
	* code/trunk/src/libraries/network/packet/Chat.cc (modified)
	* code/trunk/src/libraries/network/packet/Chat.h (modified)
	* code/trunk/src/libraries/network/packet/ClassID.cc (modified)
	* code/trunk/src/libraries/network/packet/ClassID.h (modified)
	* code/trunk/src/libraries/network/packet/DeleteObjects.cc (modified)
	* code/trunk/src/libraries/network/packet/DeleteObjects.h (modified)
	* code/trunk/src/libraries/network/packet/FunctionCalls.cc (modified)
	* code/trunk/src/libraries/network/packet/FunctionCalls.h (modified)
	* code/trunk/src/libraries/network/packet/FunctionIDs.cc (modified)
	* code/trunk/src/libraries/network/packet/FunctionIDs.h (modified)
	* code/trunk/src/libraries/network/packet/Gamestate.cc (modified)
	* code/trunk/src/libraries/network/packet/Gamestate.h (modified)
	* code/trunk/src/libraries/network/packet/Packet.cc (modified)
	* code/trunk/src/libraries/network/packet/Packet.h (modified)
	* code/trunk/src/libraries/network/packet/ServerInformation.cc (modified)
	* code/trunk/src/libraries/network/packet/ServerInformation.h (modified)
	* code/trunk/src/libraries/network/packet/Welcome.cc (modified)
	* code/trunk/src/libraries/network/packet/Welcome.h (modified)
	* code/trunk/src/libraries/network/synchronisable/Synchronisable.cc (modified)
	* code/trunk/src/libraries/network/synchronisable/Synchronisable.h (modified)
	* code/trunk/src/libraries/util/SignalHandler.cc (modified)
	* code/trunk/src/modules/objects/ForceField.cc (modified)
	* code/trunk/src/modules/objects/ForceField.h (modified)
	* code/trunk/src/modules/overlays/hud/HUDBar.cc (modified)
	* code/trunk/src/modules/overlays/hud/HUDNavigation.cc (modified)
	* code/trunk/src/modules/pickup/PickupManager.cc (modified)
	* code/trunk/src/modules/pickup/PickupSpawner.cc (modified)
	* code/trunk/src/modules/weapons/MuzzleFlash.cc (modified)
	* code/trunk/src/orxonox/LevelManager.cc (modified)
	* code/trunk/src/orxonox/Main.cc (modified)
	* code/trunk/src/orxonox/controllers/ArtificialController.cc (modified)
	* code/trunk/src/orxonox/controllers/NewHumanController.cc (modified)
	* code/trunk/src/orxonox/gamestates/CMakeLists.txt (modified)
	* code/trunk/src/orxonox/gamestates/GSMasterServer.cc (copied)
	* code/trunk/src/orxonox/gamestates/GSMasterServer.h (copied)
	* code/trunk/src/orxonox/gamestates/GSServer.cc (modified)
	* code/trunk/src/orxonox/gametypes/Gametype.cc (modified)
	* code/trunk/src/orxonox/gametypes/Gametype.h (modified)
	* code/trunk/src/orxonox/infos/Bot.cc (modified)
	* code/trunk/src/orxonox/worldentities/pawns/SpaceShip.cc (modified)
	* code/trunk/src/orxonox/worldentities/pawns/SpaceShip.h (modified)

	Merging presentation2 branch back to trunk.