#
# ChangeLog for code/branches/masterserver/data
#
# Generated by Trac 1.0.9
# Nov 1, 2024, 6:34:23 PM

Fri, 03 Dec 2010 13:38:46 GMT dafrick [7717]
	* code/branches/masterserver/data/DefaultResources.oxr (modified)
	* code/branches/masterserver/src/libraries/core/GUIManager.cc (modified)
	* code/branches/masterserver/src/libraries/tools/ResourceLocation.cc (modified)

	Updating branch for changes in the data repository. Please also ...


Wed, 01 Dec 2010 15:28:46 GMT smerkli [7692]
	* code/branches/masterserver/data/gui/scripts/MultiplayerMenu.lua (modified)
	* code/branches/masterserver/src/libraries/network/MasterServerComm.cc (modified)
	* code/branches/masterserver/src/libraries/network/MasterServerProtocol.h (modified)
	* code/branches/masterserver/src/libraries/network/WANDiscovery.cc (modified)
	* code/branches/masterserver/src/libraries/network/WANDiscovery.h (modified)
	* code/branches/masterserver/src/modules/masterserver/MasterServer.cc (modified)

	done for today, didn't get bug to leave, and connect doesn't quite ...


Wed, 10 Nov 2010 14:54:59 GMT smerkli [7632]
	* code/branches/masterserver/data/gui/scripts/MultiplayerMenu.lua (modified)
	* code/branches/masterserver/src/libraries/network/MasterServerComm.cc (modified)
	* code/branches/masterserver/src/libraries/network/Server.cc (modified)

	oops, forgot to rename the new lua function.


Wed, 10 Nov 2010 14:35:39 GMT smerkli [7631]
	* code/branches/masterserver/data/gui/scripts/MultiplayerMenu.lua (modified)
	* code/branches/masterserver/src/libraries/network/CMakeLists.txt (modified)
	* code/branches/masterserver/src/libraries/network/MasterServerComm.cc (moved)
	* code/branches/masterserver/src/libraries/network/MasterServerComm.h (moved)
	* code/branches/masterserver/src/libraries/network/WANDiscovery.cc (modified)
	* code/branches/masterserver/src/libraries/network/WANDiscovery.h (modified)
	* code/branches/masterserver/src/modules/masterserver/ServerList.h (modified)

	added comments, lua function (to be tested) and various ...


Wed, 29 Sep 2010 13:39:00 GMT dafrick [7501]
	* code/branches/masterserver (copied)

	New branch for Sandro to work on THE master server.


Wed, 29 Sep 2010 12:52:47 GMT dafrick [7500]
	* code/trunk/data/gui/layouts/ChatBox.layout (modified)
	* code/trunk/data/gui/scripts/ChatBox.lua (modified)

	Fixing same issue as in tutorial2 branch. Error only occurs (as far ...