# # ChangeLog for code/branches # # Generated by Trac 1.0.9 # Nov 25, 2024, 3:14:30 PM Wed, 24 Nov 2010 14:33:26 GMT konrad [7663] * code/branches/menu/data/gui/scripts/CreditsMenu.lua (modified) * code/branches/menu/data/gui/scripts/GUITools.lua (modified) * code/branches/menu/data/gui/scripts/MainMenu.lua (modified) * code/branches/menu/data/gui/scripts/MultiplayerMenu.lua (modified) * code/branches/menu/data/gui/scripts/SettingsMenu.lua (modified) key handling in some menu sheets has been added. Wed, 24 Nov 2010 14:29:56 GMT smerkli [7662] * code/branches/masterserver/src/libraries/network/MasterServerComm.cc (modified) * code/branches/masterserver/src/libraries/network/MasterServerProtocol.h (modified) * code/branches/masterserver/src/modules/masterserver/MasterServer.cc (modified) fatal bug found. Wed, 24 Nov 2010 14:00:11 GMT smerkli [7661] * code/branches/masterserver/src/modules/masterserver/CMakeLists.txt (added) now with actually compiling masterserver module. Wed, 24 Nov 2010 13:39:14 GMT youngk [7660] * code/branches/ois_update/src/libraries/core/GraphicsManager.cc (modified) Added a hack to force the orxonox window to front on OS X. Wed, 24 Nov 2010 13:34:29 GMT smerkli [7659] * code/branches/masterserver/src/libraries/network/MasterServerProtocol.h (modified) * code/branches/masterserver/src/libraries/network/WANDiscovery.cc (modified) wee Wed, 24 Nov 2010 13:18:36 GMT smerkli [7658] * code/branches/masterserver/src/modules/masterserver/MasterServer.cc (modified) minor changes Wed, 24 Nov 2010 13:07:53 GMT smerkli [7657] * 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) * code/branches/masterserver/src/modules/masterserver/MasterServer.h (modified) * code/branches/masterserver/src/modules/masterserver/ServerList.cc (modified) * code/branches/masterserver/src/modules/masterserver/ServerList.h (modified) * code/branches/masterserver/src/orxonox/Main.cc (modified) it has compiled. Thu, 18 Nov 2010 21:40:06 GMT jo [7656] * code/branches/ai (copied) Wed, 17 Nov 2010 15:18:14 GMT smerkli [7651] * code/branches/masterserver/src/libraries/network/WANDiscovery.cc (modified) * code/branches/masterserver/src/libraries/network/WANDiscovery.h (modified) * code/branches/masterserver/src/libraries/network/packet/ServerInformation.h (modified) * code/branches/masterserver/src/modules/masterserver/MasterServer.cc (modified) * code/branches/masterserver/src/modules/masterserver/MasterServer.h (modified) * code/branches/masterserver/src/modules/masterserver/ServerList.h (modified) done for today Wed, 17 Nov 2010 15:05:13 GMT smerkli [7650] * code/branches/masterserver/src/libraries/network/MasterServerComm.cc (modified) * code/branches/masterserver/src/libraries/network/MasterServerComm.h (modified) * code/branches/masterserver/src/libraries/network/MasterServerProtocol.h (added) * code/branches/masterserver/src/libraries/network/Server.cc (modified) * code/branches/masterserver/src/libraries/network/Server.h (modified) * code/branches/masterserver/src/libraries/network/WANDiscovery.cc (modified) * code/branches/masterserver/src/libraries/network/WANDiscovery.h (modified) Minimum target achieved for today, servers can log on to master ... Wed, 17 Nov 2010 14:56:50 GMT dafrick [7649] * code/branches/menu/data/gui/scripts/SheetManager.lua (modified) * code/branches/menu/src/orxonox/overlays/InGameConsole.cc (modified) Restoring proper ESC functionality for InGameConsole. Sat, 13 Nov 2010 22:30:06 GMT dafrick [7647] * code/branches/releasetodo/data/gui/layouts/MultiplayerMenu.layout (modified) * code/branches/releasetodo/data/gui/scripts/MultiplayerMenu.lua (modified) * code/branches/releasetodo/data/gui/scripts/SingleplayerMenu.lua (modified) * code/branches/releasetodo/data/levels/events.oxw (modified) Some final adjustments, before merge. Sat, 13 Nov 2010 21:00:19 GMT dafrick [7646] * code/branches/releasetodo/src/libraries/core/Loader.cc (modified) Some comments. Sat, 13 Nov 2010 20:10:57 GMT dafrick [7645] * code/branches/releasetodo/data/levels/Fight in our Back.oxw (modified) * code/branches/releasetodo/data/levels/Quest_PirateAttack.oxw (modified) * code/branches/releasetodo/data/levels/The Time Machine.oxw (modified) * code/branches/releasetodo/data/levels/empty_level.oxw (modified) * code/branches/releasetodo/data/levels/fps_test.oxw (modified) * code/branches/releasetodo/data/levels/notifications.oxw (modified) * code/branches/releasetodo/data/levels/pickups.oxw (modified) * code/branches/releasetodo/data/levels/presentation_FS10.oxw (modified) * code/branches/releasetodo/data/levels/presentation_FS10_ed.oxw (modified) * code/branches/releasetodo/data/levels/princessaeryn.oxw (modified) * code/branches/releasetodo/data/levels/screenshot.oxw (modified) * code/branches/releasetodo/data/levels/sound.oxw (modified) * code/branches/releasetodo/data/levels/teamdeathmatch.oxw (modified) * code/branches/releasetodo/data/levels/test_stars.oxw (modified) * code/branches/releasetodo/data/levels/test_swallow.oxw (modified) * code/branches/releasetodo/data/levels/waypoints.oxw (modified) * code/branches/releasetodo/src/libraries/core/GUIManager.cc (modified) * code/branches/releasetodo/src/orxonox/LevelInfo.cc (modified) * code/branches/releasetodo/src/orxonox/LevelInfo.h (modified) Small adjustments. Fri, 12 Nov 2010 16:19:53 GMT jo [7644] * code/branches/lastmanstanding/data/overlays/lastmanstandinghud.oxo (modified) Minor changes. Fri, 12 Nov 2010 01:42:56 GMT landauf [7643] * code/branches/lastmanstanding/src/orxonox/worldentities/pawns/Pawn.h (modified) fixed a crash Fri, 12 Nov 2010 00:58:58 GMT landauf [7642] * code/branches/lastmanstanding/src/orxonox/gametypes/LastManStanding.cc (modified) fixed a possible crash Thu, 11 Nov 2010 16:16:27 GMT jo [7641] * code/branches/lastmanstanding/data/levels/test_swallow.oxw (modified) Swallow-Level works. Thu, 11 Nov 2010 16:06:23 GMT jo [7640] * code/branches/lastmanstanding/data/levels/gametype_dynamicmatch.oxw (modified) * code/branches/lastmanstanding/data/overlays/lastmanstandinghud.oxo (modified) * code/branches/lastmanstanding/src/orxonox/gametypes/LastManStanding.cc (modified) * code/branches/lastmanstanding/src/orxonox/gametypes/LastManStanding.h (modified) Hud works. There's at least on bug to repair. Thu, 11 Nov 2010 11:30:38 GMT dafrick [7639] * code/branches/releasetodo/data/gui/layouts/SingleplayerMenu.layout (modified) * code/branches/releasetodo/data/gui/scripts/SingleplayerMenu.lua (modified) * code/branches/releasetodo/src/orxonox/LevelInfo.cc (modified) Some performance an GUI enhancement. Thu, 11 Nov 2010 10:21:28 GMT dafrick [7638] * code/branches/releasetodo/src/orxonox/LevelInfo.cc (modified) * code/branches/releasetodo/src/orxonox/LevelInfo.h (modified) Adding restriction to possible tags. Thu, 11 Nov 2010 00:46:59 GMT landauf [7637] * code/branches/lastmanstanding/data/overlays/lastmanstandinghud.oxo (modified) * code/branches/lastmanstanding/src/modules/overlays/hud/LastManStandingInfos.cc (modified) * code/branches/lastmanstanding/src/modules/overlays/hud/LastManStandingInfos.h (modified) eol-style native Thu, 11 Nov 2010 00:35:49 GMT landauf [7636] * code/branches/lastmanstanding/data/overlays/lastmanstandinghud.oxo (modified) * code/branches/lastmanstanding/src/modules/overlays/OverlaysPrereqs.h (modified) * code/branches/lastmanstanding/src/modules/overlays/hud/LastManStandingInfos.cc (modified) * code/branches/lastmanstanding/src/modules/overlays/hud/LastManStandingInfos.h (modified) * code/branches/lastmanstanding/src/orxonox/OrxonoxPrereqs.h (modified) * code/branches/lastmanstanding/src/orxonox/gametypes/LastManStanding.cc (modified) * code/branches/lastmanstanding/src/orxonox/gametypes/LastManStanding.h (modified) compiles and works Wed, 10 Nov 2010 20:59:50 GMT jo [7635] * code/branches/lastmanstanding/data/overlays/lastmanstandinghud.oxo (modified) * code/branches/lastmanstanding/src/modules/overlays/hud/CMakeLists.txt (modified) * code/branches/lastmanstanding/src/modules/overlays/hud/LastManStandingInfos.cc (added) * code/branches/lastmanstanding/src/modules/overlays/hud/LastManStandingInfos.h (added) * code/branches/lastmanstanding/src/orxonox/gametypes/LastManStanding.cc (modified) * code/branches/lastmanstanding/src/orxonox/gametypes/LastManStanding.h (modified) NON-compiling version. Work in Progress. Wed, 10 Nov 2010 15:22:58 GMT smerkli [7634] * code/branches/masterserver/src/libraries/network/Server.cc (modified) * code/branches/masterserver/src/libraries/network/Server.h (modified) Wed, 10 Nov 2010 15:01:07 GMT smerkli [7633] * code/branches/masterserver/src/libraries/network/Server.cc (modified) done for today. 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, 10 Nov 2010 13:19:44 GMT smerkli [7630] * code/branches/masterserver/src/libraries/network/WANDiscovery.cc (copied) * code/branches/masterserver/src/libraries/network/WANDiscovery.h (copied) * code/branches/masterserver/src/modules/masterserver/MasterServer.cc (modified) * code/branches/masterserver/src/modules/masterserver/MasterServerComm.cc (modified) initiated WANDiscovery code, now implementing... Wed, 10 Nov 2010 09:46:04 GMT dafrick [7629] * code/branches/releasetodo/data/levels/Fight in our Back.oxw (modified) * code/branches/releasetodo/data/levels/Quest_PirateAttack.oxw (modified) * code/branches/releasetodo/data/levels/The Time Machine.oxw (modified) * code/branches/releasetodo/data/levels/empty_level.oxw (modified) * code/branches/releasetodo/data/levels/events.oxw (modified) * code/branches/releasetodo/data/levels/fps_test.oxw (modified) * code/branches/releasetodo/data/levels/pickups.oxw (modified) * code/branches/releasetodo/data/levels/presentation.oxw (modified) * code/branches/releasetodo/data/levels/presentation09.oxw (modified) * code/branches/releasetodo/data/levels/presentation09b.oxw (modified) * code/branches/releasetodo/data/levels/presentationFS10.oxw (modified) * code/branches/releasetodo/data/levels/presentationHS09.oxw (modified) * code/branches/releasetodo/data/levels/presentationHS09b.oxw (modified) * code/branches/releasetodo/data/levels/presentation_FS10.oxw (modified) * code/branches/releasetodo/data/levels/presentation_FS10_ed.oxw (modified) * code/branches/releasetodo/data/levels/presentation_dm.oxw (modified) * code/branches/releasetodo/data/levels/princessaeryn.oxw (modified) * code/branches/releasetodo/data/levels/screenshot.oxw (modified) * code/branches/releasetodo/data/levels/sound.oxw (modified) * code/branches/releasetodo/data/levels/teambasematchlevel.oxw (modified) * code/branches/releasetodo/data/levels/teamdeathmatch.oxw (modified) * code/branches/releasetodo/data/levels/test_stars.oxw (modified) * code/branches/releasetodo/data/levels/test_swallow.oxw (modified) * code/branches/releasetodo/data/levels/tutorial.oxw (modified) * code/branches/releasetodo/data/levels/waypoints.oxw (modified) Adding some LevelInfos. Wed, 10 Nov 2010 09:28:30 GMT dafrick [7628] * code/branches/releasetodo/src/libraries/core/GUIManager.cc (modified) * code/branches/releasetodo/src/libraries/core/Loader.cc (modified) * code/branches/releasetodo/src/libraries/core/Loader.h (modified) * code/branches/releasetodo/src/orxonox/LevelManager.cc (modified) Adjusting include paths of CEGUIListbox and CEGUILisbtoxItem. Added ... Tue, 09 Nov 2010 20:53:34 GMT dafrick [7627] * code/branches/releasetodo/data/gui/scripts/MultiplayerMenu.lua (modified) * code/branches/releasetodo/data/gui/scripts/SingleplayerMenu.lua (modified) * code/branches/releasetodo/src/libraries/core/GUIManager.cc (modified) * code/branches/releasetodo/src/libraries/core/GUIManager.h (modified) Now we have the level description as tooltip. Unforunately for this ... Sat, 06 Nov 2010 20:52:48 GMT dafrick [7626] * code/branches/releasetodo/data/gui/layouts/SingleplayerMenu.layout (modified) * code/branches/releasetodo/data/gui/scripts/MultiplayerMenu.lua (modified) * code/branches/releasetodo/data/gui/scripts/SingleplayerMenu.lua (modified) * code/branches/releasetodo/src/orxonox/LevelInfo.cc (added) * code/branches/releasetodo/src/orxonox/LevelInfo.h (modified) * code/branches/releasetodo/src/orxonox/LevelManager.cc (modified) * code/branches/releasetodo/src/orxonox/LevelManager.h (modified) Accidentally removed a file. Re-adding it. Levels that are tagged ... Sat, 06 Nov 2010 19:17:20 GMT dafrick [7625] * code/branches/releasetodo/data/gui/scripts/SingleplayerMenu.lua (modified) * code/branches/releasetodo/data/levels/empty_level.oxw (modified) * code/branches/releasetodo/data/levels/notifications.oxw (modified) * code/branches/releasetodo/src/orxonox/LevelInfo.cc (deleted) * code/branches/releasetodo/src/orxonox/LevelInfo.h (modified) * code/branches/releasetodo/src/orxonox/LevelManager.cc (modified) * code/branches/releasetodo/src/orxonox/LevelManager.h (modified) * code/branches/releasetodo/src/orxonox/OrxonoxPrereqs.h (modified) Introducing LevelInfo class, which can be used to specify things ... Sat, 06 Nov 2010 16:26:55 GMT rgrieder [7624] * code/branches/ois_update/src/libraries/core/Core.cc (modified) IOConsole does not seem to work properly with the Unix console on Mac ... Sat, 06 Nov 2010 16:09:15 GMT rgrieder [7623] * code/branches/ois_update/src/libraries/core/PathConfig.cc (modified) Cosmetic changes. Sat, 06 Nov 2010 15:50:15 GMT youngk [7622] * code/branches/ois_update/src/libraries/core/PathConfig.cc (modified) Adjusted the executable path handling for Apple. Please test with ... Sat, 06 Nov 2010 14:05:53 GMT rgrieder [7621] * code/branches/ois_update/src/OrxonoxConfig.h.in (modified) * code/branches/ois_update/src/libraries/core/Identifier.h (modified) * code/branches/ois_update/src/libraries/core/OrxonoxClass.h (modified) * code/branches/ois_update/src/libraries/core/input/InputDevice.h (modified) * code/branches/ois_update/src/libraries/core/input/InputState.h (modified) * code/branches/ois_update/src/libraries/tools/BulletConversions.h (modified) * code/branches/ois_update/src/libraries/util/Convert.h (modified) * code/branches/ois_update/src/libraries/util/MathConvert.h (modified) * code/branches/ois_update/src/libraries/util/SharedPtr.h (modified) Renamed FORCEINLINE macro to ORX_FORCEINLINE because of conflicts ... Sat, 06 Nov 2010 13:36:11 GMT rgrieder [7620] * code/branches/ois_update/src/external/ceguilua/CMakeLists.txt (modified) Also create output directories for CEGUILua. Sat, 06 Nov 2010 13:12:07 GMT rgrieder [7619] * code/branches/ois_update/cmake/tools/GenerateToluaBindings.cmake (modified) * code/branches/ois_update/cmake/tools/TargetUtilities.cmake (modified) Create directories for each build configuration with CMake if the ... Fri, 05 Nov 2010 22:08:51 GMT rgrieder [7618] * code/branches/ois_update/src/external/ogreceguirenderer/CMakeLists.txt (modified) Ogre v1.7 may require the OGRE CEGUI renderer to link against symbols ... Fri, 05 Nov 2010 16:58:01 GMT jo [7617] * code/branches/lastmanstanding/data/levels/gametype_lastmanstanding.oxw (modified) * code/branches/lastmanstanding/src/orxonox/gametypes/LastManStanding.cc (modified) * code/branches/lastmanstanding/src/orxonox/gametypes/LastManStanding.h (modified) Level is now fixed. Some further minor changes. Thu, 04 Nov 2010 20:39:17 GMT youngk [7615] * code/branches/ois_update/cmake/PackageConfigOSX.cmake (modified) * code/branches/ois_update/cmake/tools/FindALUT.cmake (modified) ALUT is now automatically found on the Mac Thu, 04 Nov 2010 16:01:40 GMT dafrick [7614] * code/branches/releasetodo/data/levels/notifications.oxw (modified) * code/branches/releasetodo/src/orxonox/CMakeLists.txt (modified) * code/branches/releasetodo/src/orxonox/Level.cc (modified) * code/branches/releasetodo/src/orxonox/LevelInfo.cc (added) * code/branches/releasetodo/src/orxonox/LevelInfo.h (added) * code/branches/releasetodo/src/orxonox/LevelManager.cc (modified) * code/branches/releasetodo/src/orxonox/OrxonoxPrereqs.h (modified) Trying out some stuff. Thu, 04 Nov 2010 10:08:32 GMT dafrick [7613] * code/branches/releasetodo (copied) Creating a new branch to do release stuff... Wed, 03 Nov 2010 15:20:02 GMT smerkli [7611] * code/branches/masterserver/src/modules/masterserver/MasterServer.cc (moved) * code/branches/masterserver/src/modules/masterserver/MasterServer.h (modified) * code/branches/masterserver/src/modules/masterserver/MasterServerComm.cc (moved) * code/branches/masterserver/src/modules/masterserver/MasterServerComm.h (added) * code/branches/masterserver/src/modules/masterserver/PeerList.cc (moved) * code/branches/masterserver/src/modules/masterserver/ServerList.cc (moved) Communication channel now working both ways, doxygen documentation ... Tue, 02 Nov 2010 22:41:52 GMT dafrick [7608] * code/branches/menu/data/gui/layouts/MainMenu.layout (modified) * code/branches/menu/data/gui/scripts/MainMenu.lua (modified) Some adjustments. Tue, 02 Nov 2010 22:30:44 GMT dafrick [7607] * code/branches/menu/data/gui/layouts/MainMenu.layout (modified) * code/branches/menu/data/gui/scripts/GUISheet.lua (modified) * code/branches/menu/data/gui/scripts/MainMenu.lua (modified) * code/branches/menu/data/gui/scripts/SheetManager.lua (modified) Some improvement on keypressed behaviour. Lua is acting up a little, ... Tue, 02 Nov 2010 21:34:07 GMT jo [7605] * code/branches/lastmanstanding/data/levels/gametype_lastmanstanding.oxw (modified) * code/branches/lastmanstanding/src/orxonox/gametypes/LastManStanding.cc (modified) * code/branches/lastmanstanding/src/orxonox/gametypes/LastManStanding.h (modified) Various successful changes. But the part I commented out in ... Sun, 31 Oct 2010 21:47:07 GMT jo [7604] * code/branches/lastmanstanding/src/orxonox/gametypes/Asteroids.cc (modified) Small Asteroids papercut. Sun, 31 Oct 2010 19:47:46 GMT jo [7603] * code/branches/lastmanstanding/data/levels/gametype_lastmanstanding.oxw (modified) Gotcha. Stable version. Sun, 31 Oct 2010 16:14:55 GMT jo [7602] * code/branches/lastmanstanding/data/levels/gametype_lastmanstanding.oxw (modified) * code/branches/lastmanstanding/src/orxonox/gametypes/LastManStanding.cc (modified) Collisionshapes do not work as intended. Although I followed the ... Thu, 28 Oct 2010 21:53:27 GMT jo [7600] * code/branches/lastmanstanding/data/levels/gametype_lastmanstanding.oxw (modified) * code/branches/lastmanstanding/src/orxonox/gametypes/LastManStanding.cc (modified) New functionality successfully added. No bugs found so far. Only the ... Wed, 27 Oct 2010 22:05:01 GMT jo [7596] * code/branches/lastmanstanding/data/levels/gametype_lastmanstanding.oxw (modified) * code/branches/lastmanstanding/src/orxonox/gametypes/LastManStanding.cc (modified) * code/branches/lastmanstanding/src/orxonox/gametypes/LastManStanding.h (modified) Respawn delay added. One new bug has to be removed. Wed, 27 Oct 2010 20:39:48 GMT dafrick [7594] * code/branches/menu/data/gui/scripts/MainMenu.lua (modified) Small adjustment to MainMenu.lua to illustrate how to change how a ... Wed, 27 Oct 2010 20:01:08 GMT rgrieder [7592] * code/branches/ois_update/src/external/ogreceguirenderer/CMakeLists.txt (modified) OgreCEGUIRenderer should not have a version number because none can ... Wed, 27 Oct 2010 15:47:50 GMT youngk [7591] * code/branches/ois_update/cmake/PackageConfigOSX.cmake (modified) * code/branches/ois_update/src/orxonox/sound/SoundBuffer.cc (modified) * code/branches/ois_update/src/orxonox/sound/SoundManager.cc (modified) * code/branches/ois_update/src/orxonox/sound/WorldSound.cc (modified) Adjusted inclusion of ALUT header files for mac and edited the ... Wed, 27 Oct 2010 14:16:08 GMT smerkli [7590] * code/branches/masterserver/src/modules/masterserver/MasterServer.cpp (modified) * code/branches/masterserver/src/modules/masterserver/MasterServer.h (modified) * code/branches/masterserver/src/modules/masterserver/PeerList.cpp (modified) done for today, everything compiles, test client as well. beginning ... Wed, 27 Oct 2010 13:24:56 GMT smerkli [7589] * code/branches/masterserver/src/modules/masterserver/MasterServer.cpp (modified) * code/branches/masterserver/src/modules/masterserver/MasterServer.h (modified) * code/branches/masterserver/src/modules/masterserver/PeerList.h (modified) * code/branches/masterserver/src/modules/masterserver/ServerList.cpp (modified) * code/branches/masterserver/src/modules/masterserver/TestClient.cpp (added) wrote some test client and further implemented the master server ... Wed, 27 Oct 2010 11:15:28 GMT dafrick [7588] * code/branches/menu/data/gui/layouts/MainMenu.layout (modified) * code/branches/menu/data/gui/layouts/MainMenuBackground.layout (modified) * code/branches/menu/data/gui/scripts/MainMenu.lua (modified) * code/branches/menu/src/orxonox/gamestates/GSMainMenu.cc (modified) Adjustments to allow key input in MainMenu and first steps towards ... Wed, 27 Oct 2010 11:11:24 GMT konrad [7587] * code/branches/menu/data/gui/layouts/HostMenu.layout (added) * code/branches/menu/data/gui/layouts/MainMenu.layout (modified) * code/branches/menu/data/gui/layouts/MultiplayerMenu.layout (modified) * code/branches/menu/data/gui/scripts/HostMenu.lua (added) * code/branches/menu/data/gui/scripts/MenuSheet.lua (modified) * code/branches/menu/data/gui/scripts/MultiplayerMenu.lua (modified) changes in the multiplayer menu, 2 buttons instead of 3: host and ... Tue, 26 Oct 2010 19:14:45 GMT jo [7586] * code/branches/lastmanstanding/src/orxonox/gametypes/LastManStanding.cc (modified) HUD bug removed. Tue, 26 Oct 2010 19:01:48 GMT jo [7585] * code/branches/lastmanstanding/data/levels/gametype_lastmanstanding.oxw (modified) * code/branches/lastmanstanding/src/orxonox/gametypes/LastManStanding.cc (modified) With collisionshapes. Still problems with collisionshapes and movable ... Mon, 25 Oct 2010 21:49:25 GMT jo [7584] * code/branches/lastmanstanding/data/levels/gametype_asteroids.oxw (modified) Changed values in the Asteroid Gametype. Now it's a challenge, but ... Mon, 25 Oct 2010 21:11:04 GMT jo [7583] * code/branches/lastmanstanding/data/overlays/dynamicmatchhud.oxo (modified) * code/branches/lastmanstanding/src/orxonox/gametypes/LastManStanding.cc (modified) * code/branches/lastmanstanding/src/orxonox/gametypes/LastManStanding.h (modified) Changed inheritance. instead of Gametype it's Deathmatch. Mon, 25 Oct 2010 21:05:34 GMT rgrieder [7582] * code/branches/ois_update/cmake/LibraryConfig.cmake (modified) * code/branches/ois_update/cmake/PackageConfig.cmake (modified) * code/branches/ois_update/cmake/PackageConfigOSX.cmake (copied) * code/branches/ois_update/cmake/tools/CheckPackageVersion.cmake (copied) Added CMake code for OS X package configuration. Not guaranteed to ... Mon, 25 Oct 2010 20:21:53 GMT jo [7581] * code/branches/lastmanstanding/data/overlays/lastmanstandinghud.oxo (added) * code/branches/lastmanstanding/src/orxonox/gametypes/LastManStanding.cc (modified) Almost finished. Yeay. Sun, 24 Oct 2010 18:33:58 GMT smerkli [7580] * code/branches/masterserver/src/modules/masterserver/MasterServer.cpp (modified) * code/branches/masterserver/src/modules/masterserver/PeerList.cpp (modified) * code/branches/masterserver/src/modules/masterserver/PeerList.h (modified) Further implementation, constructing a testing environment soon. Fri, 22 Oct 2010 14:19:40 GMT jo [7579] * code/branches/lastmanstanding/data/levels/gametype_lastmanstanding.oxw (modified) * code/branches/lastmanstanding/data/overlays/dynamicmatchhud.oxo (modified) * code/branches/lastmanstanding/src/orxonox/gametypes/LastManStanding.cc (modified) * code/branches/lastmanstanding/src/orxonox/gametypes/LastManStanding.h (modified) Jetzt auch mit einfachem HUD. Thu, 21 Oct 2010 21:45:26 GMT youngk [7578] * code/branches/ois_update/src/libraries/network/LANDiscoverable.cc (modified) Added missing inclusion of Debug.h in network target. Thu, 21 Oct 2010 21:32:28 GMT rgrieder [7577] * code/branches/ois_update/src/libraries/core/DynLib.cc (modified) * code/branches/ois_update/src/libraries/core/DynLib.h (modified) Trying another fix: Load plugins on OS X as we do on Linux. Thu, 21 Oct 2010 21:26:17 GMT rgrieder [7576] * code/branches/ois_update/src/libraries/core/DynLib.cc (modified) * code/branches/ois_update/src/libraries/core/DynLib.h (modified) Fixed typo. Thu, 21 Oct 2010 21:16:39 GMT rgrieder [7575] * code/branches/ois_update/src/libraries/core/DynLib.cc (modified) * code/branches/ois_update/src/libraries/core/DynLib.h (modified) Copied code for Ogre::mac_loadDylib to DynLib.h because the symbol ... Wed, 20 Oct 2010 21:34:21 GMT smerkli [7574] * code/branches/masterserver/src/modules/masterserver/PeerList.cpp (added) * code/branches/masterserver/src/modules/masterserver/PeerList.h (added) initial peerlist stuff, implementation to follow sometime this week Wed, 20 Oct 2010 21:26:44 GMT jo [7573] * code/branches/lastmanstanding/data/levels/gametype_lastmanstanding.oxw (modified) Looks a little bit more like Stonehenge:-) Wed, 20 Oct 2010 20:46:38 GMT rgrieder [7572] * code/branches/ois_update/src/libraries/core/BaseObject.h (modified) Reverted changes in BaseObject.h Wed, 20 Oct 2010 15:35:10 GMT youngk [7571] * code/branches/ois_update/src/libraries/core/BaseObject.h (modified) * code/branches/ois_update/src/libraries/core/PathConfig.cc (modified) * code/branches/ois_update/src/libraries/core/Super.h (modified) Changes to Super.h: Macro collision. Again. Wed, 20 Oct 2010 13:50:05 GMT rgrieder [7570] * code/branches/ois_update/src/libraries/core/BaseObject.h (modified) Testing... Wed, 20 Oct 2010 13:47:12 GMT smerkli [7569] * code/branches/masterserver/src/modules/masterserver/MasterServer.cpp (modified) * code/branches/masterserver/src/modules/masterserver/MasterServer.h (modified) ...everything looks better with a GPL on top. Wed, 20 Oct 2010 13:43:42 GMT smerkli [7568] * code/branches/masterserver/src/modules/CMakeLists.txt (modified) * code/branches/masterserver/src/modules/masterserver/MasterServer.cpp (modified) * code/branches/masterserver/src/modules/masterserver/MasterServer.h (modified) * code/branches/masterserver/src/modules/masterserver/ServerList.h (modified) some progress, nothing working yet though. Wed, 20 Oct 2010 13:17:57 GMT youngk [7567] * code/branches/ois_update/cmake/tools/CheckOGREPlugins.cmake (modified) * code/branches/ois_update/src/external/ois/CMakeLists.txt (modified) Changes for the compilation of OIS on the mac. Wed, 20 Oct 2010 12:54:08 GMT smerkli [7566] * code/branches/masterserver/src/modules/masterserver/.MasterServer.h.swp-backup (deleted) Wed, 20 Oct 2010 12:53:53 GMT smerkli [7565] * code/branches/masterserver/src/modules/masterserver (added) * code/branches/masterserver/src/modules/masterserver/.MasterServer.h.swp-backup (added) * code/branches/masterserver/src/modules/masterserver/MasterServer.cpp (added) * code/branches/masterserver/src/modules/masterserver/MasterServer.h (added) * code/branches/masterserver/src/modules/masterserver/ServerList.cpp (added) * code/branches/masterserver/src/modules/masterserver/ServerList.h (added) Initial check-in of the master server code. Nowhere near completion ... Tue, 19 Oct 2010 21:43:25 GMT rgrieder [7564] * code/branches/ois_update/src/external/bullet/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.cpp (modified) * code/branches/ois_update/src/libraries/core/Super.h (modified) * code/branches/ois_update/src/modules/questsystem/QuestEffect.cc (modified) * code/branches/ois_update/src/modules/questsystem/QuestEffectBeacon.cc (modified) * code/branches/ois_update/src/modules/questsystem/effects/AddReward.cc (modified) Renamed all symbols called "check" because of macro collisions on OS ... Tue, 19 Oct 2010 21:32:36 GMT rgrieder [7563] * code/branches/ois_update/src/libraries/core/BaseObject.h (modified) Reverted changes. Tue, 19 Oct 2010 21:28:30 GMT rgrieder [7562] * code/branches/ois_update/src/libraries/core/BaseObject.h (modified) More testing... Tue, 19 Oct 2010 21:26:35 GMT jo [7561] * code/branches/lastmanstanding/data/levels/gametype_lastmanstanding.oxw (modified) New, Improved Level. Should become similar to Stonehenge - maybe Tue, 19 Oct 2010 21:22:55 GMT rgrieder [7560] * code/branches/ois_update/src/libraries/core/BaseObject.h (modified) De-macro'd a super function declaration in BaseObject.h with the hope ... Tue, 19 Oct 2010 21:16:01 GMT rgrieder [7559] * code/branches/ois_update/src/libraries/core/Super.h (modified) Reverted changes made for testing purposes. Tue, 19 Oct 2010 21:06:16 GMT rgrieder [7558] * code/branches/ois_update/src/libraries/core/Super.h (modified) Still testing... Tue, 19 Oct 2010 20:57:05 GMT rgrieder [7557] * code/branches/ois_update/src/libraries/core/Super.h (modified) Testing.. Tue, 19 Oct 2010 16:34:13 GMT landauf [7556] * code/branches/lastmanstanding/data/levels/gametype_lastmanstanding.oxw (modified) * code/branches/lastmanstanding/data/levels/notifications.oxw (modified) * code/branches/lastmanstanding/src/orxonox/gametypes/LastManStanding.cc (modified) * code/branches/lastmanstanding/src/orxonox/gametypes/LastManStanding.h (modified) eol-style native Tue, 19 Oct 2010 16:32:25 GMT landauf [7555] * code/branches/lastmanstanding/data/levels/gametype_lastmanstanding.oxw (modified) no nested tags allowed (I think the billboard is ... Tue, 19 Oct 2010 16:25:17 GMT landauf [7554] * code/branches/lastmanstanding/src/modules/notifications/Notification.h (modified) small fix to make it compile again Mon, 18 Oct 2010 21:20:32 GMT rgrieder [7553] * code/branches/ois_update/src/libraries/core/Super.h (modified) * code/branches/ois_update/src/libraries/util/Math.cc (modified) Reverted intentional compiler errors generated in the last commit. ... Thu, 14 Oct 2010 21:58:56 GMT jo [7543] * code/branches/lastmanstanding/src/orxonox/gametypes/LastManStanding.cc (modified) Bug description. Couldn't find a solution though. Thu, 14 Oct 2010 21:02:57 GMT jo [7542] * code/branches/lastmanstanding/data/levels/gametype_lastmanstanding.oxw (modified) * code/branches/lastmanstanding/src/orxonox/gametypes/LastManStanding.cc (modified) * code/branches/lastmanstanding/src/orxonox/gametypes/LastManStanding.h (modified) Some cleanup. There's still a nasty bug. Wed, 13 Oct 2010 18:36:22 GMT rgrieder [7537] * code/branches/data_cleanup/data/DefaultResources.oxr (modified) * code/branches/data_cleanup/data/gui/looknfeels (copied) * code/branches/data_cleanup/src/libraries/core/GUIManager.cc (modified) * code/branches/data_cleanup/src/libraries/tools/ResourceLocation.cc (modified) Moved content of resource group "GUI" to "General" and added ... Wed, 13 Oct 2010 18:35:37 GMT rgrieder [7536] * code/branches/data_cleanup (copied) Creating branch for data cleanup stuff. Wed, 13 Oct 2010 11:29:07 GMT dafrick [7535] * code/branches/menu (copied) Creating new branch. For konrad to work on the menu.