# # ChangeLog for code/branches # # Generated by Trac 1.0.9 # Nov 22, 2024, 4:00:54 PM 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. Tue, 12 Oct 2010 22:09:04 GMT rgrieder [7532] * code/branches/ois_update/src/libraries/core/Super.h (modified) * code/branches/ois_update/src/libraries/util/Math.cc (modified) Adding some compiler errors to test OS X stuff Tue, 12 Oct 2010 16:02:07 GMT rgrieder [7530] * code/branches/ois_update/CMakeLists.txt (modified) Hope this fixes some more OS X problems. Mon, 11 Oct 2010 21:32:02 GMT rgrieder [7528] * code/branches/ois_update/src/libraries/util/SignalHandler.h (modified) Even linux only classes should carry the _LibraryExport macro. Mon, 11 Oct 2010 21:29:42 GMT rgrieder [7527] * code/branches/ois_update/src/libraries/core/CorePrereqs.h (modified) * code/branches/ois_update/src/libraries/network/NetworkPrereqs.h (modified) * code/branches/ois_update/src/libraries/tools/ToolsPrereqs.h (modified) * code/branches/ois_update/src/libraries/util/UtilPrereqs.h (modified) * code/branches/ois_update/src/modules/designtools/DesignToolsPrereqs.h (modified) * code/branches/ois_update/src/modules/notifications/NotificationsPrereqs.h (modified) * code/branches/ois_update/src/modules/objects/ObjectsPrereqs.h (modified) * code/branches/ois_update/src/modules/overlays/OverlaysPrereqs.h (modified) * code/branches/ois_update/src/modules/pickup/PickupPrereqs.h (modified) * code/branches/ois_update/src/modules/pong/PongPrereqs.h (modified) * code/branches/ois_update/src/modules/questsystem/QuestsystemPrereqs.h (modified) * code/branches/ois_update/src/modules/weapons/WeaponsPrereqs.h (modified) * code/branches/ois_update/src/orxonox/OrxonoxPrereqs.h (modified) Added _LibraryPrivate macros to all LibraryPrereqs.h files. You can ... Mon, 11 Oct 2010 21:17:09 GMT rgrieder [7526] * code/branches/ois_update/cmake/CompilerConfigGCC.cmake (modified) Fixed GCC visibility: Default should be 'default', not 'hidden' for ... Mon, 11 Oct 2010 21:08:26 GMT rgrieder [7525] * code/branches/ois_update/src/OrxonoxConfig.cmake (modified) * code/branches/ois_update/src/OrxonoxConfig.h.in (modified) Architecture (32/64 bit) should be determined at compile time because ... Mon, 11 Oct 2010 20:39:58 GMT rgrieder [7524] * code/branches/ois_update/cmake/CompilerConfigGCC.cmake (modified) Postponing -march options for later. There are too many possible ... Mon, 11 Oct 2010 10:58:59 GMT rgrieder [7523] * code/branches/ois_update/cmake/CompilerConfigGCC.cmake (modified) Activated SSE on Linux and disabled Visibility again because of ... Mon, 11 Oct 2010 10:36:19 GMT rgrieder [7522] * code/branches/ois_update/cmake/CompilerConfigGCC.cmake (modified) Build fixes for code written on Windows Mon, 11 Oct 2010 10:32:23 GMT rgrieder [7521] * code/branches/ois_update/cmake/LibraryConfig.cmake (modified) Bugfix (no GCC_VERSION variable with other compilers). Mon, 11 Oct 2010 10:29:16 GMT rgrieder [7520] * code/branches/ois_update/cmake/CompilerConfigGCC.cmake (modified) * code/branches/ois_update/cmake/CompilerConfigMSVC.cmake (modified) Added some useful compiler options found in the Ogre build system. ... Sat, 09 Oct 2010 15:32:31 GMT rgrieder [7519] * code/branches/ois_update/CMakeLists.txt (modified) Trying to get OS X to compile with 32 bits. Sat, 09 Oct 2010 15:28:36 GMT rgrieder [7518] * code/branches/ois_update/cmake/CompilerConfigGCC.cmake (modified) * code/branches/ois_update/cmake/LibraryConfig.cmake (modified) There was a hidden problem with the recent "radical change" after ... Sat, 09 Oct 2010 15:24:44 GMT rgrieder [7517] * code/branches/ois_update/CMakeLists.txt (modified) Radical change in build system. Should not make any difference ... Sat, 09 Oct 2010 14:12:02 GMT rgrieder [7516] * code/branches/ois_update/src/external/ois/changes_orxonox.diff (modified) * code/branches/ois_update/src/external/ois/mac/MacHIDManager.cpp (modified) Fixed wrong code in MacHIDManager (OIS). Sat, 09 Oct 2010 14:05:15 GMT rgrieder [7515] * code/branches/ois_update/src/modules/pickup/PickupCollection.h (modified) No new line at end of file. Sat, 09 Oct 2010 13:36:51 GMT rgrieder [7514] * code/branches/ois_update/src/OrxonoxConfig.cmake (modified) * code/branches/ois_update/src/OrxonoxConfig.h.in (modified) * code/branches/ois_update/src/libraries/core/command/Functor.h (modified) * code/branches/ois_update/src/libraries/util/SharedPtr.h (modified) This hopefully fixes some warnings with gcc 4.0. Fri, 08 Oct 2010 22:27:50 GMT rgrieder [7513] * code/branches/ois_update/src/libraries/core/DynLib.cc (modified) * code/branches/ois_update/src/libraries/core/DynLib.h (modified) Updated DynLib class to the newest version in the OGRE trunk. This ... Fri, 08 Oct 2010 07:23:29 GMT rgrieder [7512] * code/branches/ois_update/src/libraries/core/DynLib.h (modified) That should fix DynLib compiling on Mac. Thu, 07 Oct 2010 21:17:58 GMT rgrieder [7511] * code/branches/ois_update/src/external/ois/CMakeLists.txt (modified) Removed obsolete statement. Thu, 07 Oct 2010 21:12:05 GMT rgrieder [7510] * code/branches/ois_update/src/CMakeLists.txt (modified) Fixed something I should have seen a long time ago: Order of include ... Thu, 07 Oct 2010 19:30:12 GMT rgrieder [7509] * code/branches/ois_update/src/external/ois/mac/CMakeLists.txt (modified) No more compilations here as well. Thu, 07 Oct 2010 19:28:22 GMT rgrieder [7508] * code/branches/ois_update/src/external/ois/CMakeLists.txt (modified) Not using compilations to compile OIS for the moment. Thu, 07 Oct 2010 18:26:22 GMT rgrieder [7507] * code/branches/ois_update/src/external/ois/CMakeLists.txt (modified) * code/branches/ois_update/src/external/ois/mac/CMakeLists.txt (modified) Fixed CMakeLists files in OIS folder. Thu, 07 Oct 2010 18:21:33 GMT rgrieder [7506] * code/branches/ois_update/src/external/ois/OIS.h (modified) * code/branches/ois_update/src/external/ois/OISConfig.h (modified) * code/branches/ois_update/src/external/ois/OISInputManager.cpp (modified) * code/branches/ois_update/src/external/ois/OISKeyboard.h (modified) * code/branches/ois_update/src/external/ois/OISMultiTouch.h (added) * code/branches/ois_update/src/external/ois/OISPrereqs.h (modified) * code/branches/ois_update/src/external/ois/ReadMe.txt (modified) * code/branches/ois_update/src/external/ois/VERSION (modified) * code/branches/ois_update/src/external/ois/changes_orxonox.diff (modified) * code/branches/ois_update/src/external/ois/linux/LinuxInputManager.cpp (modified) * code/branches/ois_update/src/external/ois/linux/LinuxInputManager.h (modified) * code/branches/ois_update/src/external/ois/linux/LinuxJoyStickEvents.cpp (modified) * code/branches/ois_update/src/external/ois/linux/LinuxKeyboard.cpp (modified) * code/branches/ois_update/src/external/ois/linux/LinuxKeyboard.h (modified) * code/branches/ois_update/src/external/ois/linux/LinuxMouse.cpp (modified) * code/branches/ois_update/src/external/ois/linux/LinuxPrereqs.h (modified) * code/branches/ois_update/src/external/ois/mac/MacHIDManager.cpp (modified) * code/branches/ois_update/src/external/ois/mac/MacHIDManager.h (modified) * code/branches/ois_update/src/external/ois/mac/MacInputManager.cpp (modified) * code/branches/ois_update/src/external/ois/mac/MacJoyStick.cpp (added) * code/branches/ois_update/src/external/ois/mac/MacJoyStick.h (added) * code/branches/ois_update/src/external/ois/win32/Win32ForceFeedback.cpp (modified) * code/branches/ois_update/src/external/ois/win32/Win32ForceFeedback.h (modified) * code/branches/ois_update/src/external/ois/win32/Win32InputManager.cpp (modified) * code/branches/ois_update/src/external/ois/win32/Win32InputManager.h (modified) * code/branches/ois_update/src/external/ois/win32/Win32JoyStick.cpp (modified) * code/branches/ois_update/src/external/ois/win32/Win32JoyStick.h (modified) * code/branches/ois_update/src/external/ois/win32/Win32KeyBoard.cpp (modified) * code/branches/ois_update/src/external/ois/win32/Win32KeyBoard.h (modified) * code/branches/ois_update/src/external/ois/win32/Win32Mouse.cpp (modified) * code/branches/ois_update/src/external/ois/win32/Win32Mouse.h (modified) * code/branches/ois_update/src/external/ois/win32/Win32Prereqs.h (modified) Updated OIS source files to its current SVN trunk (r26). Thu, 07 Oct 2010 18:12:14 GMT rgrieder [7505] * code/branches/ois_update (copied) 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:49:26 GMT dafrick [7499] * code/branches/tutorial2/data/gui/layouts/ChatBox.layout (modified) * code/branches/tutorial2/data/gui/scripts/ChatBox.lua (modified) Fix to get rid of lua/cegui error. Tue, 28 Sep 2010 20:11:25 GMT scheusso [7498] * code/branches/network3 (deleted) deleting old network3 branch Tue, 28 Sep 2010 20:10:56 GMT scheusso [7497] * code/branches/network4 (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) * code/branches/network4/src/modules/weapons/MuzzleFlash.cc (modified) merging network3 into network4 branch Tue, 28 Sep 2010 20:05:38 GMT scheusso [7496] * code/branches/network4 (copied) creating new network4 branch for network testing and (maybe also) ... Thu, 23 Sep 2010 21:22:22 GMT jo [7485] * code/branches/lastmanstanding/src/orxonox/gametypes/LastManStanding.cc (modified) * code/branches/lastmanstanding/src/orxonox/gametypes/LastManStanding.h (modified) Last Man Standing already works basically. All game rules are ... Wed, 22 Sep 2010 21:30:33 GMT jo [7481] * code/branches/lastmanstanding/data/levels/empty_level.oxw (modified) * code/branches/lastmanstanding/src/orxonox/gametypes/LastManStanding.cc (modified) Die erste Arbeitsversion. Zum Testen muss man zuerst Bots hinzufügen, ... Wed, 22 Sep 2010 21:22:03 GMT jo [7480] * code/branches/lastmanstanding/data/levels/empty_level.oxw (modified) * code/branches/lastmanstanding/data/levels/gametype_lastmanstanding.oxw (added) * code/branches/lastmanstanding/src/orxonox/gametypes/CMakeLists.txt (modified) * code/branches/lastmanstanding/src/orxonox/gametypes/LastManStanding.cc (added) * code/branches/lastmanstanding/src/orxonox/gametypes/LastManStanding.h (added) initial upload Wed, 22 Sep 2010 20:47:28 GMT jo [7479] * code/branches/lastmanstanding (copied) Mon, 20 Sep 2010 11:47:45 GMT rgrieder [7467] * code/branches/fps (deleted) * code/branches/png2 (deleted) Removed merged branches. Tue, 14 Sep 2010 18:49:45 GMT adrfried [7454] * code/branches/ipv6/src/CMakeLists.txt (modified) superfluous include dir removed Tue, 14 Sep 2010 15:37:07 GMT adrfried [7453] * code/branches/ipv6/src/external/enet/CMakeLists.txt (modified) * code/branches/ipv6/src/external/enet/callbacks.h (moved) * code/branches/ipv6/src/external/enet/enet.h (moved) * code/branches/ipv6/src/external/enet/list.h (moved) * code/branches/ipv6/src/external/enet/protocol.h (moved) * code/branches/ipv6/src/external/enet/time.h (moved) * code/branches/ipv6/src/external/enet/types.h (moved) * code/branches/ipv6/src/external/enet/unix.h (moved) * code/branches/ipv6/src/external/enet/utility.h (moved) * code/branches/ipv6/src/external/enet/win32.h (moved) enet files moved Mon, 13 Sep 2010 13:07:04 GMT dafrick [7446] * code/branches/tutorial2/data/levels/tutorial.oxw (modified) * code/branches/tutorial2/src/orxonox/controllers/AutonomousDroneController.cc (modified) * code/branches/tutorial2/src/orxonox/controllers/CMakeLists.txt (modified) * code/branches/tutorial2/src/orxonox/worldentities/AutonomousDrone.cc (modified) * code/branches/tutorial2/src/orxonox/worldentities/AutonomousDrone.h (modified) * code/branches/tutorial2/src/orxonox/worldentities/CMakeLists.txt (modified) Removing all the stuff the students are supposed to fill in themselves. Mon, 13 Sep 2010 13:01:54 GMT dafrick [7444] * code/branches/tutorial2/data/levels/tutorial.oxw (modified) * code/branches/tutorial2/src/orxonox/controllers/AutonomousDroneController.cc (added) * code/branches/tutorial2/src/orxonox/controllers/AutonomousDroneController.h (added) * code/branches/tutorial2/src/orxonox/controllers/CMakeLists.txt (modified) * code/branches/tutorial2/src/orxonox/worldentities/AutonomousDrone.cc (added) * code/branches/tutorial2/src/orxonox/worldentities/AutonomousDrone.h (added) * code/branches/tutorial2/src/orxonox/worldentities/CMakeLists.txt (modified) Adding Drone (Which is now called AutonomousDrone) and its controller. Mon, 13 Sep 2010 12:08:04 GMT adrfried [7443] * code/branches/ipv6/src/external/enet/patches/0001-IPv6-support.patch (added) * code/branches/ipv6/src/external/enet/patches/0001-use-getaddrinfo-for-lookup-in-unix.c.patch (deleted) * code/branches/ipv6/src/external/enet/patches/0002-basic-IPv6-support-on-Linux-systems.patch (deleted) * code/branches/ipv6/src/external/enet/patches/0003-using-address-family-in-functions.patch (deleted) * code/branches/ipv6/src/external/enet/patches/0004-using-two-separate-sockets-for-IPv4-and-IPv6.patch (deleted) * code/branches/ipv6/src/external/enet/patches/0005-IPv6-for-Windows.patch (deleted) patch updated only one big patch for now Mon, 13 Sep 2010 11:29:13 GMT adrfried [7442] * code/branches/ipv6/src/external/enet/include/enet/win32.h (modified) * code/branches/ipv6/src/external/enet/win32.c (modified) moved AI_ADDRCONFIG definition to header Mon, 13 Sep 2010 09:08:33 GMT dafrick [7441] * code/branches/tutorial2 (copied) New tutorial branch. Sun, 12 Sep 2010 22:16:48 GMT adrfried [7438] * code/branches/ipv6/src/external/enet/ChangeLog (modified) * code/branches/ipv6/src/external/enet/Doxyfile (modified) * code/branches/ipv6/src/external/enet/LICENSE (modified) * code/branches/ipv6/src/external/enet/README (modified) * code/branches/ipv6/src/external/enet/callbacks.c (modified) * code/branches/ipv6/src/external/enet/compress.c (modified) * code/branches/ipv6/src/external/enet/docs/FAQ.dox (modified) * code/branches/ipv6/src/external/enet/docs/design.dox (modified) * code/branches/ipv6/src/external/enet/docs/install.dox (modified) * code/branches/ipv6/src/external/enet/docs/license.dox (modified) * code/branches/ipv6/src/external/enet/docs/mainpage.dox (modified) * code/branches/ipv6/src/external/enet/docs/tutorial.dox (modified) * code/branches/ipv6/src/external/enet/host.c (modified) * code/branches/ipv6/src/external/enet/include/enet/callbacks.h (modified) * code/branches/ipv6/src/external/enet/include/enet/enet.h (modified) * code/branches/ipv6/src/external/enet/include/enet/list.h (modified) * code/branches/ipv6/src/external/enet/include/enet/protocol.h (modified) * code/branches/ipv6/src/external/enet/include/enet/time.h (modified) * code/branches/ipv6/src/external/enet/include/enet/types.h (modified) * code/branches/ipv6/src/external/enet/include/enet/unix.h (modified) * code/branches/ipv6/src/external/enet/include/enet/utility.h (modified) * code/branches/ipv6/src/external/enet/include/enet/win32.h (modified) * code/branches/ipv6/src/external/enet/libenet.pc.in (modified) * code/branches/ipv6/src/external/enet/list.c (modified) * code/branches/ipv6/src/external/enet/packet.c (modified) * code/branches/ipv6/src/external/enet/patches/0001-use-getaddrinfo-for-lookup-in-unix.c.patch (modified) * code/branches/ipv6/src/external/enet/patches/0002-basic-IPv6-support-on-Linux-systems.patch (modified) * code/branches/ipv6/src/external/enet/patches/0003-using-address-family-in-functions.patch (modified) * code/branches/ipv6/src/external/enet/patches/0004-using-two-separate-sockets-for-IPv4-and-IPv6.patch (modified) * code/branches/ipv6/src/external/enet/patches/0005-IPv6-for-Windows.patch (modified) * code/branches/ipv6/src/external/enet/peer.c (modified) * code/branches/ipv6/src/external/enet/protocol.c (modified) * code/branches/ipv6/src/external/enet/unix.c (modified) * code/branches/ipv6/src/external/enet/win32.c (modified) set svn props and fix line endings in libenet files Sun, 12 Sep 2010 21:28:10 GMT rgrieder [7437] * code/branches/ipv6/src/libraries/network/packet/ServerInformation.h (modified) Fixed msvc build.