#
# ChangeLog for code/branches/presentation/src/orxonox/gamestates
#
# Generated by Trac 1.0.9
# Jun 27, 2024, 11:19:47 AM

Wed, 08 Dec 2010 16:13:03 GMT smerkli [7743]
	* code/branches/presentation/src/libraries/network/MasterServer.cc (modified)
	* code/branches/presentation/src/orxonox/Main.cc (modified)
	* code/branches/presentation/src/orxonox/gamestates/GSMasterServer.cc (modified)

	made mastserserver mode non-blocking


Wed, 08 Dec 2010 15:25:52 GMT dafrick [7739]
	* code/branches/presentation (modified)
	* code/branches/presentation/data/gui/scripts/MultiplayerMenu.lua (modified)
	* code/branches/presentation/src/libraries/network/CMakeLists.txt (modified)
	* code/branches/presentation/src/libraries/network/MasterServer.cc (copied)
	* code/branches/presentation/src/libraries/network/MasterServer.h (copied)
	* code/branches/presentation/src/libraries/network/MasterServerComm.cc (copied)
	* code/branches/presentation/src/libraries/network/MasterServerComm.h (copied)
	* code/branches/presentation/src/libraries/network/MasterServerProtocol.h (copied)
	* code/branches/presentation/src/libraries/network/PeerList.cc (copied)
	* code/branches/presentation/src/libraries/network/PeerList.h (copied)
	* code/branches/presentation/src/libraries/network/Server.cc (modified)
	* code/branches/presentation/src/libraries/network/Server.h (modified)
	* code/branches/presentation/src/libraries/network/ServerList.cc (copied)
	* code/branches/presentation/src/libraries/network/ServerList.h (copied)
	* code/branches/presentation/src/libraries/network/WANDiscovery.cc (copied)
	* code/branches/presentation/src/libraries/network/WANDiscovery.h (copied)
	* code/branches/presentation/src/libraries/network/packet/ServerInformation.h (modified)
	* code/branches/presentation/src/orxonox/Main.cc (modified)
	* code/branches/presentation/src/orxonox/gamestates/CMakeLists.txt (modified)
	* code/branches/presentation/src/orxonox/gamestates/GSMasterServer.cc (copied)
	* code/branches/presentation/src/orxonox/gamestates/GSMasterServer.h (copied)

	Merging masterserver branch to new presentation branch.


Wed, 08 Dec 2010 15:00:30 GMT dafrick [7736]
	* code/branches/presentation (copied)

	Creating presentation branch.


Wed, 01 Dec 2010 14:00:19 GMT dafrick [7689]
	* code/trunk (modified)
	* code/trunk/data/gui/layouts/HostMenu.layout (copied)
	* code/trunk/data/gui/layouts/MainMenuBackground.layout (modified)
	* code/trunk/data/gui/layouts/MultiplayerMenu.layout (modified)
	* code/trunk/data/gui/scripts/AudioMenu.lua (modified)
	* code/trunk/data/gui/scripts/ControlsMenu.lua (modified)
	* code/trunk/data/gui/scripts/CreditsMenu.lua (modified)
	* code/trunk/data/gui/scripts/GUISheet.lua (modified)
	* code/trunk/data/gui/scripts/GUITools.lua (modified)
	* code/trunk/data/gui/scripts/GraphicsMenu.lua (modified)
	* code/trunk/data/gui/scripts/HostMenu.lua (copied)
	* code/trunk/data/gui/scripts/InGameMenu.lua (modified)
	* code/trunk/data/gui/scripts/MainMenu.lua (modified)
	* code/trunk/data/gui/scripts/MenuSheet.lua (modified)
	* code/trunk/data/gui/scripts/MultiplayerMenu.lua (modified)
	* code/trunk/data/gui/scripts/SettingsMenu.lua (modified)
	* code/trunk/data/gui/scripts/SheetManager.lua (modified)
	* code/trunk/data/gui/scripts/SingleplayerMenu.lua (modified)
	* code/trunk/src/orxonox/gamestates/GSMainMenu.cc (modified)
	* code/trunk/src/orxonox/overlays/InGameConsole.cc (modified)

	Merging menu branch to trunk.