# # ChangeLog for code/branches # # Generated by Trac 1.0.9 # Nov 18, 2024, 1:56:37 PM Thu, 24 Mar 2011 16:31:00 GMT rgrieder [8111] * code/branches/kicklib/contrib/CMakeLists.txt (modified) * code/branches/kicklib/contrib/orxonox.desktop (modified) * code/branches/kicklib/contrib/orxonox.png (added) * code/branches/kicklib/contrib/orxonox_old.svg (moved) Changed linux icon to the new one from the forum. Also changed the ... Thu, 24 Mar 2011 15:16:54 GMT kmaurus [8110] * code/branches/spaceboundaries/src/orxonox/worldentities/CMakeLists.txt (modified) * code/branches/spaceboundaries/src/orxonox/worldentities/SpaceBoundaries.cc (modified) * code/branches/spaceboundaries/src/orxonox/worldentities/SpaceBoundaries.h (modified) Iteratorschleife aller MobileEntities sowie Funktion zum Berechnen ... Wed, 23 Mar 2011 20:41:21 GMT dafrick [8107] * code/branches/tetris/doc/api/groups/Triggers.dox (modified) * code/branches/tetris/src/libraries/core/Loader.cc (modified) * code/branches/tetris/src/libraries/network/Host.cc (modified) * code/branches/tetris/src/libraries/network/MasterServerComm.h (modified) * code/branches/tetris/src/modules/designtools/ScreenshotManager.cc (modified) * code/branches/tetris/src/modules/pong/PongAI.cc (modified) * code/branches/tetris/src/modules/pong/PongAI.h (modified) * code/branches/tetris/src/modules/pong/PongBat.cc (modified) * code/branches/tetris/src/modules/pong/PongBot.cc (modified) * code/branches/tetris/src/modules/pong/PongBot.h (modified) * code/branches/tetris/src/modules/pong/PongScore.cc (modified) * code/branches/tetris/src/modules/pong/PongScore.h (modified) Done documenting Pong. Also resolved some doxygen warnings. Wed, 23 Mar 2011 17:22:47 GMT dafrick [8106] * code/branches/tetris/doc/api/Groups.dox (modified) * code/branches/tetris/doc/api/groups (added) * code/branches/tetris/doc/api/groups/Notifications.dox (added) * code/branches/tetris/doc/api/groups/Pickup.dox (added) * code/branches/tetris/doc/api/groups/Questsystem.dox (added) * code/branches/tetris/doc/api/groups/Triggers.dox (added) * code/branches/tetris/src/modules/pong/Pong.cc (modified) * code/branches/tetris/src/modules/pong/Pong.h (modified) * code/branches/tetris/src/modules/pong/PongBall.cc (modified) * code/branches/tetris/src/modules/pong/PongBall.h (modified) * code/branches/tetris/src/modules/pong/PongBat.cc (modified) * code/branches/tetris/src/modules/pong/PongBat.h (modified) * code/branches/tetris/src/modules/pong/PongCenterpoint.h (modified) * code/branches/tetris/src/modules/pong/PongScore.h (modified) And even more documentation. Also moved some of the documentation ... Wed, 23 Mar 2011 11:13:34 GMT dafrick [8105] * code/branches/tetris/doc/api/Groups.dox (modified) * code/branches/tetris/src/modules/pickup/Pickup.h (modified) * code/branches/tetris/src/modules/pong/Pong.h (modified) * code/branches/tetris/src/modules/pong/PongBall.cc (modified) * code/branches/tetris/src/modules/pong/PongBall.h (modified) * code/branches/tetris/src/modules/pong/PongBat.cc (modified) * code/branches/tetris/src/modules/pong/PongBat.h (modified) * code/branches/tetris/src/modules/pong/PongCenterpoint.cc (modified) * code/branches/tetris/src/modules/pong/PongCenterpoint.h (modified) More documentation for Pong. Wed, 23 Mar 2011 06:40:36 GMT dafrick [8104] * code/branches/tetris/src/modules/pong/Pong.cc (modified) * code/branches/tetris/src/modules/pong/Pong.h (modified) * code/branches/tetris/src/modules/pong/PongBall.cc (modified) * code/branches/tetris/src/modules/pong/PongBall.h (modified) Started documenting Pong. Tue, 22 Mar 2011 14:22:54 GMT rgrieder [8103] * code/branches/kicklib/src/external/tinyxml/CMakeLists.txt (modified) * code/branches/kicklib/src/external/tinyxml/VERSION (modified) * code/branches/kicklib/src/external/tinyxml/changes_orxonox.diff (modified) * code/branches/kicklib/src/external/tinyxml/ticpp.cpp (modified) * code/branches/kicklib/src/external/tinyxml/ticpp.h (modified) Updated TiCpp. Mon, 21 Mar 2011 15:37:51 GMT dafrick [8102] * code/branches/environment (copied) New branch for environment ticket. Mon, 21 Mar 2011 15:35:33 GMT dafrick [8101] * code/branches/gameimmersion (copied) New branch for game immersion ticket. Mon, 21 Mar 2011 15:35:10 GMT dafrick [8100] * code/branches/dockingsystem (copied) New branch for docking system ticket. Mon, 21 Mar 2011 14:13:30 GMT dafrick [8099] * code/branches/tetris (copied) New branch to work on tetris minigame. Sun, 20 Mar 2011 18:03:00 GMT rgrieder [8098] * code/branches/kicklib/CMakeLists.txt (modified) * code/branches/kicklib/contrib/CMakeLists.txt (added) Added CMakeLists.txt stub for the installation of files in contrib/ Sun, 20 Mar 2011 17:49:20 GMT rgrieder [8097] * code/branches/kicklib (modified) * code/branches/kicklib/contrib (copied) * code/branches/kicklib/contrib/orxonox.desktop (copied) * code/branches/kicklib/contrib/orxonox.manpage.xml (copied) * code/branches/kicklib/contrib/orxonox.svg (copied) Merged r8093 from trunk to kicklib in order to test the ArchLinux ... Sat, 19 Mar 2011 15:11:25 GMT youngk [8096] * code/branches/kicklib/src/libraries/network/MasterServerComm.cc (modified) Somebody forgot to add the Debug header Sat, 19 Mar 2011 14:10:26 GMT rgrieder [8095] * code/branches/kicklib/cmake/tools/FindCEGUI.cmake (modified) * code/branches/kicklib/src/CMakeLists.txt (modified) Add CEGUIua include directory for CEGUI version below 0.7 Sat, 19 Mar 2011 13:58:11 GMT youngk [8094] * code/branches/kicklib/cmake/PackageConfigOSX.cmake (modified) * code/branches/kicklib/cmake/tools/FindCEGUI.cmake (modified) Testing commit for CMake find scripts (Mac) Fri, 18 Mar 2011 12:05:27 GMT youngk [8092] * code/branches/mac_osx/src/CMakeLists.txt (modified) Run-fix for makefile builds. Fri, 18 Mar 2011 09:13:27 GMT youngk [8091] * code/branches/mac_osx/src/Orxonox.cc (modified) * code/branches/mac_osx/src/libraries/core/GraphicsManager.cc (modified) Dang! Forgot something very serious. Now my changes won't be breaking ... Fri, 18 Mar 2011 09:00:27 GMT youngk [8090] * code/branches/mac_osx/CMakeLists.txt (modified) * code/branches/mac_osx/cmake/PrepareDevBundle.cmake (added) * code/branches/mac_osx/data/mac/English.lproj/MainMenu.nib (added) * code/branches/mac_osx/data/mac/English.lproj/MainMenu.nib/designable.nib (added) * code/branches/mac_osx/data/mac/English.lproj/MainMenu.nib/keyedobjects.nib (added) * code/branches/mac_osx/data/mac/Orxonox-Info.plist (modified) * code/branches/mac_osx/data/mac/_Orxonox-Info.plist (deleted) * code/branches/mac_osx/src/CMakeLists.txt (modified) * code/branches/mac_osx/src/Orxonox.cc (modified) * code/branches/mac_osx/src/OrxonoxMac.mm (modified) * code/branches/mac_osx/src/libraries/core/GraphicsManager.cc (modified) * code/branches/mac_osx/src/orxonox/sound/SoundManager.cc (modified) IT WORKS! Orxonox will now run properly with Cocoa - All window ... Fri, 18 Mar 2011 04:00:59 GMT rgrieder [8089] * code/branches/kicklib/src/libraries/core/PathConfig.cc (modified) Making a strange fix. Apparently this fixes a strange problem ... Thu, 17 Mar 2011 15:09:37 GMT kmaurus [8087] * code/branches/spaceboundaries/src/orxonox/worldentities/SpaceBoundaries.cc (added) * code/branches/spaceboundaries/src/orxonox/worldentities/SpaceBoundaries.h (added) Grundgeruest aufgesetzt Thu, 17 Mar 2011 14:10:04 GMT dafrick [8086] * code/branches/portals (copied) Creating new branch for portals. Thu, 17 Mar 2011 14:09:49 GMT dafrick [8085] * code/branches/spaceboundaries (copied) Creating new branch for space boundaries. Thu, 17 Mar 2011 11:37:48 GMT youngk [8084] * code/branches/mac_osx/src/CMakeLists.txt (modified) * code/branches/mac_osx/src/Orxonox.cc (modified) Disabling the changes made, so that it becomes at least playable. ... Thu, 17 Mar 2011 11:12:17 GMT youngk [8083] * code/branches/mac_osx/CMakeLists.txt (modified) * code/branches/mac_osx/bin/mac (added) * code/branches/mac_osx/bin/mac/OrxonoxMac (added) * code/branches/mac_osx/cmake/BundleConfig.cmake (added) * code/branches/mac_osx/cmake/tools/TargetUtilities.cmake (modified) * code/branches/mac_osx/data/levels/test_swallow.oxw (modified) * code/branches/mac_osx/data/mac (added) * code/branches/mac_osx/data/mac/English.lproj (added) * code/branches/mac_osx/data/mac/English.lproj/InfoPlist.strings (added) * code/branches/mac_osx/data/mac/English.lproj/MainMenu.xib (added) * code/branches/mac_osx/data/mac/Icon.icns (added) * code/branches/mac_osx/data/mac/Orxonox-Info.plist (added) * code/branches/mac_osx/data/mac/_Orxonox-Info.plist (added) * code/branches/mac_osx/src/CMakeLists.txt (modified) * code/branches/mac_osx/src/Orxonox.cc (modified) * code/branches/mac_osx/src/OrxonoxMac.h (added) * code/branches/mac_osx/src/OrxonoxMac.mm (added) Cocoa Integration of Orxonox and CPack testing. @Reto: Do NOT merge ... Thu, 17 Mar 2011 01:58:58 GMT rgrieder [8082] * code/branches/kicklib/cmake/tools/FindCEGUI.cmake (modified) Make sure all required CEGUI extras are confirmed to be found by the ... Thu, 17 Mar 2011 01:28:23 GMT rgrieder [8081] * code/branches/kicklib/src/libraries/core/Resource.cc (modified) * code/branches/kicklib/src/libraries/core/Resource.h (modified) * code/branches/kicklib/src/libraries/tools/ResourceCollection.cc (modified) * code/branches/kicklib/src/modules/designtools/ScreenshotManager.cc (modified) Fixed serious static initialisation problem. And I thought we caught ... Wed, 16 Mar 2011 04:28:30 GMT rgrieder [8080] * code/branches/kicklib/cmake/tools/TargetUtilities.cmake (modified) Added another possible file extension for source files. @Kevin: Is ... Tue, 15 Mar 2011 20:09:58 GMT dafrick [8078] * code/branches/usability/data/defaultConfig/keybindings.ini (modified) * code/branches/usability/data/gui/scripts/GUISheet.lua (modified) * code/branches/usability/data/gui/scripts/GraphicsMenu.lua (modified) * code/branches/usability/data/gui/scripts/MenuSheet.lua (modified) * code/branches/usability/data/gui/scripts/SheetManager.lua (modified) * code/branches/usability/src/libraries/core/GUIManager.cc (modified) * code/branches/usability/src/libraries/core/GUIManager.h (modified) * code/branches/usability/src/orxonox/gamestates/GSMainMenu.cc (modified) * code/branches/usability/src/orxonox/overlays/InGameConsole.cc (modified) Reverting changes made in revision 8035, that based the menu ... Tue, 15 Mar 2011 20:00:05 GMT dafrick [8077] * code/branches/usability/src/modules/designtools/ScreenshotManager.cc (modified) * code/branches/usability/src/modules/designtools/ScreenshotManager.h (modified) * code/branches/usability/src/modules/designtools/SkyboxGenerator.cc (modified) Improving documentation of ScreenshotManager. Mon, 14 Mar 2011 16:36:36 GMT dafrick [8076] * code/branches/usability/data/gui/scripts/KeyBindMenu.lua (modified) * code/branches/usability/src/modules/designtools/ScreenshotManager.cc (modified) * code/branches/usability/src/modules/designtools/ScreenshotManager.h (modified) Adding screenshot to KeybindMenu and making "size" of screenhsot ... Mon, 14 Mar 2011 15:56:51 GMT jonas [8075] * code/branches/tutorial/src/orxonox/controllers/AutonomousDroneController_jonas.cc (copied) My steering fct Mon, 14 Mar 2011 03:20:15 GMT rgrieder [8074] * code/branches/kicklib/src/libraries/core/command/Functor.h (modified) Build fix required by merge. Mon, 14 Mar 2011 03:08:06 GMT rgrieder [8073] * code/branches/kicklib (modified) * code/branches/kicklib/cmake/CompilerConfigGCC.cmake (modified) * code/branches/kicklib/cmake/LibraryConfig.cmake (modified) * code/branches/kicklib/cmake/LibraryConfigOSX.cmake (deleted) * code/branches/kicklib/cmake/PackageConfigMSVC.cmake (modified) * code/branches/kicklib/cmake/PackageConfigMinGW.cmake (modified) * code/branches/kicklib/cmake/PackageConfigOSX.cmake (modified) * code/branches/kicklib/cmake/tools/FindALUT.cmake (modified) * code/branches/kicklib/src/OrxonoxConfig.cmake (modified) * code/branches/kicklib/src/OrxonoxConfig.h.in (modified) * code/branches/kicklib/src/external/bullet/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.cpp (modified) * code/branches/kicklib/src/external/ois/CMakeLists.txt (modified) * code/branches/kicklib/src/external/ois/OISPrereqs.h (modified) * code/branches/kicklib/src/external/ois/VERSION (modified) * code/branches/kicklib/src/external/ois/changes_orxonox.diff (modified) * code/branches/kicklib/src/external/ois/linux/LinuxKeyboard.cpp (modified) * code/branches/kicklib/src/external/ois/mac/CMakeLists.txt (modified) * code/branches/kicklib/src/external/ois/win32/Win32JoyStick.cpp (modified) * code/branches/kicklib/src/external/openal (deleted) * code/branches/kicklib/src/libraries/core/DynLib.h (modified) * code/branches/kicklib/src/libraries/core/GUIManager.cc (modified) * code/branches/kicklib/src/libraries/core/GraphicsManager.cc (modified) * code/branches/kicklib/src/libraries/core/PathConfig.cc (modified) * code/branches/kicklib/src/orxonox/MoodManager.cc (modified) * code/branches/kicklib/src/orxonox/sound/BaseSound.cc (modified) * code/branches/kicklib/src/orxonox/sound/SoundBuffer.cc (modified) * code/branches/kicklib/src/orxonox/sound/SoundManager.cc (modified) * code/branches/kicklib/src/orxonox/sound/SoundStreamer.cc (modified) * code/branches/kicklib/src/orxonox/sound/WorldSound.cc (modified) Merged mac_osx branch (after renaming it from ois_update) into ... Mon, 14 Mar 2011 03:05:13 GMT rgrieder [8072] * code/branches/mac_osx/src/external/ois/mac/MacKeyboard.cpp (modified) Removed some debugging stuff. Kevin, I hope this is OK? Mon, 14 Mar 2011 02:53:38 GMT rgrieder [8071] * code/branches/kicklib (modified) * code/branches/kicklib/CMakeLists.txt (modified) * code/branches/kicklib/cmake/CompilerConfigGCC.cmake (modified) * code/branches/kicklib/cmake/CompilerConfigMSVC.cmake (modified) * code/branches/kicklib/cmake/LibraryConfig.cmake (modified) * code/branches/kicklib/cmake/LibraryConfigApple.cmake (deleted) * code/branches/kicklib/cmake/LibraryConfigOSX.cmake (copied) * code/branches/kicklib/cmake/PackageConfig.cmake (modified) * code/branches/kicklib/cmake/PackageConfigMSVC.cmake (modified) * code/branches/kicklib/cmake/PackageConfigMinGW.cmake (modified) * code/branches/kicklib/cmake/PackageConfigOSX.cmake (copied) * code/branches/kicklib/cmake/tools/CheckOGREPlugins.cmake (modified) * code/branches/kicklib/cmake/tools/CheckPackageVersion.cmake (copied) * code/branches/kicklib/cmake/tools/FindALUT.cmake (modified) * code/branches/kicklib/cmake/tools/GenerateToluaBindings.cmake (modified) * code/branches/kicklib/cmake/tools/TargetUtilities.cmake (modified) * code/branches/kicklib/data/gui/scripts/AudioMenu.lua (modified) * code/branches/kicklib/src/CMakeLists.txt (modified) * code/branches/kicklib/src/OrxonoxConfig.cmake (modified) * code/branches/kicklib/src/OrxonoxConfig.h.in (modified) * code/branches/kicklib/src/SpecialConfig.h.in (modified) * code/branches/kicklib/src/external/bullet/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.cpp (modified) * code/branches/kicklib/src/external/ogreceguirenderer/CMakeLists.txt (modified) * code/branches/kicklib/src/external/ois/CMakeLists.txt (modified) * code/branches/kicklib/src/external/ois/OIS.h (modified) * code/branches/kicklib/src/external/ois/OISConfig.h (modified) * code/branches/kicklib/src/external/ois/OISInputManager.cpp (modified) * code/branches/kicklib/src/external/ois/OISKeyboard.h (modified) * code/branches/kicklib/src/external/ois/OISMultiTouch.h (copied) * code/branches/kicklib/src/external/ois/OISPrereqs.h (modified) * code/branches/kicklib/src/external/ois/ReadMe.txt (modified) * code/branches/kicklib/src/external/ois/VERSION (modified) * code/branches/kicklib/src/external/ois/changes_orxonox.diff (modified) * code/branches/kicklib/src/external/ois/linux/LinuxInputManager.cpp (modified) * code/branches/kicklib/src/external/ois/linux/LinuxInputManager.h (modified) * code/branches/kicklib/src/external/ois/linux/LinuxJoyStickEvents.cpp (modified) * code/branches/kicklib/src/external/ois/linux/LinuxKeyboard.cpp (modified) * code/branches/kicklib/src/external/ois/linux/LinuxKeyboard.h (modified) * code/branches/kicklib/src/external/ois/linux/LinuxMouse.cpp (modified) * code/branches/kicklib/src/external/ois/linux/LinuxPrereqs.h (modified) * code/branches/kicklib/src/external/ois/mac/CMakeLists.txt (modified) * code/branches/kicklib/src/external/ois/mac/MacHIDManager.cpp (modified) * code/branches/kicklib/src/external/ois/mac/MacHIDManager.h (modified) * code/branches/kicklib/src/external/ois/mac/MacInputManager.cpp (modified) * code/branches/kicklib/src/external/ois/mac/MacJoyStick.cpp (copied) * code/branches/kicklib/src/external/ois/mac/MacJoyStick.h (copied) * code/branches/kicklib/src/external/ois/mac/MacKeyboard.cpp (modified) * code/branches/kicklib/src/external/ois/win32/Win32ForceFeedback.cpp (modified) * code/branches/kicklib/src/external/ois/win32/Win32ForceFeedback.h (modified) * code/branches/kicklib/src/external/ois/win32/Win32InputManager.cpp (modified) * code/branches/kicklib/src/external/ois/win32/Win32InputManager.h (modified) * code/branches/kicklib/src/external/ois/win32/Win32JoyStick.cpp (modified) * code/branches/kicklib/src/external/ois/win32/Win32JoyStick.h (modified) * code/branches/kicklib/src/external/ois/win32/Win32KeyBoard.cpp (modified) * code/branches/kicklib/src/external/ois/win32/Win32KeyBoard.h (modified) * code/branches/kicklib/src/external/ois/win32/Win32Mouse.cpp (modified) * code/branches/kicklib/src/external/ois/win32/Win32Mouse.h (modified) * code/branches/kicklib/src/external/ois/win32/Win32Prereqs.h (modified) * code/branches/kicklib/src/external/openal (copied) * code/branches/kicklib/src/external/openal/MacOSX_OALExtensions.h (copied) * code/branches/kicklib/src/external/openal/README (copied) * code/branches/kicklib/src/external/openal/al.h (copied) * code/branches/kicklib/src/external/openal/alc.h (copied) * code/branches/kicklib/src/libraries/core/Core.cc (modified) * code/branches/kicklib/src/libraries/core/CorePrereqs.h (modified) * code/branches/kicklib/src/libraries/core/DynLib.cc (modified) * code/branches/kicklib/src/libraries/core/DynLib.h (modified) * code/branches/kicklib/src/libraries/core/GUIManager.cc (modified) * code/branches/kicklib/src/libraries/core/GraphicsManager.cc (modified) * code/branches/kicklib/src/libraries/core/Identifier.h (modified) * code/branches/kicklib/src/libraries/core/OrxonoxClass.h (modified) * code/branches/kicklib/src/libraries/core/PathConfig.cc (modified) * code/branches/kicklib/src/libraries/core/Super.h (modified) * code/branches/kicklib/src/libraries/core/command/Functor.h (modified) * code/branches/kicklib/src/libraries/core/input/InputDevice.h (modified) * code/branches/kicklib/src/libraries/core/input/InputState.h (modified) * code/branches/kicklib/src/libraries/network/LANDiscoverable.cc (modified) * code/branches/kicklib/src/libraries/network/NetworkPrereqs.h (modified) * code/branches/kicklib/src/libraries/tools/BulletConversions.h (modified) * code/branches/kicklib/src/libraries/tools/ToolsPrereqs.h (modified) * code/branches/kicklib/src/libraries/util/Convert.h (modified) * code/branches/kicklib/src/libraries/util/MathConvert.h (modified) * code/branches/kicklib/src/libraries/util/SharedPtr.h (modified) * code/branches/kicklib/src/libraries/util/SignalHandler.h (modified) * code/branches/kicklib/src/libraries/util/UtilPrereqs.h (modified) * code/branches/kicklib/src/modules/designtools/DesignToolsPrereqs.h (modified) * code/branches/kicklib/src/modules/notifications/NotificationsPrereqs.h (modified) * code/branches/kicklib/src/modules/objects/ObjectsPrereqs.h (modified) * code/branches/kicklib/src/modules/overlays/OverlaysPrereqs.h (modified) * code/branches/kicklib/src/modules/pickup/PickupPrereqs.h (modified) * code/branches/kicklib/src/modules/pong/PongPrereqs.h (modified) * code/branches/kicklib/src/modules/questsystem/QuestEffect.cc (modified) * code/branches/kicklib/src/modules/questsystem/QuestEffectBeacon.cc (modified) * code/branches/kicklib/src/modules/questsystem/QuestsystemPrereqs.h (modified) * code/branches/kicklib/src/modules/questsystem/effects/AddReward.cc (modified) * code/branches/kicklib/src/modules/weapons/WeaponsPrereqs.h (modified) * code/branches/kicklib/src/orxonox/MoodManager.cc (modified) * code/branches/kicklib/src/orxonox/OrxonoxPrereqs.h (modified) * code/branches/kicklib/src/orxonox/sound/AmbientSound.cc (modified) * code/branches/kicklib/src/orxonox/sound/BaseSound.cc (modified) * code/branches/kicklib/src/orxonox/sound/SoundBuffer.cc (modified) * code/branches/kicklib/src/orxonox/sound/SoundManager.cc (modified) * code/branches/kicklib/src/orxonox/sound/SoundStreamer.cc (modified) * code/branches/kicklib/src/orxonox/sound/WorldSound.cc (modified) Merged ois_update branch (before it was renamed to mac_osx) into ... Sun, 13 Mar 2011 22:30:29 GMT rgrieder [8070] * code/branches/mac_osx/cmake/PackageConfigMSVC.cmake (modified) * code/branches/mac_osx/cmake/PackageConfigMinGW.cmake (modified) * code/branches/mac_osx/src/external/ois/CMakeLists.txt (modified) * code/branches/mac_osx/src/external/ois/changes_orxonox.diff (modified) * code/branches/mac_osx/src/external/ois/win32/Win32JoyStick.cpp (modified) Fixed OIS v1.3 build for MinGW 3.4 and hopefully also for the new ... Sun, 13 Mar 2011 21:05:11 GMT rgrieder [8069] * code/branches/mac_osx/src/external/ois/win32/Win32JoyStick.cpp (modified) MinGW quick fix for OIS (doesn't yet work though). Sun, 13 Mar 2011 14:54:54 GMT landauf [8068] * code/branches/kicklib/cmake/PackageConfigMinGW.cmake (modified) * code/branches/kicklib/cmake/tools/FindOgg.cmake (modified) * code/branches/kicklib/cmake/tools/FindPOCO.cmake (modified) * code/branches/kicklib/cmake/tools/FindVorbis.cmake (modified) adjusted a few library names and search paths for mingw dependencies Sat, 12 Mar 2011 23:00:38 GMT landauf [8067] * code/branches/kicklib/src/libraries/core/GUIManager.cc (modified) fixed warning Sat, 12 Mar 2011 22:54:35 GMT landauf [8066] * code/branches/kicklib/cmake/LibraryConfig.cmake (modified) * code/branches/kicklib/src/libraries/core/CorePrereqs.h (modified) * code/branches/kicklib/src/libraries/core/GraphicsManager.cc (modified) * code/branches/kicklib/src/libraries/core/PathConfig.cc (modified) * code/branches/kicklib/src/libraries/core/command/ArgumentCompletionFunctions.cc (modified) added support for boost 1.46 and adjusted code to work with the 3rd ... Sat, 12 Mar 2011 22:08:06 GMT rgrieder [8065] * code/branches/mac_osx/src/external/ois/CMakeLists.txt (modified) Build fix for MSVC 8. Sat, 12 Mar 2011 20:29:26 GMT rgrieder [8064] * code/branches/kicklib/cmake/PackageConfig.cmake (modified) Also find POCO for MinGW (required for Ogre). Sat, 12 Mar 2011 20:08:34 GMT rgrieder [8063] * code/branches/kicklib/cmake/PackageConfig.cmake (modified) Disallow dependency packages, that don't work anymore. Sat, 12 Mar 2011 19:50:33 GMT rgrieder [8062] * code/branches/kicklib/cmake/PackageConfig.cmake (modified) Package version 6.0 is now also allowed with MinGW. Sat, 12 Mar 2011 19:31:51 GMT rgrieder [8061] * code/branches/kicklib/cmake/tools/FindCEGUI.cmake (modified) * code/branches/kicklib/src/CMakeLists.txt (modified) Sorted out tolua++ inclusion for newer CEGUI versions. Sat, 12 Mar 2011 04:43:12 GMT rgrieder [8060] * code/branches/mac_osx/src/external/ois/linux/LinuxKeyboard.cpp (modified) * code/branches/mac_osx/src/external/ois/mac/MacKeyboard.cpp (modified) Reverted some changes to OIS v1.3. @Kevin: hope this is OK for you. Sat, 12 Mar 2011 04:17:19 GMT rgrieder [8059] * code/branches/mac_osx/src/external/openal (deleted) OpenAL headers are no more required in the source tree. Fri, 11 Mar 2011 02:33:35 GMT rgrieder [8058] * code/branches/kicklib/src/libraries/core/Game.cc (modified) * code/branches/kicklib/src/libraries/core/PathConfig.cc (modified) * code/branches/kicklib/src/libraries/core/input/InputManager.cc (modified) VS 2010 doesn't like std::make_pair with C-strings if the result ... Fri, 11 Mar 2011 02:26:56 GMT rgrieder [8057] * code/branches/kicklib/cmake/CompilerConfigMSVC.cmake (modified) * code/branches/kicklib/cmake/LibraryConfig.cmake (modified) * code/branches/kicklib/cmake/PackageConfigMSVC.cmake (modified) * code/branches/kicklib/cmake/tools/TargetUtilities.cmake (modified) * code/branches/kicklib/src/CMakeLists.txt (modified) * code/branches/kicklib/src/orxonox-main.vcxproj.user.in (added) Added some extra wursts for Visual Studio 2010 to the build system. Thu, 10 Mar 2011 16:52:31 GMT rgrieder [8056] * code/branches/mac_osx/cmake/PackageConfigOSX.cmake (modified) * code/branches/mac_osx/cmake/tools/FindALUT.cmake (modified) * code/branches/mac_osx/src/orxonox/sound/BaseSound.cc (modified) * code/branches/mac_osx/src/orxonox/sound/SoundBuffer.cc (modified) * code/branches/mac_osx/src/orxonox/sound/SoundManager.cc (modified) * code/branches/mac_osx/src/orxonox/sound/SoundStreamer.cc (modified) * code/branches/mac_osx/src/orxonox/sound/WorldSound.cc (modified) Fiddled around with ALUT and OpenAL headers. The hack in ... Thu, 10 Mar 2011 15:45:00 GMT rgrieder [8055] * code/branches/mac_osx/src/OrxonoxConfig.cmake (modified) Fix! Thu, 10 Mar 2011 15:32:38 GMT rgrieder [8054] * code/branches/mac_osx/src/OrxonoxConfig.cmake (modified) Hopefully this fixed the OS X build. Thu, 10 Mar 2011 15:09:56 GMT smerkli [8053] * code/branches/masterserver2/src/libraries/network/WANDiscoverable.cc (modified) Did not actually do any work, just looked through some of the code. Wed, 09 Mar 2011 10:29:08 GMT dafrick [8052] * code/branches/tutorial2 (deleted) Deleting obsolete tutorial branch. Wed, 09 Mar 2011 10:27:05 GMT dafrick [8051] * code/branches/tutorial (modified) * code/branches/tutorial/data/defaultConfig/keybindings.ini (modified) * code/branches/tutorial/data/gui/layouts/GraphicsMenu.layout (modified) * code/branches/tutorial/data/gui/scripts/GUISheet.lua (modified) * code/branches/tutorial/data/gui/scripts/GraphicsMenu.lua (modified) * code/branches/tutorial/data/gui/scripts/HostMenu.lua (modified) * code/branches/tutorial/data/gui/scripts/KeyBindMenu.lua (modified) * code/branches/tutorial/data/gui/scripts/MenuSheet.lua (modified) * code/branches/tutorial/data/gui/scripts/MiscConfigMenu.lua (modified) * code/branches/tutorial/data/gui/scripts/SheetManager.lua (modified) * code/branches/tutorial/data/gui/scripts/SingleplayerMenu.lua (modified) * code/branches/tutorial/data/levels/presentation09.oxw (modified) * code/branches/tutorial/data/levels/presentationFS102.oxw (modified) * code/branches/tutorial/data/levels/presentationFS10Ed.oxw (modified) * code/branches/tutorial/data/levels/presentationHS09.oxw (modified) * code/branches/tutorial/data/levels/presentationHS09b.oxw (modified) * code/branches/tutorial/data/overlays/debug.oxo (modified) * code/branches/tutorial/src/libraries/core/CMakeLists.txt (modified) * code/branches/tutorial/src/libraries/core/Core.cc (modified) * code/branches/tutorial/src/libraries/core/Core.h (modified) * code/branches/tutorial/src/libraries/core/GUIManager.cc (modified) * code/branches/tutorial/src/libraries/core/GUIManager.h (modified) * code/branches/tutorial/src/libraries/core/Game.cc (modified) * code/branches/tutorial/src/libraries/core/GraphicsManager.cc (modified) * code/branches/tutorial/src/libraries/core/GraphicsManager.h (modified) * code/branches/tutorial/src/libraries/core/command/CommandEvaluation.h (modified) * code/branches/tutorial/src/libraries/core/command/ConsoleCommandCompilation.cc (modified) * code/branches/tutorial/src/libraries/core/command/Shell.cc (modified) * code/branches/tutorial/src/libraries/core/command/TclBind.cc (modified) * code/branches/tutorial/src/libraries/core/command/TclBind.h (modified) * code/branches/tutorial/src/libraries/core/command/TclThreadManager.cc (modified) * code/branches/tutorial/src/libraries/core/input/InputManager.cc (modified) * code/branches/tutorial/src/libraries/core/input/InputManager.h (modified) * code/branches/tutorial/src/libraries/core/input/Keyboard.cc (modified) * code/branches/tutorial/src/libraries/core/input/Keyboard.h (modified) * code/branches/tutorial/src/libraries/network/Host.cc (modified) * code/branches/tutorial/src/libraries/tools/Shader.h (modified) * code/branches/tutorial/src/libraries/tools/Timer.cc (modified) * code/branches/tutorial/src/libraries/tools/Timer.h (modified) * code/branches/tutorial/src/libraries/tools/ToolsPrereqs.h (modified) * code/branches/tutorial/src/orxonox/ChatInputHandler.cc (modified) * code/branches/tutorial/src/orxonox/ChatInputHandler.h (modified) * code/branches/tutorial/src/orxonox/LevelInfo.h (modified) * code/branches/tutorial/src/orxonox/LevelManager.cc (modified) * code/branches/tutorial/src/orxonox/LevelManager.h (modified) * code/branches/tutorial/src/orxonox/gamestates/GSLevel.cc (modified) * code/branches/tutorial/src/orxonox/gamestates/GSMainMenu.cc (modified) * code/branches/tutorial/src/orxonox/gamestates/GSRoot.cc (modified) * code/branches/tutorial/src/orxonox/gamestates/GSRoot.h (modified) * code/branches/tutorial/src/orxonox/gametypes/Gametype.cc (modified) * code/branches/tutorial/src/orxonox/graphics/Model.cc (modified) * code/branches/tutorial/src/orxonox/overlays/InGameConsole.cc (modified) Merging latest changes in usability branch into tutorial branch. Wed, 09 Mar 2011 10:18:06 GMT dafrick [8050] * code/branches/tutorial/src/orxonox/controllers/AutonomousDroneController.cc (modified) * code/branches/tutorial/src/orxonox/worldentities/AutonomousDrone.cc (modified) Adding some documentation. Tue, 08 Mar 2011 22:07:35 GMT rgrieder [8049] * code/branches/mac_osx/src/external/ois/CMakeLists.txt (modified) * code/branches/mac_osx/src/external/ois/mac/CMakeLists.txt (modified) Test failed: OIS compilation just doesn't work on OS X. Tue, 08 Mar 2011 21:29:42 GMT rgrieder [8048] * code/branches/mac_osx/cmake/LibraryConfig.cmake (modified) * code/branches/mac_osx/cmake/LibraryConfigOSX.cmake (deleted) Removed obsolete file. Tue, 08 Mar 2011 21:24:36 GMT rgrieder [8047] * code/branches/mac_osx/src/external/ois/CMakeLists.txt (modified) * code/branches/mac_osx/src/external/ois/mac/CMakeLists.txt (modified) Using compilations again for OIS for testing purposes. Tue, 08 Mar 2011 21:19:27 GMT rgrieder [8046] * code/branches/mac_osx/src/OrxonoxConfig.cmake (modified) Buildfix.. Tue, 08 Mar 2011 05:27:31 GMT rgrieder [8045] * code/branches/mac_osx/src/OrxonoxConfig.cmake (modified) * code/branches/mac_osx/src/OrxonoxConfig.h.in (modified) Simplified a workaround. Tue, 08 Mar 2011 05:27:07 GMT rgrieder [8044] * code/branches/mac_osx/cmake/CompilerConfigGCC.cmake (modified) No -fpic on MinGW 64 bit. Tue, 08 Mar 2011 05:26:51 GMT rgrieder [8043] * code/branches/mac_osx/src/external/bullet/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.cpp (modified) * code/branches/mac_osx/src/libraries/core/DynLib.h (modified) * code/branches/mac_osx/src/libraries/core/GUIManager.cc (modified) * code/branches/mac_osx/src/libraries/core/GraphicsManager.cc (modified) * code/branches/mac_osx/src/libraries/core/PathConfig.cc (modified) * code/branches/mac_osx/src/orxonox/MoodManager.cc (modified) * code/branches/mac_osx/src/orxonox/sound/SoundManager.cc (modified) Removed unnecessary changes in mac_osx branch. Mon, 07 Mar 2011 18:15:02 GMT rgrieder [8042] * code/branches/mac_osx/src/libraries/core/GUIManager.cc (modified) There is no non exclusive/grab mode for the mouse on Mac OS X --> ... Mon, 07 Mar 2011 08:58:46 GMT dafrick [8041] * code/branches/usability/data/gui/scripts/HostMenu.lua (modified) Small detaiil... Mon, 07 Mar 2011 08:57:13 GMT dafrick [8040] * code/branches/usability/data/gui/scripts/HostMenu.lua (modified) * code/branches/usability/data/gui/scripts/MiscConfigMenu.lua (modified) * code/branches/usability/data/gui/scripts/SingleplayerMenu.lua (modified) * code/branches/usability/src/libraries/core/Core.cc (modified) * code/branches/usability/src/libraries/core/Core.h (modified) * code/branches/usability/src/libraries/core/GUIManager.h (modified) * code/branches/usability/src/orxonox/gametypes/Gametype.cc (modified) Developer's mode. Is a ConfigValue, by default on except in release ... Sun, 06 Mar 2011 23:08:27 GMT dafrick [8039] * code/branches/usability/data/levels/presentationFS102.oxw (modified) * code/branches/usability/data/levels/presentationFS10Ed.oxw (modified) * code/branches/usability/src/orxonox/LevelManager.cc (modified) Adding warning for levels with same names. Sun, 06 Mar 2011 22:31:09 GMT dafrick [8038] * code/branches/usability/data/levels/presentation09.oxw (modified) * code/branches/usability/data/levels/presentationHS09.oxw (modified) * code/branches/usability/data/levels/presentationHS09b.oxw (modified) Just because they can have the same name, doesn't mean they have to. Sun, 06 Mar 2011 22:26:12 GMT dafrick [8037] * code/branches/usability/src/orxonox/LevelInfo.h (modified) * code/branches/usability/src/orxonox/LevelManager.h (modified) Making LevelInfoCompare a strictly weak ordering (compared to just a ... Sun, 06 Mar 2011 18:12:11 GMT landauf [8036] * code/branches/usability/src/libraries/core/input/InputBuffer.cc (modified) * code/branches/usability/src/libraries/core/input/InputBuffer.h (modified) * code/branches/usability/src/libraries/core/input/Keyboard.cc (modified) * code/branches/usability/src/libraries/core/input/Keyboard.h (modified) moved keycode translator from InputBuffer to Keyboard, now it works ... Sun, 06 Mar 2011 15:32:05 GMT dafrick [8035] * code/branches/usability/data/defaultConfig/keybindings.ini (modified) * code/branches/usability/data/gui/scripts/GUISheet.lua (modified) * code/branches/usability/data/gui/scripts/GraphicsMenu.lua (modified) * code/branches/usability/data/gui/scripts/MenuSheet.lua (modified) * code/branches/usability/data/gui/scripts/SheetManager.lua (modified) * code/branches/usability/src/libraries/core/GUIManager.cc (modified) * code/branches/usability/src/libraries/core/GUIManager.h (modified) * code/branches/usability/src/orxonox/gamestates/GSMainMenu.cc (modified) * code/branches/usability/src/orxonox/overlays/InGameConsole.cc (modified) Replacing hard coded keys for the menu navigation with keys specified ... Sun, 06 Mar 2011 14:29:16 GMT landauf [8034] * code/branches/usability/data/gui/layouts/GraphicsMenu.layout (modified) * code/branches/usability/data/gui/scripts/GraphicsMenu.lua (modified) * code/branches/usability/src/orxonox/graphics/Model.cc (modified) renamed enableModelLoD config value as enableMeshLoD (also renamed it ... Sun, 06 Mar 2011 13:30:24 GMT dafrick [8033] * code/branches/usability/data/gui/scripts/SheetManager.lua (modified) * code/branches/usability/src/libraries/core/GUIManager.cc (modified) * code/branches/usability/src/libraries/core/GUIManager.h (modified) Adding toggleGUI functionality, not yet used, though. Toggling of ... Sun, 06 Mar 2011 13:23:39 GMT landauf [8032] * code/branches/usability/data/defaultConfig/keybindings.ini (modified) * code/branches/usability/data/gui/scripts/KeyBindMenu.lua (modified) * code/branches/usability/data/gui/scripts/SheetManager.lua (modified) * code/branches/usability/src/libraries/core/Game.cc (modified) * code/branches/usability/src/libraries/network/Host.cc (modified) * code/branches/usability/src/orxonox/overlays/InGameConsole.cc (modified) - removed console command shortcuts for InGameConsole openConsole and ... Sun, 06 Mar 2011 13:02:18 GMT landauf [8031] * code/branches/usability/src/libraries/core/GraphicsManager.cc (modified) added workaround for systems (linux?) where there's no color depth ... Sun, 06 Mar 2011 12:42:26 GMT landauf [8030] * code/branches/usability/src/libraries/core/command/CommandEvaluation.h (modified) * code/branches/usability/src/libraries/core/command/ConsoleCommandCompilation.cc (modified) * code/branches/usability/src/libraries/core/command/Shell.cc (modified) * code/branches/usability/src/libraries/core/command/TclBind.cc (modified) * code/branches/usability/src/libraries/core/command/TclBind.h (modified) * code/branches/usability/src/libraries/core/command/TclThreadManager.cc (modified) - TclBind: consistent definitions of query and execute binds - ... Sun, 06 Mar 2011 12:38:49 GMT dafrick [8029] * code/branches/usability/src/orxonox/gamestates/GSLevel.cc (modified) * code/branches/usability/src/orxonox/gamestates/GSRoot.cc (modified) * code/branches/usability/src/orxonox/gamestates/GSRoot.h (modified) Introducing delayed starting of mainMenu if the loading of a level ... Sun, 06 Mar 2011 00:19:46 GMT landauf [8028] * code/branches/usability/data/gui/scripts/GUISheet.lua (modified) numpad enter now also works for keyboard menu navigation Sun, 06 Mar 2011 00:16:56 GMT landauf [8027] * code/branches/usability/src/libraries/core/input/InputBuffer.cc (modified) * code/branches/usability/src/libraries/core/input/InputBuffer.h (modified) added translator map to InputBuffer for numpad keys - now they can ... Sat, 05 Mar 2011 22:56:20 GMT landauf [8026] * code/branches/usability/data/gui/scripts/GraphicsMenu.lua (modified) don't show the ogre config dialog again if the new resolution was ... Sat, 05 Mar 2011 22:31:20 GMT rgrieder [8025] * code/branches/usability/src/libraries/tools/Shader.h (modified) * code/branches/usability/src/orxonox/ChatInputHandler.cc (modified) * code/branches/usability/src/orxonox/ChatInputHandler.h (modified) Fixed some includes. Sat, 05 Mar 2011 22:19:06 GMT landauf [8024] * code/branches/usability/data/gui/scripts/GraphicsMenu.lua (modified) store the selected resolution to display it correctly again after ... Sat, 05 Mar 2011 22:07:39 GMT landauf [8023] * code/branches/usability/data/gui/scripts/GraphicsMenu.lua (modified) * code/branches/usability/data/gui/scripts/SheetManager.lua (modified) * code/branches/usability/src/libraries/core/input/InputManager.cc (modified) * code/branches/usability/src/libraries/core/input/InputManager.h (modified) update exclusive mouse mode and cursor visibility when changing ... Sat, 05 Mar 2011 19:39:21 GMT landauf [8022] * code/branches/usability/data/gui/scripts/GraphicsMenu.lua (modified) * code/branches/usability/src/libraries/tools/Timer.cc (modified) * code/branches/usability/src/libraries/tools/Timer.h (modified) * code/branches/usability/src/libraries/tools/ToolsPrereqs.h (modified) added RealTimer, a subclass of Timer which is not affected by the ... Sat, 05 Mar 2011 18:10:31 GMT landauf [8021] * code/branches/usability/data/gui/scripts/GraphicsMenu.lua (modified) if the resolution is changed in the graphics menu, a decision popup ... Sat, 05 Mar 2011 17:30:06 GMT landauf [8020] * code/branches/usability/src/libraries/tools/Timer.cc (modified) * code/branches/usability/src/libraries/tools/Timer.h (modified) delayed commands now return a handle which allows to kill them ... Sat, 05 Mar 2011 16:59:17 GMT landauf [8019] * code/branches/usability/data/gui/layouts/GraphicsMenu.layout (modified) * code/branches/usability/data/gui/scripts/GraphicsMenu.lua (modified) two changes in graphics menu: - fsaa and vsync are only updated if ... Sat, 05 Mar 2011 16:31:27 GMT landauf [8018] * code/branches/usability/data/gui/layouts/GraphicsMenu.layout (modified) * code/branches/usability/data/gui/scripts/GUISheet.lua (modified) * code/branches/usability/data/gui/scripts/GraphicsMenu.lua (modified) * code/branches/usability/data/gui/scripts/SheetManager.lua (modified) * code/branches/usability/data/overlays/debug.oxo (modified) * code/branches/usability/src/libraries/core/CMakeLists.txt (modified) * code/branches/usability/src/libraries/core/GraphicsManager.cc (modified) * code/branches/usability/src/libraries/core/GraphicsManager.h (modified) added new graphics menu Fri, 04 Mar 2011 10:33:18 GMT scheusso [8017] * code/branches/masterserver (deleted) removing old masterserver branch Fri, 04 Mar 2011 10:32:51 GMT scheusso [8016] * code/branches/masterserver2 (copied) creating new masterserver2 branch Thu, 03 Mar 2011 15:33:13 GMT rgrieder [8015] * code/branches/tutorial (modified) * code/branches/tutorial/data/gui/scripts/SheetManager.lua (modified) * code/branches/tutorial/src/orxonox/overlays/InGameConsole.cc (modified) Fixed bug occurred during bugfix (new bug is worse) by merging r8013 ... Thu, 03 Mar 2011 15:26:30 GMT dafrick [8014] * code/branches/tutorial/data/levels/tutorial.oxw (modified) * code/branches/tutorial/src/orxonox/controllers/AutonomousDroneController.cc (modified) * code/branches/tutorial/src/orxonox/controllers/CMakeLists.txt (modified) * code/branches/tutorial/src/orxonox/worldentities/AutonomousDrone.cc (modified) * code/branches/tutorial/src/orxonox/worldentities/AutonomousDrone.h (modified) * code/branches/tutorial/src/orxonox/worldentities/CMakeLists.txt (modified) Removing all the solution stuff. Thu, 03 Mar 2011 15:24:37 GMT rgrieder [8013] * code/branches/usability/data/gui/scripts/SheetManager.lua (modified) * code/branches/usability/src/orxonox/overlays/InGameConsole.cc (modified) Fixed bug occurred during bugfix (new bug is worse) by reverse ... Thu, 03 Mar 2011 15:18:34 GMT dafrick [8012] * code/branches/tutorial/data/levels/tutorial.oxw (modified) * code/branches/tutorial/src/orxonox/controllers/AutonomousDroneController.cc (modified) * code/branches/tutorial/src/orxonox/controllers/CMakeLists.txt (modified) * code/branches/tutorial/src/orxonox/worldentities/AutonomousDrone.cc (modified) * code/branches/tutorial/src/orxonox/worldentities/AutonomousDrone.h (modified) * code/branches/tutorial/src/orxonox/worldentities/CMakeLists.txt (modified) Committing muster-lösung. Thu, 03 Mar 2011 14:16:55 GMT dafrick [8011] * code/branches/tutorial/data/levels/tutorial.oxw (modified) * code/branches/tutorial/src/orxonox/controllers/AutonomousDroneController.cc (added) * code/branches/tutorial/src/orxonox/controllers/AutonomousDroneController.h (added) * code/branches/tutorial/src/orxonox/worldentities/AutonomousDrone.cc (added) * code/branches/tutorial/src/orxonox/worldentities/AutonomousDrone.h (added) Adding tutorial stuff to (coding-)tutorial level. Thu, 03 Mar 2011 13:47:44 GMT dafrick [8010] * code/branches/tutorial (copied) Creating new tutorial branch based on the usability branch. Thu, 03 Mar 2011 01:30:41 GMT rgrieder [8008] * code/branches/usability/src/libraries/core/GraphicsManager.cc (modified) InputManager should reload devices when the render device changes ... Tue, 01 Mar 2011 04:22:14 GMT rgrieder [8007] * code/branches/sound6 (modified) * code/branches/sound6/src/orxonox/MoodManager.h (modified) * code/branches/sound6/src/orxonox/sound/AmbientSound.cc (modified) * code/branches/sound6/src/orxonox/sound/AmbientSound.h (modified) * code/branches/sound6/src/orxonox/sound/BaseSound.cc (modified) * code/branches/sound6/src/orxonox/sound/BaseSound.h (modified) * code/branches/sound6/src/orxonox/sound/SoundBuffer.h (modified) * code/branches/sound6/src/orxonox/sound/SoundManager.cc (modified) * code/branches/sound6/src/orxonox/sound/SoundManager.h (modified) * code/branches/sound6/src/orxonox/sound/SoundPrereqs.h (copied) * code/branches/sound6/src/orxonox/sound/SoundStreamer.cc (modified) * code/branches/sound6/src/orxonox/sound/SoundStreamer.h (modified) * code/branches/sound6/src/orxonox/sound/WorldSound.h (modified) * code/branches/sound6/src/orxonox/weaponsystem/WeaponMode.cc (modified) * code/branches/sound6/src/orxonox/weaponsystem/WeaponMode.h (modified) Merged sound5 into sound6 branch. Tue, 01 Mar 2011 04:16:52 GMT rgrieder [8006] * code/branches/usability (modified) * code/branches/usability/src/orxonox/MoodManager.h (modified) * code/branches/usability/src/orxonox/sound/AmbientSound.cc (modified) * code/branches/usability/src/orxonox/sound/AmbientSound.h (modified) * code/branches/usability/src/orxonox/sound/BaseSound.cc (modified) * code/branches/usability/src/orxonox/sound/BaseSound.h (modified) * code/branches/usability/src/orxonox/sound/SoundBuffer.h (modified) * code/branches/usability/src/orxonox/sound/SoundManager.cc (modified) * code/branches/usability/src/orxonox/sound/SoundManager.h (modified) * code/branches/usability/src/orxonox/sound/SoundPrereqs.h (deleted) * code/branches/usability/src/orxonox/sound/SoundStreamer.cc (modified) * code/branches/usability/src/orxonox/sound/SoundStreamer.h (modified) * code/branches/usability/src/orxonox/sound/WorldSound.h (modified) * code/branches/usability/src/orxonox/weaponsystem/WeaponMode.cc (modified) * code/branches/usability/src/orxonox/weaponsystem/WeaponMode.h (modified) Reverted last commit (forgot to tick "Switch working copy to new ...