# # ChangeLog for code/branches/presentation/src/libraries # # Generated by Trac 1.0.9 # Jun 16, 2024, 10:25:43 AM Wed, 15 Dec 2010 09:59:10 GMT dafrick [7760] * code/branches/presentation/data/gui/schemes/OrxonoxHUDWidgets.scheme (moved) * code/branches/presentation/data/gui/schemes/OrxonoxMenuWidgets.scheme (moved) * code/branches/presentation/data/gui/scripts/InitialiseGUI.lua (modified) * code/branches/presentation/src/libraries/core/GUIManager.cc (modified) * code/branches/presentation/src/libraries/core/GUIManager.h (modified) Making the GUI scheme configurable through a config value. Sat, 11 Dec 2010 20:07:55 GMT smerkli [7756] * code/branches/presentation/src/libraries/network/MasterServer.cc (modified) * code/branches/presentation/src/libraries/network/MasterServerComm.cc (modified) * code/branches/presentation/src/libraries/network/MasterServerComm.h (modified) * code/branches/presentation/src/libraries/network/MasterServerProtocol.h (modified) * code/branches/presentation/src/libraries/network/Server.cc (modified) * code/branches/presentation/src/libraries/network/WANDiscovery.cc (modified) started implementing server pings, but need a change to ... Wed, 08 Dec 2010 18:33:11 GMT smerkli [7750] * code/branches/presentation/src/libraries/network/MasterServer.cc (modified) * code/branches/presentation/src/libraries/network/MasterServerProtocol.h (modified) * code/branches/presentation/src/libraries/network/Server.cc (modified) * code/branches/presentation/src/libraries/network/WANDiscovery.cc (modified) * code/branches/presentation/src/libraries/network/WANDiscovery.h (modified) documentation. Wed, 08 Dec 2010 16:56:33 GMT smerkli [7749] * code/branches/presentation/src/libraries/network/WANDiscovery.cc (modified) whoops, I did it again. sorry. Wed, 08 Dec 2010 16:45:40 GMT smerkli [7748] * code/branches/presentation/src/libraries/network/WANDiscovery.cc (modified) whoops. Wed, 08 Dec 2010 16:43:21 GMT smerkli [7747] * code/branches/presentation/src/libraries/network/WANDiscovery.cc (modified) removed the space in the WANDiscovery list (hopefully) Wed, 08 Dec 2010 16:35:36 GMT smerkli [7745] * code/branches/presentation/src/libraries/network/MasterServerComm.cc (modified) * code/branches/presentation/src/libraries/network/MasterServerComm.h (modified) * code/branches/presentation/src/libraries/network/Server.cc (modified) * code/branches/presentation/src/libraries/network/WANDiscovery.h (modified) * code/branches/presentation/src/libraries/network/packet/ServerInformation.cc (modified) Removed some things and fixed some bugs Wed, 08 Dec 2010 16:18:10 GMT smerkli [7744] * code/branches/presentation/src/libraries/network/WANDiscovery.cc (modified) port fixed. 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:39:04 GMT smerkli [7740] * code/branches/presentation/src/libraries/network/Server.cc (modified) fixed server startup 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. Fri, 03 Dec 2010 13:37:11 GMT dafrick [7709] * code/trunk (modified) * code/trunk/data/DefaultResources.oxr (modified) * code/trunk/src/libraries/core/GUIManager.cc (modified) * code/trunk/src/libraries/tools/ResourceLocation.cc (modified) Merging data_cleanup branch. You will need to update your data ...