# # ChangeLog for code # # Generated by Trac 1.0.9 # May 17, 2024, 11:02:02 PM Thu, 13 Jan 2011 22:43:20 GMT dafrick [7829] * code/branches/tutoriallevel/src/modules/objects/triggers/MultiTrigger.cc (modified) * code/branches/tutoriallevel/src/modules/objects/triggers/TriggerBase.h (modified) Fixing small bug in MultiTrigger. Thu, 13 Jan 2011 20:56:25 GMT dafrick [7828] * code/branches/tutoriallevel/src/orxonox/LevelManager.cc (modified) Fixed bug in LevelManager. Thu, 13 Jan 2011 19:25:19 GMT jo [7827] * code/branches/ai/src/orxonox/controllers/CMakeLists.txt (modified) * code/branches/ai/src/orxonox/controllers/Detector.cc (added) * code/branches/ai/src/orxonox/controllers/Detector.h (added) First draft. The detector tries to detect events that are critical ... Thu, 13 Jan 2011 19:22:15 GMT dafrick [7826] * code/branches/tutoriallevel (copied) Creating new branch to work on tutorial level (and everything that ... Wed, 29 Dec 2010 22:41:51 GMT scheusso [7825] * code/branches/network6/src/libraries/network/ClientConnection.cc (modified) * code/branches/network6/src/libraries/network/Connection.cc (modified) * code/branches/network6/src/libraries/network/Connection.h (modified) * code/branches/network6/src/libraries/network/GamestateManager.cc (modified) * code/branches/network6/src/libraries/network/packet/Gamestate.cc (modified) * code/branches/network6/src/libraries/network/synchronisable/Synchronisable.cc (modified) -enabling client-side gamestate diffing -added some optimisations Tue, 28 Dec 2010 18:11:32 GMT scheusso [7824] * code/branches/network6/src/libraries/network/Connection.cc (modified) this should prevent disconnecting clients from crashing our servers ;) Tue, 28 Dec 2010 15:46:42 GMT scheusso [7823] * code/branches/network6/src/libraries/network/CMakeLists.txt (modified) * code/branches/network6/src/libraries/network/ClientConnection.cc (modified) * code/branches/network6/src/libraries/network/ClientConnection.h (modified) * code/branches/network6/src/libraries/network/ClientConnectionListener.cc (modified) * code/branches/network6/src/libraries/network/ClientConnectionListener.h (modified) * code/branches/network6/src/libraries/network/ClientInformation.cc (deleted) * code/branches/network6/src/libraries/network/ClientInformation.h (deleted) * code/branches/network6/src/libraries/network/Connection.cc (modified) * code/branches/network6/src/libraries/network/Connection.h (modified) * code/branches/network6/src/libraries/network/GamestateClient.cc (deleted) * code/branches/network6/src/libraries/network/GamestateClient.h (deleted) * code/branches/network6/src/libraries/network/GamestateManager.h (modified) * code/branches/network6/src/libraries/network/Host.cc (modified) * code/branches/network6/src/libraries/network/NetworkPrereqs.h (modified) * code/branches/network6/src/libraries/network/Server.cc (modified) * code/branches/network6/src/libraries/network/Server.h (modified) * code/branches/network6/src/libraries/network/ServerConnection.cc (modified) * code/branches/network6/src/libraries/network/ServerConnection.h (modified) * code/branches/network6/src/libraries/network/packet/Packet.cc (modified) * code/branches/network6/src/libraries/network/packet/Packet.h (modified) * code/branches/network6/src/modules/overlays/hud/ChatOverlay.cc (modified) * code/branches/network6/src/orxonox/ChatHistory.cc (modified) * code/branches/network6/src/orxonox/ChatInputHandler.cc (modified) * code/branches/network6/src/orxonox/PlayerManager.cc (modified) * code/branches/network6/src/orxonox/gamestates/GSRoot.cc (modified) * code/branches/network6/src/orxonox/gametypes/Dynamicmatch.cc (modified) * code/branches/network6/src/orxonox/gametypes/Gametype.cc (modified) * code/branches/network6/src/orxonox/gametypes/LastManStanding.cc (modified) * code/branches/network6/src/orxonox/gametypes/TeamBaseMatch.cc (modified) * code/branches/network6/src/orxonox/gametypes/UnderAttack.cc (modified) * code/branches/network6/src/orxonox/infos/GametypeInfo.cc (modified) * code/branches/network6/src/orxonox/infos/HumanPlayer.cc (modified) * code/branches/network6/src/orxonox/infos/PlayerInfo.cc (modified) again some structural changes in network to increase ... Tue, 28 Dec 2010 15:43:05 GMT scheusso [7822] * code/branches/network6 (copied) creating new network6 branch to fix possible bug when client disconnects Tue, 28 Dec 2010 15:40:44 GMT scheusso [7821] * code/branches/network4 (deleted) * code/branches/network5 (deleted) * code/branches/presentation (deleted) * code/branches/presentation2 (deleted) removing branches not needed anymore Sun, 26 Dec 2010 20:16:53 GMT rgrieder [7820] * code/forks/sandbox_qt/cmake/tools/SourceFileUtilities.cmake (modified) * code/forks/sandbox_qt/cmake/tools/TargetUtilities.cmake (modified) * code/forks/sandbox_qt/src/CMakeLists.txt (modified) Fixed problem with files directly supplied to ORXONOX_ADD_TARGET. Sun, 26 Dec 2010 20:12:31 GMT rgrieder [7819] * code/trunk/src/CMakeLists.txt (modified) Removed inconvenient code again. Sun, 26 Dec 2010 20:07:43 GMT rgrieder [7818] * code/trunk/cmake/CompilerConfigMSVC.cmake (modified) * code/trunk/cmake/PackageConfigMSVC.cmake (modified) * code/trunk/cmake/tools/SourceFileUtilities.cmake (modified) * code/trunk/cmake/tools/TargetUtilities.cmake (modified) * code/trunk/doc/api/doxy.config.in (modified) * code/trunk/src/CMakeLists.txt (modified) * code/trunk/src/OrxonoxConfig.cmake (modified) * code/trunk/src/OrxonoxConfig.h.in (modified) * code/trunk/src/SpecialConfig.h.in (modified) Merged changes related to Visual Leak Detector and source file ... Sun, 26 Dec 2010 16:26:58 GMT rgrieder [7817] * code/forks/pch_analyser/src/orxonox/Main.cc (modified) Merged r7816 from sandbox_qt. Sun, 26 Dec 2010 16:16:12 GMT rgrieder [7816] * code/forks/sandbox_qt/src/orxonox/Main.cc (modified) Improved exception handling in sandbox Qt. Sun, 26 Dec 2010 15:55:55 GMT rgrieder [7815] * code/forks/pch_analyser/src/orxonox/Analyser.cc (added) * code/forks/pch_analyser/src/orxonox/Analyser.h (added) * code/forks/pch_analyser/src/orxonox/CMakeLists.txt (modified) * code/forks/pch_analyser/src/orxonox/Main.cc (modified) * code/forks/pch_analyser/src/orxonox/MainWindow.cc (deleted) * code/forks/pch_analyser/src/orxonox/MainWindow.h (deleted) Added code for the PCH Analyser (but impossible to use without a ... Sun, 26 Dec 2010 15:53:28 GMT rgrieder [7814] * code/forks/pch_analyser (copied) Created fork for PCH analysis: MSVC can produce output that shows ... Sun, 26 Dec 2010 15:49:30 GMT rgrieder [7813] * code/forks/sandbox_qt/src/OrxonoxConfig.h.in (modified) Fixed build. Sun, 26 Dec 2010 12:54:30 GMT rgrieder [7812] * code/branches/ipv6 (deleted) Removed merged branch. Sun, 26 Dec 2010 12:06:29 GMT rgrieder [7811] * code/trunk/src/libraries/core/GUIManager.cc (modified) Fixed possible bug. Sun, 26 Dec 2010 11:55:09 GMT rgrieder [7810] * code/trunk/cmake/CompilerConfigMSVC.cmake (modified) Added comment. Sun, 26 Dec 2010 11:53:02 GMT rgrieder [7809] * code/trunk/src/libraries/core/input/JoyStick.h (modified) * code/trunk/src/libraries/core/input/Keyboard.h (modified) * code/trunk/src/libraries/core/input/Mouse.h (modified) Fixed Doxygen problem ('Template' is not always a type). Sat, 25 Dec 2010 23:01:17 GMT rgrieder [7808] * code/forks/sandbox_qt/doc/api/doxy.config.in (modified) * code/forks/sandbox_qt/src/SpecialConfig.h.in (modified) Changed two details. Sat, 25 Dec 2010 23:00:59 GMT rgrieder [7807] * code/forks/sandbox_qt/cmake/CompilerConfigMSVC.cmake (modified) * code/forks/sandbox_qt/cmake/tools/TargetUtilities.cmake (modified) Adding static linker flags (used by MSVC only). Sat, 25 Dec 2010 23:00:14 GMT rgrieder [7806] * code/forks/sandbox_qt/cmake/CompilerConfigMSVC.cmake (modified) * code/forks/sandbox_qt/cmake/PackageConfigMSVC.cmake (modified) * code/forks/sandbox_qt/src/CMakeLists.txt (modified) * code/forks/sandbox_qt/src/OrxonoxConfig.cmake (modified) * code/forks/sandbox_qt/src/OrxonoxConfig.h.in (modified) Sorted out Visual Leak Detector issues (using new version 2 now). Sat, 25 Dec 2010 22:58:25 GMT rgrieder [7805] * code/forks/sandbox_qt/cmake/tools/SourceFileUtilities.cmake (modified) * code/forks/sandbox_qt/cmake/tools/TargetUtilities.cmake (modified) * code/forks/sandbox_qt/src/CMakeLists.txt (modified) * code/forks/sandbox_qt/src/orxonox/CMakeLists.txt (modified) Changed source file handling procedure, especially for Qt moc files. Sat, 25 Dec 2010 20:32:34 GMT dafrick [7804] * code/trunk/src/libraries/network/MasterServerComm.h (modified) * code/trunk/src/orxonox/LevelInfo.h (modified) * code/trunk/src/orxonox/LevelManager.cc (modified) * code/trunk/src/orxonox/LevelManager.h (modified) Some more minor changes in documentation. Sat, 25 Dec 2010 19:53:13 GMT dafrick [7803] * code/trunk/src/orxonox/LevelManager.h (modified) Some small addition to the documentation. Sat, 25 Dec 2010 19:51:17 GMT dafrick [7802] * code/trunk/src/orxonox/LevelInfo.h (modified) * code/trunk/src/orxonox/LevelManager.cc (modified) * code/trunk/src/orxonox/LevelManager.h (modified) Making the level list in the LevelManager (and as consequence the ... 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. Wed, 22 Dec 2010 12:38:02 GMT rgrieder [7800] * code/branches/presentation2/src/libraries/network/MasterServer.h (modified) * code/branches/presentation2/src/libraries/network/MasterServerComm.h (modified) Fixed build. Wed, 22 Dec 2010 12:34:41 GMT rgrieder [7799] * code/branches/presentation2/src/libraries/network/Connection.h (modified) Fixed build. Wed, 22 Dec 2010 10:19:25 GMT scheusso [7798] * code/branches/presentation2/src/modules/objects/ForceField.h (modified) another try ;) Wed, 22 Dec 2010 10:08:53 GMT scheusso [7797] * code/branches/presentation2/src/modules/objects/ForceField.cc (modified) * code/branches/presentation2/src/modules/objects/ForceField.h (modified) trying to make forcefield synchronisable Wed, 22 Dec 2010 09:37:18 GMT dafrick [7796] * code/branches/presentation2/data/gui/layouts/InGameMenu.layout (modified) * code/branches/presentation2/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/branches/presentation2/src/modules/pickup/PickupSpawner.cc (modified) Making PickupSpawner more secure. Small gui adjustment. Wed, 22 Dec 2010 09:36:39 GMT scheusso [7795] * code/branches/presentation2/src/orxonox/controllers/ArtificialController.cc (modified) disabling formationflight per default (as it seems to make bots more ... Wed, 22 Dec 2010 09:15:12 GMT scheusso [7794] * code/branches/presentation2/src/libraries/network/WANDiscovery.cc (modified) * code/branches/presentation2/src/modules/overlays/hud/HUDNavigation.cc (modified) WANDiscovery singleton is now in graphics scope (not needed in ... Wed, 22 Dec 2010 02:05:31 GMT scheusso [7793] * code/branches/presentation2/src/libraries/network/CMakeLists.txt (modified) * code/branches/presentation2/src/libraries/network/Connection.cc (modified) * code/branches/presentation2/src/libraries/network/MasterServerComm.cc (modified) * code/branches/presentation2/src/libraries/network/MasterServerComm.h (modified) * code/branches/presentation2/src/libraries/network/Server.cc (modified) * code/branches/presentation2/src/libraries/network/Server.h (modified) * code/branches/presentation2/src/libraries/network/WANDiscoverable.cc (added) * code/branches/presentation2/src/libraries/network/WANDiscoverable.h (added) * code/branches/presentation2/src/libraries/network/packet/ServerInformation.cc (modified) * code/branches/presentation2/src/libraries/network/packet/ServerInformation.h (modified) some changes in WANDiscovering: - fixed a bug which caused memory ... Tue, 21 Dec 2010 22:23:07 GMT dafrick [7792] * code/branches/presentation2/src/orxonox/infos/Bot.cc (modified) Forgot a comma in the bot name list. Tue, 21 Dec 2010 21:24:50 GMT dafrick [7791] * code/branches/presentation2/src/modules/pickup/PickupSpawner.cc (modified) Resolving bug in release mode, asserts apparently are just ignored ... Tue, 21 Dec 2010 20:27:36 GMT scheusso [7790] * code/branches/presentation2/src/libraries/network/LANDiscoverable.cc (modified) * code/branches/presentation2/src/libraries/network/MasterServer.cc (modified) * code/branches/presentation2/src/libraries/network/NetworkPrereqs.h (modified) * code/branches/presentation2/src/orxonox/gamestates/GSServer.cc (modified) changing landiscoverable port to fix problem when running ... Tue, 21 Dec 2010 18:10:53 GMT rgrieder [7789] * code/branches/mac_osx (moved) Renaming branch to better fit it's purpose. Please use 'svn switch ... Tue, 21 Dec 2010 17:09:09 GMT scheusso [7788] * code/branches/presentation2 (modified) * code/branches/presentation2/src/libraries/network/CMakeLists.txt (modified) * code/branches/presentation2/src/libraries/network/Client.cc (modified) * code/branches/presentation2/src/libraries/network/Client.h (modified) * code/branches/presentation2/src/libraries/network/ClientConnection.cc (modified) * code/branches/presentation2/src/libraries/network/ClientConnection.h (modified) * code/branches/presentation2/src/libraries/network/ClientInformation.cc (modified) * code/branches/presentation2/src/libraries/network/ClientInformation.h (modified) * code/branches/presentation2/src/libraries/network/Connection.cc (modified) * code/branches/presentation2/src/libraries/network/Connection.h (modified) * code/branches/presentation2/src/libraries/network/FunctionCallManager.cc (modified) * code/branches/presentation2/src/libraries/network/FunctionCallManager.h (modified) * code/branches/presentation2/src/libraries/network/GamestateClient.cc (modified) * code/branches/presentation2/src/libraries/network/GamestateClient.h (modified) * code/branches/presentation2/src/libraries/network/GamestateHandler.cc (modified) * code/branches/presentation2/src/libraries/network/GamestateHandler.h (modified) * code/branches/presentation2/src/libraries/network/GamestateManager.cc (modified) * code/branches/presentation2/src/libraries/network/GamestateManager.h (modified) * code/branches/presentation2/src/libraries/network/Host.cc (modified) * code/branches/presentation2/src/libraries/network/Host.h (modified) * code/branches/presentation2/src/libraries/network/MasterServerComm.cc (modified) * code/branches/presentation2/src/libraries/network/NetworkPrereqs.h (modified) * code/branches/presentation2/src/libraries/network/Server.cc (modified) * code/branches/presentation2/src/libraries/network/Server.h (modified) * code/branches/presentation2/src/libraries/network/ServerConnection.cc (modified) * code/branches/presentation2/src/libraries/network/ServerConnection.h (modified) * code/branches/presentation2/src/libraries/network/WANDiscovery.cc (modified) * code/branches/presentation2/src/libraries/network/packet/Acknowledgement.cc (modified) * code/branches/presentation2/src/libraries/network/packet/Acknowledgement.h (modified) * code/branches/presentation2/src/libraries/network/packet/Chat.cc (modified) * code/branches/presentation2/src/libraries/network/packet/Chat.h (modified) * code/branches/presentation2/src/libraries/network/packet/ClassID.cc (modified) * code/branches/presentation2/src/libraries/network/packet/ClassID.h (modified) * code/branches/presentation2/src/libraries/network/packet/DeleteObjects.cc (modified) * code/branches/presentation2/src/libraries/network/packet/DeleteObjects.h (modified) * code/branches/presentation2/src/libraries/network/packet/FunctionCalls.cc (modified) * code/branches/presentation2/src/libraries/network/packet/FunctionCalls.h (modified) * code/branches/presentation2/src/libraries/network/packet/FunctionIDs.cc (modified) * code/branches/presentation2/src/libraries/network/packet/FunctionIDs.h (modified) * code/branches/presentation2/src/libraries/network/packet/Gamestate.cc (modified) * code/branches/presentation2/src/libraries/network/packet/Gamestate.h (modified) * code/branches/presentation2/src/libraries/network/packet/Packet.cc (modified) * code/branches/presentation2/src/libraries/network/packet/Packet.h (modified) * code/branches/presentation2/src/libraries/network/packet/Welcome.cc (modified) * code/branches/presentation2/src/libraries/network/packet/Welcome.h (modified) * code/branches/presentation2/src/libraries/network/synchronisable/Synchronisable.cc (modified) * code/branches/presentation2/src/libraries/network/synchronisable/Synchronisable.h (modified) * code/branches/presentation2/src/libraries/util/SignalHandler.cc (modified) * code/branches/presentation2/src/modules/weapons/MuzzleFlash.cc (modified) * code/branches/presentation2/src/orxonox/controllers/NewHumanController.cc (modified) * code/branches/presentation2/src/orxonox/gametypes/Gametype.cc (modified) * code/branches/presentation2/src/orxonox/gametypes/Gametype.h (modified) merged network5 into presentation2 branch (untested) Tue, 21 Dec 2010 17:04:36 GMT scheusso [7787] * code/branches/presentation2 (copied) creating presentation2 branch (in order to merge network5 into it) Tue, 21 Dec 2010 13:10:35 GMT dafrick [7786] * code/branches/presentation/data/levels/lastManStanding.oxw (modified) Also applying the skybox changes to the presentation branch. ;) Tue, 21 Dec 2010 12:41:51 GMT decapitb [7785] * code/trunk/data/levels/lastManStanding.oxw (modified) skyBoxMoreNebula inserted in level lastManStanding, let me know if ... Mon, 20 Dec 2010 22:09:06 GMT youngk [7782] * code/branches/ois_update/cmake/tools/FindALUT.cmake (modified) ois_update branch now compiles on all unixes again. Made a minor booboo. Sun, 19 Dec 2010 20:48:30 GMT scheusso [7781] * code/branches/network5/src/orxonox/controllers/NewHumanController.cc (modified) fix: NHC doesn't aim (and shoot) at own spaceship and objects to ... Sun, 19 Dec 2010 20:41:57 GMT scheusso [7780] * code/branches/network5/src/libraries/network/Client.h (modified) * code/branches/network5/src/libraries/network/Connection.cc (modified) * code/branches/network5/src/libraries/network/GamestateManager.cc (modified) * code/branches/network5/src/libraries/network/GamestateManager.h (modified) * code/branches/network5/src/libraries/network/Server.cc (modified) * code/branches/network5/src/libraries/network/Server.h (modified) * code/branches/network5/src/libraries/network/packet/FunctionCalls.cc (modified) * code/branches/network5/src/libraries/network/packet/Packet.cc (modified) * code/branches/network5/src/orxonox/gametypes/Gametype.cc (modified) some fixes reactivating acking and gamestate diffing Sun, 19 Dec 2010 18:37:18 GMT konrad [7779] * code/branches/presentation/data/gui/layouts/AudioMenu.layout (modified) * code/branches/presentation/data/gui/layouts/CreditsMenu.layout (modified) * code/branches/presentation/data/gui/layouts/GraphicsMenu.layout (modified) * code/branches/presentation/data/gui/scripts/GraphicsMenu.lua (modified) Final changes to menu Sun, 19 Dec 2010 13:29:44 GMT scheusso [7778] * code/branches/network5/src/orxonox/PlayerManager.cc (modified) * code/branches/network5/src/orxonox/infos/HumanPlayer.cc (modified) * code/branches/network5/src/orxonox/worldentities/pawns/Spectator.cc (modified) removing some debug output i forgot in the last commit further ... Sun, 19 Dec 2010 13:27:06 GMT scheusso [7777] * code/branches/network5/src/libraries/network/CMakeLists.txt (modified) * code/branches/network5/src/libraries/network/Client.cc (modified) * code/branches/network5/src/libraries/network/Client.h (modified) * code/branches/network5/src/libraries/network/ClientConnection.h (modified) * code/branches/network5/src/libraries/network/ClientInformation.cc (modified) * code/branches/network5/src/libraries/network/ClientInformation.h (modified) * code/branches/network5/src/libraries/network/Connection.cc (modified) * code/branches/network5/src/libraries/network/Connection.h (modified) * code/branches/network5/src/libraries/network/FunctionCallManager.cc (modified) * code/branches/network5/src/libraries/network/FunctionCallManager.h (modified) * code/branches/network5/src/libraries/network/GamestateClient.cc (modified) * code/branches/network5/src/libraries/network/GamestateClient.h (modified) * code/branches/network5/src/libraries/network/GamestateHandler.cc (modified) * code/branches/network5/src/libraries/network/GamestateHandler.h (modified) * code/branches/network5/src/libraries/network/GamestateManager.cc (modified) * code/branches/network5/src/libraries/network/GamestateManager.h (modified) * code/branches/network5/src/libraries/network/Host.cc (modified) * code/branches/network5/src/libraries/network/Host.h (modified) * code/branches/network5/src/libraries/network/Server.cc (modified) * code/branches/network5/src/libraries/network/Server.h (modified) * code/branches/network5/src/libraries/network/packet/Acknowledgement.cc (modified) * code/branches/network5/src/libraries/network/packet/Acknowledgement.h (modified) * code/branches/network5/src/libraries/network/packet/Chat.cc (modified) * code/branches/network5/src/libraries/network/packet/Chat.h (modified) * code/branches/network5/src/libraries/network/packet/ClassID.cc (modified) * code/branches/network5/src/libraries/network/packet/ClassID.h (modified) * code/branches/network5/src/libraries/network/packet/DeleteObjects.cc (modified) * code/branches/network5/src/libraries/network/packet/DeleteObjects.h (modified) * code/branches/network5/src/libraries/network/packet/FunctionCalls.cc (modified) * code/branches/network5/src/libraries/network/packet/FunctionCalls.h (modified) * code/branches/network5/src/libraries/network/packet/FunctionIDs.cc (modified) * code/branches/network5/src/libraries/network/packet/FunctionIDs.h (modified) * code/branches/network5/src/libraries/network/packet/Gamestate.cc (modified) * code/branches/network5/src/libraries/network/packet/Gamestate.h (modified) * code/branches/network5/src/libraries/network/packet/Packet.cc (modified) * code/branches/network5/src/libraries/network/packet/Packet.h (modified) * code/branches/network5/src/libraries/network/packet/Welcome.cc (modified) * code/branches/network5/src/libraries/network/packet/Welcome.h (modified) * code/branches/network5/src/orxonox/PlayerManager.cc (modified) * code/branches/network5/src/orxonox/gametypes/Gametype.cc (modified) * code/branches/network5/src/orxonox/infos/HumanPlayer.cc (modified) * code/branches/network5/src/orxonox/worldentities/pawns/Spectator.cc (modified) some (^^) structural changes some functional changes ... Fri, 17 Dec 2010 19:26:35 GMT scheusso [7776] * code/branches/network5/src/libraries/util/SignalHandler.cc (modified) this should fix problems on linux versions other than ubuntu 10.10 Fri, 17 Dec 2010 13:22:00 GMT scheusso [7775] * code/branches/network5/src/libraries/util/SignalHandler.cc (modified) this should reenable the SignalHandler's backtrace for more ... Fri, 17 Dec 2010 10:49:08 GMT scheusso [7774] * code/branches/network5/src/libraries/network/ClientConnection.cc (modified) * code/branches/network5/src/libraries/network/Connection.cc (modified) * code/branches/network5/src/libraries/network/Connection.h (modified) * code/branches/network5/src/libraries/network/ServerConnection.cc (modified) some comments enable enet packet compression Fri, 17 Dec 2010 10:09:14 GMT scheusso [7773] * code/branches/network5/src/libraries/network/ClientConnection.cc (modified) * code/branches/network5/src/libraries/network/GamestateManager.cc (modified) * code/branches/network5/src/libraries/network/NetworkPrereqs.h (modified) * code/branches/network5/src/libraries/network/Server.cc (modified) * code/branches/network5/src/libraries/network/ServerConnection.cc (modified) * code/branches/network5/src/libraries/network/packet/Packet.cc (modified) small fix (ensure correct termination of communicationThread) Fri, 17 Dec 2010 09:41:24 GMT scheusso [7772] * code/branches/network5/src/libraries/network/Client.cc (modified) * code/branches/network5/src/libraries/network/Client.h (modified) * code/branches/network5/src/libraries/network/ClientConnection.cc (modified) * code/branches/network5/src/libraries/network/ClientConnection.h (modified) * code/branches/network5/src/libraries/network/Connection.cc (modified) * code/branches/network5/src/libraries/network/Connection.h (modified) * code/branches/network5/src/libraries/network/Host.cc (modified) * code/branches/network5/src/libraries/network/Host.h (modified) * code/branches/network5/src/libraries/network/NetworkPrereqs.h (modified) * code/branches/network5/src/libraries/network/Server.cc (modified) * code/branches/network5/src/libraries/network/Server.h (modified) * code/branches/network5/src/libraries/network/ServerConnection.cc (modified) * code/branches/network5/src/libraries/network/ServerConnection.h (modified) * code/branches/network5/src/libraries/network/packet/Packet.cc (modified) * code/branches/network5/src/libraries/network/packet/Packet.h (modified) network is now multithreaded again further testing needed Thu, 16 Dec 2010 16:46:47 GMT youngk [7771] * code/branches/ois_update/src/libraries/core/Super.h (modified) Orxonox now properly loads resources on the Mac. It has become playable\! Wed, 15 Dec 2010 20:57:17 GMT dafrick [7770] * code/branches/presentation/src/libraries/network/MasterServer.h (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/WANDiscovery.h (modified) * code/branches/presentation/src/modules/pickup/PickupManager.cc (modified) Changing masterserver port to 55557. Some minor adjustments: Fixed ... Wed, 15 Dec 2010 18:12:32 GMT smerkli [7769] * code/branches/presentation/src/libraries/network/CMakeLists.txt (modified) * code/branches/presentation/src/libraries/network/MasterServerComm.cc (modified) * code/branches/presentation/src/libraries/network/MasterServerComm.h (modified) fixes 2 Wed, 15 Dec 2010 17:53:02 GMT smerkli [7768] * code/branches/presentation/src/libraries/network/CMakeLists.txt (modified) * code/branches/presentation/src/libraries/network/MasterServerComm.cc (modified) * code/branches/presentation/src/libraries/network/MasterServerComm.h (modified) fixes Wed, 15 Dec 2010 16:45:16 GMT youngk [7767] * code/branches/ois_update/data/gui/scripts/AudioMenu.lua (modified) * code/branches/ois_update/src/external/ois/mac/MacKeyboard.cpp (modified) * code/branches/ois_update/src/libraries/core/GUIManager.cc (modified) * code/branches/ois_update/src/orxonox/MoodManager.cc (modified) * code/branches/ois_update/src/orxonox/sound/AmbientSound.cc (modified) * code/branches/ois_update/src/orxonox/sound/SoundManager.cc (modified) Committing a few minor changes to some files. They affect: Keyboard ... Wed, 15 Dec 2010 14:27:22 GMT smerkli [7765] * 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) prepared MSC for singleton usage. Wed, 15 Dec 2010 13:56:28 GMT smerkli [7764] * code/branches/presentation/src/libraries/network/Server.cc (modified) * code/branches/presentation/src/libraries/network/Server.h (modified) disconnect works now. Wed, 15 Dec 2010 13:51:39 GMT smerkli [7763] * 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/Server.h (modified) * code/branches/presentation/src/libraries/network/WANDiscovery.cc (modified) * code/branches/presentation/src/libraries/network/WANDiscovery.h (modified) disconnect implemented, switching to only use the MSC object of ... Wed, 15 Dec 2010 13:05:48 GMT smerkli [7762] * code/branches/presentation/src/libraries/network/Server.cc (modified) changes for testing Wed, 15 Dec 2010 12:39:56 GMT smerkli [7761] * 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) disconnect implemented, getting ready for testing. 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. Tue, 14 Dec 2010 19:54:00 GMT scheusso [7759] * code/branches/network5/src/libraries/network/Client.cc (modified) * code/branches/network5/src/libraries/network/FunctionCallManager.cc (modified) * code/branches/network5/src/libraries/network/FunctionCallManager.h (modified) * code/branches/network5/src/libraries/network/GamestateClient.cc (modified) * code/branches/network5/src/libraries/network/GamestateClient.h (modified) * code/branches/network5/src/libraries/network/GamestateHandler.h (modified) * code/branches/network5/src/libraries/network/GamestateManager.cc (modified) * code/branches/network5/src/libraries/network/GamestateManager.h (modified) * code/branches/network5/src/libraries/network/MasterServerComm.cc (modified) * code/branches/network5/src/libraries/network/NetworkPrereqs.h (modified) * code/branches/network5/src/libraries/network/Server.cc (modified) * code/branches/network5/src/libraries/network/packet/FunctionCalls.cc (modified) * code/branches/network5/src/libraries/network/packet/FunctionCalls.h (modified) * code/branches/network5/src/libraries/network/packet/Gamestate.cc (modified) * code/branches/network5/src/libraries/network/packet/Packet.cc (modified) * code/branches/network5/src/libraries/network/synchronisable/Synchronisable.h (modified) a lot of changes: - some fixes (mostly gamestate:diff) - ... Sun, 12 Dec 2010 22:13:01 GMT scheusso [7758] * code/branches/network5 (modified) * code/branches/network5/src/libraries/network/GamestateManager.cc (modified) * code/branches/network5/src/libraries/network/packet/Gamestate.cc (modified) * code/branches/network5/src/libraries/network/packet/Gamestate.h (modified) * code/branches/network5/src/libraries/network/synchronisable/Synchronisable.cc (modified) * code/branches/network5/src/modules/weapons/MuzzleFlash.cc (modified) * code/branches/network5/src/orxonox/gametypes/Gametype.cc (modified) * code/branches/network5/src/orxonox/gametypes/Gametype.h (modified) merging network4 into network5 branch Sun, 12 Dec 2010 21:50:14 GMT scheusso [7757] * code/branches/network5 (copied) creating new network5 branch out of presentation branch 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 ... Sat, 11 Dec 2010 15:12:21 GMT scheusso [7755] * code/branches/network4/src/libraries/network/GamestateManager.cc (modified) * code/branches/network4/src/libraries/network/packet/Gamestate.cc (modified) * code/branches/network4/src/libraries/network/packet/Gamestate.h (modified) * code/branches/network4/src/libraries/network/synchronisable/Synchronisable.cc (modified) build fix Fri, 10 Dec 2010 19:13:57 GMT scheusso [7754] * code/branches/network4/src/libraries/network/packet/Gamestate.cc (modified) * code/branches/network4/src/libraries/network/packet/Gamestate.h (modified) * code/branches/network4/src/libraries/network/synchronisable/Synchronisable.cc (modified) some optimisations (mostly including gamestateheader inside gamestate) Fri, 10 Dec 2010 16:07:02 GMT scheusso [7753] * code/branches/network4/src/libraries/network/packet/Gamestate.cc (modified) * code/branches/network4/src/libraries/network/packet/Gamestate.h (modified) * code/branches/network4/src/orxonox/gametypes/Gametype.cc (modified) * code/branches/network4/src/orxonox/gametypes/Gametype.h (modified) * code/branches/network4/src/orxonox/worldentities/ControllableEntity.cc (modified) -(hopefully) fixed that nasty bug -some cleaning up -readding ... Fri, 10 Dec 2010 12:47:34 GMT dafrick [7752] * code/branches/presentation/bin/CMakeLists.txt (modified) * code/branches/presentation/bin/masterserver.bat.in (added) * code/branches/presentation/bin/masterserver.in (added) Adding runscript for masterserver. So far only tested under ubuntu. Thu, 09 Dec 2010 11:45:33 GMT dafrick [7751] * code/branches/presentation/src/modules/overlays/hud/HUDBar.cc (modified) * code/branches/presentation/src/orxonox/LevelManager.cc (modified) * code/branches/presentation/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) * code/branches/presentation/src/orxonox/worldentities/pawns/SpaceShip.h (modified) Boost now runs out (and reloads). Also fixed a few typos. 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:36:22 GMT dafrick [7746] * code/branches/presentation/data/gui/layouts/MultiplayerMenu.layout (modified) * code/branches/presentation/data/gui/scripts/ChatBox-inputonly.lua (modified) * code/branches/presentation/data/gui/scripts/ChatBox.lua (modified) Fixing chatbox. 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:54:58 GMT dafrick [7741] * code/branches/presentation/data/gui/scripts/MultiplayerMenu.lua (modified) Server discovery just once insetad of (redundantly) twice. 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:13:02 GMT smerkli [7738] * code/branches/masterserver/src/libraries/network/WANDiscovery.cc (modified) * code/branches/masterserver/src/libraries/network/WANDiscovery.h (modified) aaaand it works Wed, 08 Dec 2010 15:08:22 GMT smerkli [7737] * code/branches/masterserver/src/libraries/network/WANDiscovery.cc (modified) * code/branches/masterserver/src/libraries/network/WANDiscovery.h (modified) pre-merge Wed, 08 Dec 2010 15:00:30 GMT dafrick [7736] * code/branches/presentation (copied) Creating presentation branch. Wed, 08 Dec 2010 14:42:53 GMT dafrick [7734] * code/trunk/data/gui/schemes/OrxonoxLook.scheme (added) * code/trunk/data/gui/schemes/OrxonoxLookHUDWidgets.scheme (added) * code/trunk/data/gui/schemes/OrxonoxLookMenuWidgets.scheme (added) * code/trunk/data/gui/scripts/InitialiseGUI.lua (modified) Adding new looknfeel (still experimental, thus not new default). Wed, 08 Dec 2010 14:36:53 GMT smerkli [7733] * code/branches/masterserver/src/orxonox/Main.cc (modified) * code/branches/masterserver/src/orxonox/gamestates/GSMasterServer.cc (modified) fixed a segfault Wed, 08 Dec 2010 14:29:28 GMT konrad [7732] * code/trunk/data/gui/layouts/CreditsMenu.layout (modified) * code/trunk/data/gui/layouts/MultiplayerMenu.layout (modified) * code/trunk/data/gui/scripts/CreditsMenu.lua (modified) * code/trunk/data/gui/scripts/MultiplayerMenu.lua (modified) * code/trunk/data/gui/scripts/QuestGUI.lua (modified) Credits Menu is now scrollable Wed, 08 Dec 2010 14:11:59 GMT smerkli [7731] * code/branches/masterserver/src/modules/CMakeLists.txt (modified) Wed, 08 Dec 2010 14:05:07 GMT smerkli [7730] * code/branches/masterserver/src/libraries/network/CMakeLists.txt (modified) * code/branches/masterserver/src/libraries/network/MasterServer.h (modified) * code/branches/masterserver/src/modules/masterserver (deleted) * code/branches/masterserver/src/orxonox/gamestates/CMakeLists.txt (modified) * code/branches/masterserver/src/orxonox/gamestates/GSMasterServer.cc (modified) * code/branches/masterserver/src/orxonox/gamestates/GSMasterServer.h (modified) changes done, use --masterserver to launch master server Wed, 08 Dec 2010 13:33:54 GMT smerkli [7729] * code/branches/masterserver/src/libraries/network/CMakeLists.txt (modified) * code/branches/masterserver/src/libraries/network/MasterServer.cc (copied) * code/branches/masterserver/src/libraries/network/MasterServer.h (copied) * code/branches/masterserver/src/libraries/network/MasterServerProtocol.h (modified) * code/branches/masterserver/src/libraries/network/PeerList.cc (copied) * code/branches/masterserver/src/libraries/network/PeerList.h (copied) * code/branches/masterserver/src/libraries/network/ServerList.cc (copied) * code/branches/masterserver/src/libraries/network/ServerList.h (copied) * code/branches/masterserver/src/libraries/network/masterserver (deleted) moved some files. Wed, 08 Dec 2010 12:52:14 GMT smerkli [7728] * code/branches/masterserver/src/libraries/network/masterserver (copied) Wed, 08 Dec 2010 12:49:39 GMT smerkli [7727] * code/branches/masterserver/src/orxonox/Main.cc (modified) * code/branches/masterserver/src/orxonox/gamestates/GSMasterServer.cc (copied) * code/branches/masterserver/src/orxonox/gamestates/GSMasterServer.h (copied) Before conversion of masterserver from module to library Wed, 08 Dec 2010 12:27:51 GMT konrad [7726] * code/trunk/data/gui/scripts/DecisionPopup.lua (modified) * code/trunk/data/gui/scripts/GUITools.lua (modified) * code/trunk/data/gui/scripts/InGameMenu.lua (modified) decision popup in ingame menu has been changed Mon, 06 Dec 2010 20:14:27 GMT smerkli [7725] * code/branches/masterserver/src/libraries/network/MasterServerComm.cc (modified) * code/branches/masterserver/src/libraries/network/MasterServerComm.h (modified) fixed some warnings