# # ChangeLog for code # # Generated by Trac 1.0.9 # Jun 2, 2024, 4:15:09 AM Wed, 04 Nov 2009 12:59:39 GMT scheusso [6023] * code/branches/ingamemenu/data/gui/scripts/InitialiseGUI.lua (modified) * code/branches/ingamemenu/src/libraries/core/GUIManager.cc (modified) * code/branches/ingamemenu/src/libraries/core/GUIManager.h (modified) * code/branches/ingamemenu/src/libraries/core/LuaState.cc (modified) * code/branches/ingamemenu/src/orxonox/gamestates/GSMainMenu.cc (modified) clean cursor handling in GUIManager/lua code change in output level ... Wed, 04 Nov 2009 11:51:05 GMT dafrick [6022] * code/branches/ingamemenu/data/gui/scripts/MainMenu.lua (modified) Adujusted MainMenu to properly work with the changed InitialiseGUI ... Wed, 04 Nov 2009 11:28:59 GMT rgrieder [6021] * code/trunk/src/libraries/core/CMakeLists.txt (modified) * code/trunk/src/libraries/core/CommandLine.cc (deleted) * code/trunk/src/libraries/core/CommandLine.h (deleted) * code/trunk/src/libraries/core/CommandLineParser.cc (copied) * code/trunk/src/libraries/core/CommandLineParser.h (copied) * code/trunk/src/libraries/core/Core.cc (modified) * code/trunk/src/libraries/core/CorePrereqs.h (modified) * code/trunk/src/libraries/core/Game.cc (modified) * code/trunk/src/libraries/core/PathConfig.cc (modified) * code/trunk/src/libraries/core/input/InputManager.cc (modified) * code/trunk/src/orxonox/LevelManager.cc (modified) * code/trunk/src/orxonox/Main.cc (modified) * code/trunk/src/orxonox/gamestates/GSClient.cc (modified) * code/trunk/src/orxonox/gamestates/GSDedicated.cc (modified) * code/trunk/src/orxonox/gamestates/GSDedicatedClient.cc (modified) * code/trunk/src/orxonox/gamestates/GSServer.cc (modified) Renamed CommandLine to CommandLineParse to avoid confusions with the ... Tue, 03 Nov 2009 21:08:26 GMT scheusso [6020] * code/branches/ingamemenu/src/libraries/core/GUIManager.cc (modified) * code/branches/ingamemenu/src/libraries/core/GUIManager.h (modified) * code/branches/ingamemenu/src/orxonox/gamestates/GSMainMenu.cc (modified) fixed an issue with the OS/CEGUI mouse pointer Tue, 03 Nov 2009 10:53:47 GMT scheusso [6019] * code/branches/ingamemenu/data/gui/layouts/InGameMenu.layout (modified) * code/branches/ingamemenu/data/gui/scripts/InGameMenu.lua (modified) * code/branches/ingamemenu/src/libraries/core/CMakeLists.txt (modified) * code/branches/ingamemenu/src/libraries/core/Game.h (modified) Added return to Game button to InGameMenu MainMenu button now ... Mon, 02 Nov 2009 22:46:58 GMT scheusso [6018] * code/branches/ingamemenu/data/gui/layouts/InGameMenu.layout (added) * code/branches/ingamemenu/data/gui/scripts/InGameMenu.lua (added) first version of the InGameMenu (return to main menu doesn't include ... Mon, 02 Nov 2009 22:42:16 GMT rgrieder [6017] * code/branches/console/src/libraries/core/Shell.cc (modified) Fix in Shell: No string in outputLines_ should contain '\n'. Mon, 02 Nov 2009 17:06:25 GMT rgrieder [6016] * code/branches/console/src/orxonox/gamestates/GSDedicated.cc (modified) * code/branches/console/src/orxonox/gamestates/GSDedicated.h (modified) * code/branches/console/src/orxonox/gamestates/GSDedicatedClient.cc (modified) * code/branches/console/src/orxonox/gamestates/GSDedicatedClient.h (modified) Removed console from GSDedicated and GSDedicatedClient. Mon, 02 Nov 2009 16:54:13 GMT rgrieder [6015] * code/branches/console/src/libraries/core/Core.cc (modified) * code/branches/console/src/libraries/core/Core.h (modified) * code/branches/console/src/libraries/core/IOConsole.cc (modified) * code/branches/console/src/libraries/core/IOConsole.h (modified) * code/branches/console/src/libraries/util/OutputHandler.cc (modified) * code/branches/console/src/libraries/util/OutputHandler.h (modified) * code/branches/console/src/orxonox/overlays/InGameConsole.cc (modified) * code/branches/console/src/orxonox/overlays/InGameConsole.h (modified) IOConsole cleanup and added ConsoleWriter to the OutputHandler so ... Mon, 02 Nov 2009 12:57:19 GMT rgrieder [6014] * code/branches/console/src/libraries/core/IOConsole.cc (modified) * code/branches/console/src/libraries/core/IOConsole.h (modified) IOConsole: More line wrapping fixes Sun, 01 Nov 2009 14:57:56 GMT rgrieder [6013] * code/branches/console/src/libraries/core/IOConsole.cc (modified) * code/branches/console/src/libraries/core/IOConsole.h (modified) IOConsole: Resolved flickering problem and moved status line below ... Sun, 01 Nov 2009 09:08:22 GMT scheusso [6012] * code/branches/console/src/libraries/core/IOConsole.cc (modified) small build fix Sat, 31 Oct 2009 22:28:16 GMT rgrieder [6011] * code/branches/console/src/libraries/core/ConfigValueIncludes.h (modified) * code/branches/console/src/libraries/core/ConsoleCommandCompilation.cc (modified) Fixed funny looking ini-files and an annoying cout. Sat, 31 Oct 2009 22:13:52 GMT rgrieder [6010] * code/branches/console/src/libraries/core/IOConsole.cc (modified) * code/branches/console/src/libraries/core/IOConsole.h (modified) * code/branches/console/src/libraries/core/Shell.cc (modified) * code/branches/console/src/libraries/core/Shell.h (modified) * code/branches/console/src/libraries/core/input/InputPrereqs.h (modified) * code/branches/console/src/orxonox/overlays/InGameConsole.cc (modified) Sorted out some small stuff in the Shell and hopefully fixed ... Fri, 30 Oct 2009 22:25:26 GMT adrfried [6009] * code/branches/core5/src/libraries/util/SubString.cc (modified) fixed usage of size_t in printf Fri, 30 Oct 2009 22:14:33 GMT adrfried [6008] * code/branches/ggz2/src/orxonox/GGZClient.h (modified) include fixed Fri, 30 Oct 2009 16:26:28 GMT rgrieder [6007] * code/branches/console/src/libraries/core/IOConsole.cc (modified) * code/branches/console/src/libraries/core/IOConsole.h (modified) * code/branches/console/src/libraries/core/PathConfig.cc (modified) * code/branches/console/src/libraries/util/OutputHandler.cc (modified) Fixed IOConsole partly and fixed two problems in PathConfig and ... Fri, 30 Oct 2009 13:24:53 GMT scheusso [6006] * code/branches/console/src/libraries/core/IOConsole.cc (modified) that's probably more what you intended ... Fri, 30 Oct 2009 13:22:37 GMT scheusso [6005] * code/branches/console/src/libraries/core/IOConsole.cc (modified) gcc didn't like the old version ;) Fri, 30 Oct 2009 11:39:51 GMT rgrieder [6004] * code/branches/console/src/libraries/core/Core.cc (modified) * code/branches/console/src/libraries/core/Core.h (modified) * code/branches/console/src/libraries/core/IOConsole.cc (modified) * code/branches/console/src/libraries/core/IOConsole.h (modified) * code/branches/console/src/libraries/core/Shell.cc (modified) * code/branches/console/src/libraries/core/Shell.h (modified) * code/branches/console/src/libraries/util/OutputHandler.cc (modified) * code/branches/console/src/libraries/util/OutputHandler.h (modified) * code/branches/console/src/orxonox/overlays/InGameConsole.cc (modified) * code/branches/console/src/orxonox/overlays/InGameConsole.h (modified) De-singletonised Shell so that both consoles have their own Shell ... Wed, 28 Oct 2009 16:58:11 GMT dafrick [6003] * code/branches/ingamemenu/data/gui/layouts/MainMenu.layout (modified) * code/branches/ingamemenu/data/gui/layouts/QuestGUI.layout (modified) * code/branches/ingamemenu/data/gui/scripts/InitialiseGUI.lua (modified) * code/branches/ingamemenu/src/libraries/core/GUIManager.cc (modified) * code/branches/ingamemenu/src/libraries/core/GUIManager.h (modified) * code/branches/ingamemenu/src/modules/overlays/GUIOverlay.cc (modified) * code/branches/ingamemenu/src/orxonox/gamestates/GSGraphics.cc (modified) * code/branches/ingamemenu/src/orxonox/gamestates/GSGraphics.h (modified) * code/branches/ingamemenu/src/orxonox/gamestates/GSLevel.cc (modified) * code/branches/ingamemenu/src/orxonox/gamestates/GSMainMenu.cc (modified) * code/branches/ingamemenu/src/orxonox/pickup/PickupInventory.cc (modified) * code/branches/ingamemenu/src/orxonox/pickup/PickupSpawner.cc (modified) Implemented support for multiple simultaniously showing GUIs. What ... Wed, 28 Oct 2009 13:38:10 GMT wirthmi [6001] * code/branches/steering/src/orxonox/controllers/NewHumanController.cc (modified) * code/branches/steering/src/orxonox/controllers/NewHumanController.h (modified) * code/branches/steering/src/orxonox/overlays/OrxonoxOverlay.h (modified) Added a crosshair overlay. Wed, 28 Oct 2009 10:18:20 GMT rgrieder [6000] * code/branches/console/src/libraries/util/OutputHandler.cc (modified) Resolved a bug causing the static initialisation of the OutputHandler ... Wed, 28 Oct 2009 10:06:14 GMT scheusso [5999] * code/branches/ingamemenu (copied) creating new ingamemenu branch Wed, 28 Oct 2009 10:03:30 GMT rgrieder [5998] * code/branches/console/src/libraries/core/IOConsole.cc (modified) * code/branches/console/src/libraries/core/IOConsole.h (modified) Build fixes for IOConsole (can't test that on Windows...) Wed, 28 Oct 2009 10:03:23 GMT scheusso [5997] * code/tags/tutorialHS09 (moved) moving recent tutorial branch to tags Wed, 28 Oct 2009 09:47:25 GMT rgrieder [5996] * code/branches/console/src/libraries/util/OutputHandler.h (modified) Changed order of declaration/definition in OutputHandler. Wed, 28 Oct 2009 09:44:26 GMT rgrieder [5995] * code/branches/console/src/libraries/core/IOConsole.cc (modified) * code/branches/console/src/libraries/core/IOConsole.h (modified) Committing some unstable changes to the IOConsole for testing purposes. Tue, 27 Oct 2009 13:47:14 GMT rgrieder [5994] * code/branches/console/src/libraries/core/ConfigValueIncludes.h (modified) * code/branches/console/src/libraries/core/Core.cc (modified) * code/branches/console/src/libraries/core/Core.h (modified) * code/branches/console/src/libraries/core/GUIManager.cc (modified) * code/branches/console/src/libraries/core/GraphicsManager.cc (modified) * code/branches/console/src/libraries/core/IOConsole.cc (modified) * code/branches/console/src/libraries/core/LuaState.cc (modified) * code/branches/console/src/libraries/core/Shell.cc (modified) * code/branches/console/src/libraries/core/Shell.h (modified) * code/branches/console/src/libraries/util/CMakeLists.txt (modified) * code/branches/console/src/libraries/util/Debug.h (modified) * code/branches/console/src/libraries/util/OrxAssert.h (modified) * code/branches/console/src/libraries/util/OutputBuffer.cc (deleted) * code/branches/console/src/libraries/util/OutputBuffer.h (deleted) * code/branches/console/src/libraries/util/OutputHandler.cc (modified) * code/branches/console/src/libraries/util/OutputHandler.h (modified) * code/branches/console/src/libraries/util/UtilPrereqs.h (modified) Changed Output concept a little bit to allow for more general use. ... Mon, 26 Oct 2009 22:01:39 GMT scheusso [5993] * code/branches/steering/src/orxonox/controllers/Controller.h (modified) * code/branches/steering/src/orxonox/controllers/HumanController.cc (modified) * code/branches/steering/src/orxonox/controllers/HumanController.h (modified) * code/branches/steering/src/orxonox/controllers/NewHumanController.cc (modified) * code/branches/steering/src/orxonox/controllers/NewHumanController.h (modified) * code/branches/steering/src/orxonox/infos/PlayerInfo.cc (modified) Changed input of NewHumanController from InputListener to normal ... Mon, 26 Oct 2009 21:55:43 GMT rgrieder [5992] * code/branches/console/src/libraries/core/Core.cc (modified) * code/branches/console/src/libraries/core/Core.h (modified) * code/branches/console/src/libraries/core/CorePrereqs.h (modified) * code/branches/console/src/libraries/core/GUIManager.cc (modified) * code/branches/console/src/libraries/core/GraphicsManager.h (modified) * code/branches/console/src/libraries/core/OrxonoxClass.cc (modified) * code/branches/console/src/libraries/core/input/InputBuffer.cc (modified) * code/branches/console/src/libraries/core/input/InputHandler.h (modified) * code/branches/console/src/libraries/network/packet/Packet.cc (modified) * code/branches/console/src/libraries/tools/ResourceCollection.h (modified) * code/branches/console/src/orxonox/overlays/InGameConsole.cc (modified) Small stuff, mostly spelling mistakes. Sat, 24 Oct 2009 21:35:31 GMT rgrieder [5991] * code/branches/console/src/libraries/core/OrxonoxClass.h (modified) * code/branches/console/src/libraries/core/input/InputManager.cc (modified) * code/branches/console/src/libraries/util/Debug.h (modified) * code/branches/console/src/libraries/util/OutputHandler.h (modified) Replaced the load of macros in Debug.h with just two, doing almost ... Fri, 23 Oct 2009 11:17:42 GMT dave [5989] * code/trunk/data/levels/includes/weaponsettings_ghost.oxi (added) * code/trunk/data/levels/templates/spaceship_ghost.oxt (modified) * code/trunk/data/levels/test_ghost.oxw (modified) ghost weapons added Fri, 23 Oct 2009 11:01:14 GMT dave [5988] * code/trunk/data/levels/templates/spaceship_ghost.oxt (added) * code/trunk/data/levels/test_ghost.oxw (added) Ghost files added Thu, 22 Oct 2009 21:32:30 GMT scheusso [5986] * code/branches/console/src/libraries/core/IOConsole.cc (modified) * code/branches/console/src/libraries/core/Shell.cc (modified) * code/branches/console/src/libraries/core/Shell.h (modified) * code/branches/console/src/libraries/core/input/InputPrereqs.h (modified) added a new feature to the IOConsole: you can now search the history ... Thu, 22 Oct 2009 11:36:48 GMT scheusso [5985] * code/branches/console/src/libraries/core/IOConsole.cc (modified) KEY HOME and END now also work on my laptop ;) Wed, 21 Oct 2009 22:51:54 GMT rgrieder [5984] * code/branches/steering/src/libraries/core/input/InputManager.cc (modified) Fixed bug in InputManager that occurred when entering and leaving (or ... Wed, 21 Oct 2009 20:25:59 GMT rgrieder [5983] * code/branches/console/src/libraries/core/IOConsole.cc (modified) * code/branches/console/src/libraries/core/IOConsole.h (modified) * code/branches/console/src/libraries/core/Shell.cc (modified) * code/branches/console/src/libraries/core/Shell.h (modified) * code/branches/console/src/libraries/util/OutputHandler.cc (modified) * code/branches/console/src/libraries/util/OutputHandler.h (modified) IOConsole basically working though there are some unresolved issues ... Wed, 21 Oct 2009 15:28:13 GMT youngk [5982] * code/branches/sound3/data/levels/sound.oxw (added) * code/branches/sound3/src/orxonox/sound/AmbientSound.cc (modified) * code/branches/sound3/src/orxonox/sound/AmbientSound.h (modified) * code/branches/sound3/src/orxonox/sound/BaseSound.cc (modified) * code/branches/sound3/src/orxonox/sound/BaseSound.h (modified) * code/branches/sound3/src/orxonox/sound/SoundManager.cc (modified) * code/branches/sound3/src/orxonox/sound/SoundManager.h (modified) Ambient Sounds are now locationally triggerable, i.e if the player ... Wed, 21 Oct 2009 15:17:05 GMT wirthmi [5981] * code/branches/steering/src/orxonox/controllers/Controller.h (modified) * code/branches/steering/src/orxonox/controllers/NewHumanController.cc (modified) * code/branches/steering/src/orxonox/controllers/NewHumanController.h (modified) * code/branches/steering/src/orxonox/infos/PlayerInfo.cc (modified) Made NewHumanController an InputHandler so we can control the crosshair. Wed, 21 Oct 2009 14:06:50 GMT scheusso [5980] * code/trunk/data/overlays/hudtemplates3.oxo (modified) * code/trunk/src/modules/overlays/GUIOverlay.cc (modified) * code/trunk/src/modules/overlays/stats/CreateLines.cc (modified) * code/trunk/src/modules/overlays/stats/CreateLines.h (modified) * code/trunk/src/modules/overlays/stats/Scoreboard.cc (modified) * code/trunk/src/orxonox/overlays/OrxonoxOverlay.cc (modified) * code/trunk/src/orxonox/overlays/OrxonoxOverlay.h (modified) * code/trunk/src/orxonox/overlays/OverlayGroup.cc (modified) fixed a logical error in OverlayGroup/OrxonoxOverlay (visibility of ... Wed, 21 Oct 2009 13:41:56 GMT wirthmi [5979] * code/branches/steering/src/orxonox/controllers/CMakeLists.txt (modified) * code/branches/steering/src/orxonox/controllers/NewHumanController.cc (added) * code/branches/steering/src/orxonox/controllers/NewHumanController.h (added) * code/branches/steering/src/orxonox/infos/HumanPlayer.cc (modified) Added and activated new controller called NewHumanController. Wed, 21 Oct 2009 11:47:12 GMT dafrick [5978] * code/trunk/src/modules/overlays/GUIOverlay.cc (modified) GUIOverlay is more talkative, resp. it tells you now, whether it is ... Wed, 21 Oct 2009 11:20:23 GMT dafrick [5976] * code/trunk/data/levels/questsystem2.oxw (added) Added questsystem test-level. Wed, 21 Oct 2009 07:26:35 GMT rgrieder [5975] * code/branches/console/src/libraries/core/IOConsole.cc (modified) * code/branches/console/src/libraries/core/IOConsole.h (modified) Escape key should work as well now in the IOConsole input. And fixed ... Tue, 20 Oct 2009 20:49:22 GMT rgrieder [5974] * code/branches/console/src/libraries/core/IOConsole.cc (modified) Fixed low fps problem when the console is running (removed timeout ... Tue, 20 Oct 2009 20:32:06 GMT rgrieder [5973] * code/branches/console/src/CMakeLists.txt (modified) * code/branches/console/src/libraries/core/Core.cc (modified) * code/branches/console/src/libraries/core/Core.h (modified) * code/branches/console/src/libraries/core/IOConsole.cc (modified) * code/branches/console/src/libraries/core/IOConsole.h (modified) * code/branches/console/src/libraries/core/Shell.cc (modified) * code/branches/console/src/orxonox/gamestates/GSIOConsole.cc (modified) Input part of the IOConsole should be working (at least with SSH on ... Tue, 20 Oct 2009 17:08:05 GMT rgrieder [5972] * code/branches/console/src/libraries/core/IOConsole.cc (modified) Trivial build fixes Tue, 20 Oct 2009 16:57:36 GMT rgrieder [5971] * code/branches/console/src/libraries/core/IOConsole.cc (modified) * code/branches/console/src/libraries/core/IOConsole.h (modified) Svn:eol-style "native" (Tortoise gone completely mad...) Tue, 20 Oct 2009 16:51:15 GMT rgrieder [5970] * code/branches/console/src/libraries/core/IOConsole.cc (added) And what the hell ever happened here. Adding missing file. Tue, 20 Oct 2009 16:47:40 GMT rgrieder [5969] * code/branches/console/src/libraries/core/Shell.cc (modified) * code/branches/console/src/libraries/core/Shell.h (modified) * code/branches/console/src/orxonox/overlays/InGameConsole.cc (modified) * code/branches/console/src/orxonox/overlays/InGameConsole.h (modified) Small stuff: - Using a reference to the Shell in InGameConsole - ... Tue, 20 Oct 2009 16:46:50 GMT rgrieder [5968] * code/branches/console/src/libraries/core/CMakeLists.txt (modified) * code/branches/console/src/libraries/core/IOConsole.h (added) * code/branches/console/src/libraries/core/input/InputBuffer.cc (modified) * code/branches/console/src/libraries/core/input/InputBuffer.h (modified) * code/branches/console/src/libraries/core/input/InputHandler.h (modified) Basic construct of an IOConsole for Unix, using Oli's console from ... Mon, 19 Oct 2009 20:52:10 GMT rgrieder [5967] * code/trunk/doc/api/doxy.config.in (modified) Activated javadoc auto-brief for our doxygen documentation. This ... Mon, 19 Oct 2009 18:25:30 GMT scheusso [5966] * code/trunk/src/orxonox/PlayerManager.cc (modified) * code/trunk/src/orxonox/PlayerManager.h (modified) * code/trunk/src/orxonox/gamestates/GSLevel.cc (modified) (kind of) fixed HumanPlayer bodys beeing around from clients that ... Mon, 19 Oct 2009 15:42:10 GMT scheusso [5965] * code/trunk/src/libraries/network/Client.cc (modified) * code/trunk/src/libraries/network/ClientConnection.cc (modified) changed some default values in network and trying to reduce round ... Mon, 19 Oct 2009 09:29:10 GMT rgrieder [5964] * code/trunk/cmake/CompilerConfigMSVC.cmake (modified) Fixed msvc build with PCH. Sun, 18 Oct 2009 21:39:32 GMT rgrieder [5963] * code/trunk/cmake/CompilerConfigMSVC.cmake (modified) * code/trunk/cmake/SourceFileUtilities.cmake (modified) * code/trunk/cmake/TargetUtilities.cmake (modified) Improved Visual Studio IntelliSense (tool that suggests function ... Fri, 16 Oct 2009 17:10:03 GMT rgrieder [5962] * code/branches/sound3/src/orxonox/sound/BaseSound.cc (modified) Fixed sound reloading problem. The solution was in fact to first stop ... Fri, 16 Oct 2009 13:38:48 GMT scheusso [5961] * code/trunk/src/libraries/network/Client.cc (modified) * code/trunk/src/libraries/network/Client.h (modified) * code/trunk/src/libraries/network/ClientConnection.cc (modified) * code/trunk/src/libraries/network/ClientConnection.h (modified) * code/trunk/src/libraries/network/ClientInformation.cc (modified) * code/trunk/src/libraries/network/Host.cc (modified) * code/trunk/src/libraries/network/Host.h (modified) * code/trunk/src/libraries/network/Server.cc (modified) * code/trunk/src/libraries/network/Server.h (modified) new ConsoleCommand: printRTT: prints the round trip time to (the ... Fri, 16 Oct 2009 09:26:52 GMT rgrieder [5960] * code/trunk/src/orxonox/overlays/InGameConsole.cc (modified) Fixed console overlay retraction inconsistency. Fri, 16 Oct 2009 07:52:10 GMT rgrieder [5958] * code/trunk/src/libraries/util/Clipboard.cc (modified) Fixed a failed assertion on Windows, occurring when pasting from an ... Thu, 15 Oct 2009 07:41:28 GMT erwin [5957] * code/branches/sound3/src/orxonox/sound/BaseSound.cc (modified) Found another output withourt 'Sound:' prefix Wed, 14 Oct 2009 15:01:49 GMT youngk [5956] * code/branches/sound3/src/orxonox/CMakeLists.txt (modified) * code/branches/sound3/src/orxonox/MoodManager.cc (added) * code/branches/sound3/src/orxonox/MoodManager.h (added) * code/branches/sound3/src/orxonox/gamestates/GSMainMenu.cc (modified) * code/branches/sound3/src/orxonox/gamestates/GSMainMenu.h (modified) Implemented Mood functionality plus the ability to change the ... Wed, 14 Oct 2009 14:59:47 GMT youngk [5954] * code/branches/sound3/src/orxonox/sound/BaseSound.cc (modified) Bug Fix: SoundBase. The old sound file is now automatically unloaded ... Wed, 14 Oct 2009 14:36:56 GMT dafrick [5953] * code/branches/pickup2 (modified) * code/branches/pickup2/src/orxonox/pickup/DroppedItem.cc (modified) * code/branches/pickup2/src/orxonox/pickup/DroppedItem.h (modified) * code/branches/pickup2/src/orxonox/pickup/PickupSpawner.cc (modified) * code/branches/pickup2/src/orxonox/pickup/PickupSpawner.h (modified) Made DroppedItem inherit from PickupSpawner. Also minor changes in ... Wed, 14 Oct 2009 12:50:04 GMT cmueri [5952] * code/branches/menu (modified) * code/branches/menu/data/gui/schemes/OrxonoxGUIScheme.scheme (modified) * code/branches/menu/data/gui/schemes/TaharezLookWidgetAliases.scheme (modified) reapplying changes made to trunk (5951) Wed, 14 Oct 2009 12:41:28 GMT cmueri [5951] * code/trunk/data/gui/schemes/OrxonoxGUIScheme.scheme (modified) * code/trunk/data/gui/schemes/TaharezLookWidgetAliases.scheme (modified) some adjustments in order to be able to use the CELayoutEditor Wed, 14 Oct 2009 11:53:59 GMT rgrieder [5948] * code/branches/steering (copied) Creating branch to work on pawn steering. Wed, 14 Oct 2009 11:44:19 GMT rgrieder [5947] * code/branches/pickup2/src/orxonox/pickup/BaseItem.cc (modified) * code/branches/pickup2/src/orxonox/pickup/BaseItem.h (modified) * code/branches/pickup2/src/orxonox/pickup/DroppedItem.cc (modified) * code/branches/pickup2/src/orxonox/pickup/DroppedItem.h (modified) * code/branches/pickup2/src/orxonox/pickup/EquipmentItem.cc (modified) * code/branches/pickup2/src/orxonox/pickup/EquipmentItem.h (modified) * code/branches/pickup2/src/orxonox/pickup/ModifierPickup.cc (modified) * code/branches/pickup2/src/orxonox/pickup/ModifierPickup.h (modified) * code/branches/pickup2/src/orxonox/pickup/ModifierType.h (modified) * code/branches/pickup2/src/orxonox/pickup/PassiveItem.cc (modified) * code/branches/pickup2/src/orxonox/pickup/PassiveItem.h (modified) * code/branches/pickup2/src/orxonox/pickup/PickupCollection.h (modified) * code/branches/pickup2/src/orxonox/pickup/PickupInventory.cc (modified) * code/branches/pickup2/src/orxonox/pickup/PickupInventory.h (modified) * code/branches/pickup2/src/orxonox/pickup/PickupSpawner.cc (modified) * code/branches/pickup2/src/orxonox/pickup/PickupSpawner.h (modified) * code/branches/pickup2/src/orxonox/pickup/UsableItem.cc (modified) * code/branches/pickup2/src/orxonox/pickup/UsableItem.h (modified) * code/branches/pickup2/src/orxonox/pickup/items/HealthImmediate.cc (modified) * code/branches/pickup2/src/orxonox/pickup/items/HealthImmediate.h (modified) * code/branches/pickup2/src/orxonox/pickup/items/HealthUsable.cc (modified) * code/branches/pickup2/src/orxonox/pickup/items/Jump.h (modified) Merged pickup branch revisions to pickup2. Wed, 14 Oct 2009 11:17:34 GMT rgrieder [5946] * code/branches/sound3/src/orxonox/sound/BaseSound.cc (modified) * code/branches/sound3/src/orxonox/sound/SoundManager.cc (modified) Reapplying erwin's changes from r5939. Wed, 14 Oct 2009 11:14:32 GMT rgrieder [5945] * code/branches/console (copied) Recreating console branch. Wed, 14 Oct 2009 11:14:15 GMT rgrieder [5944] * code/branches/menu (copied) Recreating menu branch. Wed, 14 Oct 2009 11:13:41 GMT rgrieder [5943] * code/branches/sound3 (copied) Recreating sound3 branch. Wed, 14 Oct 2009 10:58:56 GMT dafrick [5942] * code/branches/pickup2 (copied) New pickup branch. Wed, 14 Oct 2009 10:51:55 GMT rgrieder [5941] * code/branches/console (deleted) * code/branches/menu (deleted) * code/branches/sound3 (deleted) Deleted recently created branches again (no compile on tardis) Wed, 14 Oct 2009 09:33:13 GMT rgrieder [5940] * code/trunk/src/libraries/core/MemoryArchive.cc (modified) Fixed boost v1.36 build. Tue, 13 Oct 2009 22:40:13 GMT erwin [5939] * code/branches/sound3/src/orxonox/sound/BaseSound.cc (modified) * code/branches/sound3/src/orxonox/sound/SoundManager.cc (modified) Prefixed all debug output of the soundsubsytem with 'Sound:', makes ... Tue, 13 Oct 2009 20:17:01 GMT dafrick [5938] * code/trunk/src/modules/questsystem/QuestEffectBeacon.cc (modified) * code/trunk/src/modules/questsystem/QuestEffectBeacon.h (modified) Some more updated documentation, this time in QuestEffectBeacon. Tue, 13 Oct 2009 19:52:52 GMT dafrick [5937] * code/trunk/src/modules/objects/triggers/DistanceTrigger.cc (modified) Also a very minor update for DistanceTriggger. Tue, 13 Oct 2009 19:49:54 GMT dafrick [5936] * code/trunk/src/orxonox/interfaces/PlayerTrigger.h (modified) Updated documentation in PlayerTrigger. Tue, 13 Oct 2009 15:05:17 GMT dafrick [5935] * code/branches/pickup (modified) * code/branches/pickup/bin/CMakeLists.txt (modified) * code/branches/pickup/bin/dedicatedClient.bat.in (copied) * code/branches/pickup/bin/dedicatedClient.in (copied) * code/branches/pickup/bin/vld.ini.in (modified) * code/branches/pickup/cmake/CompilerConfigMSVC.cmake (modified) * code/branches/pickup/cmake/PackageConfig.cmake (modified) * code/branches/pickup/cmake/ParseMacroArguments.cmake (modified) * code/branches/pickup/cmake/PrecompiledHeaderFiles.cmake (modified) * code/branches/pickup/cmake/SourceFileUtilities.cmake (modified) * code/branches/pickup/cmake/TargetUtilities.cmake (modified) * code/branches/pickup/data/defaultConfig/keybindings.ini (modified) * code/branches/pickup/data/defaultConfig/masterKeybindings.ini (deleted) * code/branches/pickup/data/levels/events.oxw (copied) * code/branches/pickup/data/levels/old/physicstest2.oxw (modified) * code/branches/pickup/data/levels/old/princessaeryn.oxw (modified) * code/branches/pickup/data/levels/old/sample4.oxw (modified) * code/branches/pickup/data/levels/presentation.oxw (modified) * code/branches/pickup/data/levels/presentation09b.oxw (modified) * code/branches/pickup/data/levels/presentation_pong.oxw (modified) * code/branches/pickup/data/levels/princessaeryn.oxw (modified) * code/branches/pickup/data/particle/ExplosionComp1.particle (modified) * code/branches/pickup/data/particle/sparks2.particle (copied) * code/branches/pickup/src/Orxonox.cc (modified) * code/branches/pickup/src/OrxonoxConfig.cmake (modified) * code/branches/pickup/src/external/bullet/BulletCollision/CMakeLists.txt (modified) * code/branches/pickup/src/external/bullet/BulletDynamics/CMakeLists.txt (modified) * code/branches/pickup/src/external/bullet/BulletPrecompiledHeaders.h (deleted) * code/branches/pickup/src/external/bullet/CMakeLists.txt (modified) * code/branches/pickup/src/external/bullet/LinearMath/CMakeLists.txt (modified) * code/branches/pickup/src/external/ceguilua/CMakeLists.txt (modified) * code/branches/pickup/src/external/cpptcl/CMakeLists.txt (modified) * code/branches/pickup/src/external/ogreceguirenderer/CMakeLists.txt (modified) * code/branches/pickup/src/external/ois/CMakeLists.txt (modified) * code/branches/pickup/src/external/ois/changes_orxonox.diff (modified) * code/branches/pickup/src/external/ois/linux/CMakeLists.txt (modified) * code/branches/pickup/src/external/ois/mac/CMakeLists.txt (modified) * code/branches/pickup/src/external/ois/win32/CMakeLists.txt (modified) * code/branches/pickup/src/external/ois/win32/Win32ForceFeedback.cpp (modified) * code/branches/pickup/src/external/tinyxml/CMakeLists.txt (modified) * code/branches/pickup/src/external/tolua/CMakeLists.txt (modified) * code/branches/pickup/src/libraries/CMakeLists.txt (modified) * code/branches/pickup/src/libraries/core/ArgumentCompletionFunctions.cc (modified) * code/branches/pickup/src/libraries/core/BaseObject.cc (modified) * code/branches/pickup/src/libraries/core/BaseObject.h (modified) * code/branches/pickup/src/libraries/core/CMakeLists.txt (modified) * code/branches/pickup/src/libraries/core/ClassFactory.h (modified) * code/branches/pickup/src/libraries/core/ClassTreeMask.cc (modified) * code/branches/pickup/src/libraries/core/ClassTreeMask.h (modified) * code/branches/pickup/src/libraries/core/Clock.cc (deleted) * code/branches/pickup/src/libraries/core/Clock.h (deleted) * code/branches/pickup/src/libraries/core/CommandExecutor.cc (modified) * code/branches/pickup/src/libraries/core/CommandLine.cc (modified) * code/branches/pickup/src/libraries/core/ConfigFileManager.cc (modified) * code/branches/pickup/src/libraries/core/Core.cc (modified) * code/branches/pickup/src/libraries/core/Core.h (modified) * code/branches/pickup/src/libraries/core/CoreIncludes.h (modified) * code/branches/pickup/src/libraries/core/CorePrereqs.h (modified) * code/branches/pickup/src/libraries/core/Event.cc (modified) * code/branches/pickup/src/libraries/core/Event.h (modified) * code/branches/pickup/src/libraries/core/EventIncludes.h (modified) * code/branches/pickup/src/libraries/core/Factory.cc (deleted) * code/branches/pickup/src/libraries/core/Factory.h (deleted) * code/branches/pickup/src/libraries/core/Functor.h (modified) * code/branches/pickup/src/libraries/core/GUIManager.cc (modified) * code/branches/pickup/src/libraries/core/GUIManager.h (modified) * code/branches/pickup/src/libraries/core/Game.cc (modified) * code/branches/pickup/src/libraries/core/Game.h (modified) * code/branches/pickup/src/libraries/core/GameMode.cc (modified) * code/branches/pickup/src/libraries/core/GameMode.h (modified) * code/branches/pickup/src/libraries/core/GameState.h (modified) * code/branches/pickup/src/libraries/core/GraphicsManager.cc (modified) * code/branches/pickup/src/libraries/core/GraphicsManager.h (modified) * code/branches/pickup/src/libraries/core/Identifier.cc (modified) * code/branches/pickup/src/libraries/core/Identifier.h (modified) * code/branches/pickup/src/libraries/core/Iterator.h (modified) * code/branches/pickup/src/libraries/core/Language.cc (modified) * code/branches/pickup/src/libraries/core/Loader.cc (modified) * code/branches/pickup/src/libraries/core/LuaState.cc (modified) * code/branches/pickup/src/libraries/core/MemoryArchive.cc (modified) * code/branches/pickup/src/libraries/core/ObjectListIterator.h (modified) * code/branches/pickup/src/libraries/core/OrxonoxClass.cc (modified) * code/branches/pickup/src/libraries/core/OrxonoxClass.h (modified) * code/branches/pickup/src/libraries/core/PathConfig.cc (copied) * code/branches/pickup/src/libraries/core/PathConfig.h (copied) * code/branches/pickup/src/libraries/core/Resource.h (modified) * code/branches/pickup/src/libraries/core/ScopedSingletonManager.cc (copied) * code/branches/pickup/src/libraries/core/ScopedSingletonManager.h (copied) * code/branches/pickup/src/libraries/core/Shell.cc (modified) * code/branches/pickup/src/libraries/core/SmartPtr.h (copied) * code/branches/pickup/src/libraries/core/SubclassIdentifier.h (copied) * code/branches/pickup/src/libraries/core/Super.h (modified) * code/branches/pickup/src/libraries/core/TclBind.cc (modified) * code/branches/pickup/src/libraries/core/TclThreadManager.cc (modified) * code/branches/pickup/src/libraries/core/WeakPtr.h (copied) * code/branches/pickup/src/libraries/core/XMLPort.h (modified) * code/branches/pickup/src/libraries/core/input/Button.cc (modified) * code/branches/pickup/src/libraries/core/input/CMakeLists.txt (modified) * code/branches/pickup/src/libraries/core/input/InputDevice.h (modified) * code/branches/pickup/src/libraries/core/input/InputManager.cc (modified) * code/branches/pickup/src/libraries/core/input/InputManager.h (modified) * code/branches/pickup/src/libraries/core/input/InputState.cc (modified) * code/branches/pickup/src/libraries/core/input/InputState.h (modified) * code/branches/pickup/src/libraries/core/input/KeyBinder.cc (modified) * code/branches/pickup/src/libraries/core/input/KeyBinder.h (modified) * code/branches/pickup/src/libraries/core/input/KeyBinderManager.cc (copied) * code/branches/pickup/src/libraries/core/input/KeyBinderManager.h (copied) * code/branches/pickup/src/libraries/core/input/KeyDetector.cc (modified) * code/branches/pickup/src/libraries/core/input/KeyDetector.h (modified) * code/branches/pickup/src/libraries/core/input/Mouse.cc (modified) * code/branches/pickup/src/libraries/network/Client.cc (modified) * code/branches/pickup/src/libraries/network/Client.h (modified) * code/branches/pickup/src/libraries/network/ClientConnection.cc (modified) * code/branches/pickup/src/libraries/network/ClientConnection.h (modified) * code/branches/pickup/src/libraries/network/ClientConnectionListener.cc (modified) * code/branches/pickup/src/libraries/network/ClientConnectionListener.h (modified) * code/branches/pickup/src/libraries/network/Connection.cc (modified) * code/branches/pickup/src/libraries/network/Connection.h (modified) * code/branches/pickup/src/libraries/network/GamestateClient.cc (modified) * code/branches/pickup/src/libraries/network/GamestateManager.cc (modified) * code/branches/pickup/src/libraries/network/NetworkFunction.cc (modified) * code/branches/pickup/src/libraries/network/NetworkPrereqs.h (modified) * code/branches/pickup/src/libraries/network/Server.cc (modified) * code/branches/pickup/src/libraries/network/Server.h (modified) * code/branches/pickup/src/libraries/network/ServerConnection.cc (modified) * code/branches/pickup/src/libraries/network/ServerConnection.h (modified) * code/branches/pickup/src/libraries/network/packet/CMakeLists.txt (modified) * code/branches/pickup/src/libraries/network/packet/ClassID.cc (modified) * code/branches/pickup/src/libraries/network/packet/Gamestate.cc (modified) * code/branches/pickup/src/libraries/network/synchronisable/Synchronisable.cc (modified) * code/branches/pickup/src/libraries/network/synchronisable/Synchronisable.h (modified) * code/branches/pickup/src/libraries/tools/CMakeLists.txt (modified) * code/branches/pickup/src/libraries/tools/ResourceLocation.cc (modified) * code/branches/pickup/src/libraries/tools/Timer.cc (modified) * code/branches/pickup/src/libraries/tools/Timer.h (modified) * code/branches/pickup/src/libraries/tools/ToolsPrecompiledHeaders.h (deleted) * code/branches/pickup/src/libraries/tools/ToolsPrereqs.h (modified) * code/branches/pickup/src/libraries/util/CMakeLists.txt (modified) * code/branches/pickup/src/libraries/util/Clock.cc (copied) * code/branches/pickup/src/libraries/util/Clock.h (copied) * code/branches/pickup/src/libraries/util/Scope.h (modified) * code/branches/pickup/src/libraries/util/ScopedSingleton.h (deleted) * code/branches/pickup/src/libraries/util/Singleton.h (modified) * code/branches/pickup/src/libraries/util/UtilPrereqs.h (modified) * code/branches/pickup/src/modules/CMakeLists.txt (modified) * code/branches/pickup/src/modules/gamestates (deleted) * code/branches/pickup/src/modules/objects/Attacher.cc (modified) * code/branches/pickup/src/modules/objects/ObjectsPrereqs.h (modified) * code/branches/pickup/src/modules/objects/Planet.cc (modified) * code/branches/pickup/src/modules/objects/eventsystem/CMakeLists.txt (modified) * code/branches/pickup/src/modules/objects/eventsystem/EventDispatcher.cc (modified) * code/branches/pickup/src/modules/objects/eventsystem/EventDispatcher.h (modified) * code/branches/pickup/src/modules/objects/eventsystem/EventFilter.cc (copied) * code/branches/pickup/src/modules/objects/eventsystem/EventFilter.h (copied) * code/branches/pickup/src/modules/objects/eventsystem/EventListener.cc (modified) * code/branches/pickup/src/modules/objects/eventsystem/EventListener.h (modified) * code/branches/pickup/src/modules/objects/eventsystem/EventName.cc (copied) * code/branches/pickup/src/modules/objects/eventsystem/EventName.h (copied) * code/branches/pickup/src/modules/objects/eventsystem/EventTarget.cc (modified) * code/branches/pickup/src/modules/objects/eventsystem/EventTarget.h (modified) * code/branches/pickup/src/modules/objects/triggers/CheckPoint.cc (modified) * code/branches/pickup/src/modules/objects/triggers/EventTrigger.cc (modified) * code/branches/pickup/src/modules/objects/triggers/EventTrigger.h (modified) * code/branches/pickup/src/modules/objects/triggers/Trigger.cc (modified) * code/branches/pickup/src/modules/overlays/FadeoutText.cc (modified) * code/branches/pickup/src/modules/overlays/FadeoutText.h (modified) * code/branches/pickup/src/modules/overlays/OverlaysPrereqs.h (modified) * code/branches/pickup/src/modules/overlays/hud/ChatOverlay.cc (modified) * code/branches/pickup/src/modules/overlays/hud/ChatOverlay.h (modified) * code/branches/pickup/src/modules/overlays/hud/HUDBar.cc (modified) * code/branches/pickup/src/modules/overlays/hud/HUDHealthBar.cc (modified) * code/branches/pickup/src/modules/overlays/hud/HUDHealthBar.h (modified) * code/branches/pickup/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/branches/pickup/src/modules/overlays/hud/TeamBaseMatchScore.cc (modified) * code/branches/pickup/src/modules/overlays/hud/UnderAttackHealthBar.cc (modified) * code/branches/pickup/src/modules/overlays/hud/UnderAttackHealthBar.h (modified) * code/branches/pickup/src/modules/overlays/stats/CreateLines.cc (modified) * code/branches/pickup/src/modules/overlays/stats/Scoreboard.cc (modified) * code/branches/pickup/src/modules/overlays/stats/Scoreboard.h (modified) * code/branches/pickup/src/modules/pong/CMakeLists.txt (modified) * code/branches/pickup/src/modules/pong/Pong.cc (modified) * code/branches/pickup/src/modules/pong/Pong.h (modified) * code/branches/pickup/src/modules/pong/PongAI.cc (modified) * code/branches/pickup/src/modules/pong/PongAI.h (modified) * code/branches/pickup/src/modules/pong/PongBall.cc (modified) * code/branches/pickup/src/modules/pong/PongBall.h (modified) * code/branches/pickup/src/modules/pong/PongCenterpoint.cc (modified) * code/branches/pickup/src/modules/pong/PongCenterpoint.h (modified) * code/branches/pickup/src/modules/pong/PongPrecompiledHeaders.h (deleted) * code/branches/pickup/src/modules/pong/PongPrereqs.h (modified) * code/branches/pickup/src/modules/pong/PongScore.cc (modified) * code/branches/pickup/src/modules/questsystem/QuestEffectBeacon.cc (modified) * code/branches/pickup/src/modules/questsystem/QuestEffectBeacon.h (modified) * code/branches/pickup/src/modules/questsystem/QuestGUI.cc (modified) * code/branches/pickup/src/modules/questsystem/QuestManager.cc (modified) * code/branches/pickup/src/modules/questsystem/QuestManager.h (modified) * code/branches/pickup/src/modules/questsystem/QuestsystemPrecompiledHeaders.h (modified) * code/branches/pickup/src/modules/questsystem/QuestsystemPrereqs.h (modified) * code/branches/pickup/src/modules/questsystem/notifications/NotificationManager.cc (modified) * code/branches/pickup/src/modules/questsystem/notifications/NotificationManager.h (modified) * code/branches/pickup/src/modules/questsystem/notifications/NotificationQueue.cc (modified) * code/branches/pickup/src/modules/weapons/MuzzleFlash.cc (modified) * code/branches/pickup/src/modules/weapons/MuzzleFlash.h (modified) * code/branches/pickup/src/modules/weapons/WeaponsPrereqs.h (modified) * code/branches/pickup/src/modules/weapons/munitions/ReplenishingMunition.cc (modified) * code/branches/pickup/src/modules/weapons/munitions/ReplenishingMunition.h (modified) * code/branches/pickup/src/modules/weapons/projectiles/LightningGunProjectile.cc (modified) * code/branches/pickup/src/modules/weapons/projectiles/LightningGunProjectile.h (modified) * code/branches/pickup/src/modules/weapons/projectiles/ParticleProjectile.cc (modified) * code/branches/pickup/src/modules/weapons/projectiles/Projectile.cc (modified) * code/branches/pickup/src/modules/weapons/projectiles/Projectile.h (modified) * code/branches/pickup/src/modules/weapons/weaponmodes/EnergyDrink.cc (modified) * code/branches/pickup/src/modules/weapons/weaponmodes/EnergyDrink.h (modified) * code/branches/pickup/src/modules/weapons/weaponmodes/HsW01.cc (modified) * code/branches/pickup/src/modules/weapons/weaponmodes/HsW01.h (modified) * code/branches/pickup/src/orxonox/CMakeLists.txt (modified) * code/branches/pickup/src/orxonox/CameraManager.cc (modified) * code/branches/pickup/src/orxonox/CameraManager.h (modified) * code/branches/pickup/src/orxonox/Level.cc (modified) * code/branches/pickup/src/orxonox/Level.h (modified) * code/branches/pickup/src/orxonox/LevelManager.cc (modified) * code/branches/pickup/src/orxonox/Main.cc (modified) * code/branches/pickup/src/orxonox/OrxonoxPrereqs.h (modified) * code/branches/pickup/src/orxonox/PawnManager.cc (modified) * code/branches/pickup/src/orxonox/PlayerManager.cc (modified) * code/branches/pickup/src/orxonox/PlayerManager.h (modified) * code/branches/pickup/src/orxonox/Radar.cc (modified) * code/branches/pickup/src/orxonox/Radar.h (modified) * code/branches/pickup/src/orxonox/Scene.cc (modified) * code/branches/pickup/src/orxonox/Scene.h (modified) * code/branches/pickup/src/orxonox/Test.cc (modified) * code/branches/pickup/src/orxonox/collisionshapes/CompoundCollisionShape.cc (modified) * code/branches/pickup/src/orxonox/collisionshapes/WorldEntityCollisionShape.cc (modified) * code/branches/pickup/src/orxonox/controllers/AIController.cc (modified) * code/branches/pickup/src/orxonox/controllers/AIController.h (modified) * code/branches/pickup/src/orxonox/controllers/ArtificialController.cc (modified) * code/branches/pickup/src/orxonox/controllers/ArtificialController.h (modified) * code/branches/pickup/src/orxonox/controllers/HumanController.cc (modified) * code/branches/pickup/src/orxonox/controllers/HumanController.h (modified) * code/branches/pickup/src/orxonox/controllers/WaypointController.cc (modified) * code/branches/pickup/src/orxonox/controllers/WaypointPatrolController.cc (modified) * code/branches/pickup/src/orxonox/controllers/WaypointPatrolController.h (modified) * code/branches/pickup/src/orxonox/gamestates (copied) * code/branches/pickup/src/orxonox/gamestates/CMakeLists.txt (copied) * code/branches/pickup/src/orxonox/gamestates/GSClient.cc (copied) * code/branches/pickup/src/orxonox/gamestates/GSClient.h (copied) * code/branches/pickup/src/orxonox/gamestates/GSDedicated.cc (copied) * code/branches/pickup/src/orxonox/gamestates/GSDedicated.h (copied) * code/branches/pickup/src/orxonox/gamestates/GSDedicatedClient.cc (copied) * code/branches/pickup/src/orxonox/gamestates/GSDedicatedClient.h (copied) * code/branches/pickup/src/orxonox/gamestates/GSGraphics.cc (copied) * code/branches/pickup/src/orxonox/gamestates/GSGraphics.h (copied) * code/branches/pickup/src/orxonox/gamestates/GSIOConsole.cc (copied) * code/branches/pickup/src/orxonox/gamestates/GSIOConsole.h (copied) * code/branches/pickup/src/orxonox/gamestates/GSLevel.cc (copied) * code/branches/pickup/src/orxonox/gamestates/GSLevel.h (copied) * code/branches/pickup/src/orxonox/gamestates/GSMainMenu.cc (copied) * code/branches/pickup/src/orxonox/gamestates/GSMainMenu.h (copied) * code/branches/pickup/src/orxonox/gamestates/GSRoot.cc (copied) * code/branches/pickup/src/orxonox/gamestates/GSRoot.h (copied) * code/branches/pickup/src/orxonox/gamestates/GSServer.cc (copied) * code/branches/pickup/src/orxonox/gamestates/GSServer.h (copied) * code/branches/pickup/src/orxonox/gamestates/GSStandalone.cc (copied) * code/branches/pickup/src/orxonox/gamestates/GSStandalone.h (copied) * code/branches/pickup/src/orxonox/gametypes/Asteroids.cc (modified) * code/branches/pickup/src/orxonox/gametypes/Gametype.cc (modified) * code/branches/pickup/src/orxonox/gametypes/Gametype.h (modified) * code/branches/pickup/src/orxonox/gametypes/TeamBaseMatch.cc (modified) * code/branches/pickup/src/orxonox/gametypes/TeamBaseMatch.h (modified) * code/branches/pickup/src/orxonox/gametypes/TeamDeathmatch.cc (modified) * code/branches/pickup/src/orxonox/gametypes/UnderAttack.cc (modified) * code/branches/pickup/src/orxonox/gametypes/UnderAttack.h (modified) * code/branches/pickup/src/orxonox/graphics/CMakeLists.txt (modified) * code/branches/pickup/src/orxonox/graphics/Camera.cc (modified) * code/branches/pickup/src/orxonox/graphics/FadingBillboard.cc (modified) * code/branches/pickup/src/orxonox/graphics/FadingBillboard.h (modified) * code/branches/pickup/src/orxonox/graphics/ParticleEmitter.cc (modified) * code/branches/pickup/src/orxonox/graphics/ParticleSpawner.cc (modified) * code/branches/pickup/src/orxonox/graphics/ParticleSpawner.h (modified) * code/branches/pickup/src/orxonox/infos/HumanPlayer.cc (modified) * code/branches/pickup/src/orxonox/infos/PlayerInfo.cc (modified) * code/branches/pickup/src/orxonox/infos/PlayerInfo.h (modified) * code/branches/pickup/src/orxonox/interfaces/InterfaceCompilation.cc (modified) * code/branches/pickup/src/orxonox/interfaces/NotificationListener.h (modified) * code/branches/pickup/src/orxonox/interfaces/PawnListener.h (deleted) * code/branches/pickup/src/orxonox/interfaces/RadarViewable.cc (modified) * code/branches/pickup/src/orxonox/items/Engine.cc (modified) * code/branches/pickup/src/orxonox/items/Engine.h (modified) * code/branches/pickup/src/orxonox/items/MultiStateEngine.cc (modified) * code/branches/pickup/src/orxonox/overlays/CMakeLists.txt (modified) * code/branches/pickup/src/orxonox/overlays/InGameConsole.cc (modified) * code/branches/pickup/src/orxonox/overlays/InGameConsole.h (modified) * code/branches/pickup/src/orxonox/overlays/Map.cc (modified) * code/branches/pickup/src/orxonox/overlays/OrxonoxOverlay.h (modified) * code/branches/pickup/src/orxonox/overlays/OverlayGroup.cc (modified) * code/branches/pickup/src/orxonox/pickup/DroppedItem.cc (modified) * code/branches/pickup/src/orxonox/pickup/DroppedItem.h (modified) * code/branches/pickup/src/orxonox/pickup/ModifierPickup.cc (modified) * code/branches/pickup/src/orxonox/pickup/ModifierPickup.h (modified) * code/branches/pickup/src/orxonox/pickup/PickupSpawner.cc (modified) * code/branches/pickup/src/orxonox/pickup/PickupSpawner.h (modified) * code/branches/pickup/src/orxonox/pickup/items/HealthImmediate.cc (modified) * code/branches/pickup/src/orxonox/pickup/items/HealthUsable.cc (modified) * code/branches/pickup/src/orxonox/pickup/items/Jump.cc (modified) * code/branches/pickup/src/orxonox/sound/AmbientSound.cc (copied) * code/branches/pickup/src/orxonox/sound/AmbientSound.h (copied) * code/branches/pickup/src/orxonox/sound/BaseSound.cc (copied) * code/branches/pickup/src/orxonox/sound/BaseSound.h (copied) * code/branches/pickup/src/orxonox/sound/CMakeLists.txt (modified) * code/branches/pickup/src/orxonox/sound/SoundBase.cc (deleted) * code/branches/pickup/src/orxonox/sound/SoundBase.h (deleted) * code/branches/pickup/src/orxonox/sound/SoundMainMenu.cc (deleted) * code/branches/pickup/src/orxonox/sound/SoundMainMenu.h (deleted) * code/branches/pickup/src/orxonox/sound/SoundManager.cc (modified) * code/branches/pickup/src/orxonox/sound/SoundManager.h (modified) * code/branches/pickup/src/orxonox/sound/WorldSound.cc (copied) * code/branches/pickup/src/orxonox/sound/WorldSound.h (copied) * code/branches/pickup/src/orxonox/weaponsystem/Munition.cc (modified) * code/branches/pickup/src/orxonox/weaponsystem/Munition.h (modified) * code/branches/pickup/src/orxonox/weaponsystem/Weapon.cc (modified) * code/branches/pickup/src/orxonox/weaponsystem/Weapon.h (modified) * code/branches/pickup/src/orxonox/weaponsystem/WeaponMode.cc (modified) * code/branches/pickup/src/orxonox/weaponsystem/WeaponMode.h (modified) * code/branches/pickup/src/orxonox/weaponsystem/WeaponPack.cc (modified) * code/branches/pickup/src/orxonox/weaponsystem/WeaponSlot.cc (modified) * code/branches/pickup/src/orxonox/weaponsystem/WeaponSystem.cc (modified) * code/branches/pickup/src/orxonox/worldentities/BigExplosion.cc (modified) * code/branches/pickup/src/orxonox/worldentities/BigExplosion.h (modified) * code/branches/pickup/src/orxonox/worldentities/CameraPosition.cc (modified) * code/branches/pickup/src/orxonox/worldentities/ControllableEntity.cc (modified) * code/branches/pickup/src/orxonox/worldentities/ControllableEntity.h (modified) * code/branches/pickup/src/orxonox/worldentities/ExplosionChunk.cc (modified) * code/branches/pickup/src/orxonox/worldentities/ExplosionChunk.h (modified) * code/branches/pickup/src/orxonox/worldentities/MovableEntity.cc (modified) * code/branches/pickup/src/orxonox/worldentities/MovableEntity.h (modified) * code/branches/pickup/src/orxonox/worldentities/SpawnPoint.cc (modified) * code/branches/pickup/src/orxonox/worldentities/SpawnPoint.h (modified) * code/branches/pickup/src/orxonox/worldentities/WorldEntity.cc (modified) * code/branches/pickup/src/orxonox/worldentities/pawns/Destroyer.cc (modified) * code/branches/pickup/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/branches/pickup/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) * code/branches/pickup/src/orxonox/worldentities/pawns/Spectator.cc (modified) * code/branches/pickup/src/orxonox/worldentities/pawns/TeamBaseMatchBase.cc (modified) Hopefully merged trunk successfully into pickup branch. Tue, 13 Oct 2009 07:57:20 GMT rgrieder [5934] * code/branches/console (copied) Creating branch to work on a always active IO-based console. Tue, 13 Oct 2009 07:56:27 GMT rgrieder [5933] * code/branches/menu (copied) Creating branch for an game-paused menu. Tue, 13 Oct 2009 07:55:38 GMT rgrieder [5932] * code/branches/sound2 (deleted) Deleting branch again (emails just arrived...) Tue, 13 Oct 2009 07:54:51 GMT rgrieder [5931] * code/branches/sound2 (copied) Creating branch for working on sounds. Mon, 12 Oct 2009 22:09:37 GMT landauf [5930] * code/branches/sound3 (copied) created new sound branch Mon, 12 Oct 2009 18:20:07 GMT rgrieder [5929] * code/trunk (modified) * code/trunk/bin/CMakeLists.txt (modified) * code/trunk/bin/dedicatedClient.bat.in (copied) * code/trunk/bin/dedicatedClient.in (copied) * code/trunk/bin/vld.ini.in (modified) * code/trunk/cmake/CompilerConfigMSVC.cmake (modified) * code/trunk/cmake/ParseMacroArguments.cmake (modified) * code/trunk/cmake/PrecompiledHeaderFiles.cmake (modified) * code/trunk/cmake/SourceFileUtilities.cmake (modified) * code/trunk/cmake/TargetUtilities.cmake (modified) * code/trunk/data/defaultConfig/keybindings.ini (modified) * code/trunk/data/defaultConfig/masterKeybindings.ini (deleted) * code/trunk/data/levels/events.oxw (copied) * code/trunk/data/levels/old/physicstest2.oxw (modified) * code/trunk/data/levels/old/princessaeryn.oxw (modified) * code/trunk/data/levels/old/sample4.oxw (modified) * code/trunk/data/levels/presentation.oxw (modified) * code/trunk/data/levels/presentation09b.oxw (modified) * code/trunk/data/levels/presentation_pong.oxw (modified) * code/trunk/data/levels/princessaeryn.oxw (modified) * code/trunk/data/particle/ExplosionComp1.particle (modified) * code/trunk/data/particle/sparks2.particle (copied) * code/trunk/src/Orxonox.cc (modified) * code/trunk/src/OrxonoxConfig.cmake (modified) * code/trunk/src/external/bullet/BulletCollision/CMakeLists.txt (modified) * code/trunk/src/external/bullet/BulletDynamics/CMakeLists.txt (modified) * code/trunk/src/external/bullet/BulletPrecompiledHeaders.h (deleted) * code/trunk/src/external/bullet/CMakeLists.txt (modified) * code/trunk/src/external/bullet/LinearMath/CMakeLists.txt (modified) * code/trunk/src/external/ceguilua/CMakeLists.txt (modified) * code/trunk/src/external/cpptcl/CMakeLists.txt (modified) * code/trunk/src/external/ogreceguirenderer/CMakeLists.txt (modified) * code/trunk/src/external/ois/CMakeLists.txt (modified) * code/trunk/src/external/ois/changes_orxonox.diff (modified) * code/trunk/src/external/ois/linux/CMakeLists.txt (modified) * code/trunk/src/external/ois/mac/CMakeLists.txt (modified) * code/trunk/src/external/ois/win32/CMakeLists.txt (modified) * code/trunk/src/external/ois/win32/Win32ForceFeedback.cpp (modified) * code/trunk/src/external/tinyxml/CMakeLists.txt (modified) * code/trunk/src/external/tolua/CMakeLists.txt (modified) * code/trunk/src/libraries/CMakeLists.txt (modified) * code/trunk/src/libraries/core/ArgumentCompletionFunctions.cc (modified) * code/trunk/src/libraries/core/BaseObject.cc (modified) * code/trunk/src/libraries/core/BaseObject.h (modified) * code/trunk/src/libraries/core/CMakeLists.txt (modified) * code/trunk/src/libraries/core/ClassFactory.h (modified) * code/trunk/src/libraries/core/ClassTreeMask.cc (modified) * code/trunk/src/libraries/core/ClassTreeMask.h (modified) * code/trunk/src/libraries/core/Clock.cc (deleted) * code/trunk/src/libraries/core/Clock.h (deleted) * code/trunk/src/libraries/core/CommandExecutor.cc (modified) * code/trunk/src/libraries/core/CommandLine.cc (modified) * code/trunk/src/libraries/core/ConfigFileManager.cc (modified) * code/trunk/src/libraries/core/Core.cc (modified) * code/trunk/src/libraries/core/Core.h (modified) * code/trunk/src/libraries/core/CoreIncludes.h (modified) * code/trunk/src/libraries/core/CorePrereqs.h (modified) * code/trunk/src/libraries/core/Event.cc (modified) * code/trunk/src/libraries/core/Event.h (modified) * code/trunk/src/libraries/core/EventIncludes.h (modified) * code/trunk/src/libraries/core/Factory.cc (deleted) * code/trunk/src/libraries/core/Factory.h (deleted) * code/trunk/src/libraries/core/Functor.h (modified) * code/trunk/src/libraries/core/GUIManager.cc (modified) * code/trunk/src/libraries/core/GUIManager.h (modified) * code/trunk/src/libraries/core/Game.cc (modified) * code/trunk/src/libraries/core/Game.h (modified) * code/trunk/src/libraries/core/GameMode.cc (modified) * code/trunk/src/libraries/core/GameMode.h (modified) * code/trunk/src/libraries/core/GameState.h (modified) * code/trunk/src/libraries/core/GraphicsManager.cc (modified) * code/trunk/src/libraries/core/GraphicsManager.h (modified) * code/trunk/src/libraries/core/Identifier.cc (modified) * code/trunk/src/libraries/core/Identifier.h (modified) * code/trunk/src/libraries/core/Iterator.h (modified) * code/trunk/src/libraries/core/Language.cc (modified) * code/trunk/src/libraries/core/Loader.cc (modified) * code/trunk/src/libraries/core/LuaState.cc (modified) * code/trunk/src/libraries/core/MemoryArchive.cc (modified) * code/trunk/src/libraries/core/ObjectListIterator.h (modified) * code/trunk/src/libraries/core/OrxonoxClass.cc (modified) * code/trunk/src/libraries/core/OrxonoxClass.h (modified) * code/trunk/src/libraries/core/PathConfig.cc (copied) * code/trunk/src/libraries/core/PathConfig.h (copied) * code/trunk/src/libraries/core/Resource.h (modified) * code/trunk/src/libraries/core/ScopedSingletonManager.cc (copied) * code/trunk/src/libraries/core/ScopedSingletonManager.h (copied) * code/trunk/src/libraries/core/Shell.cc (modified) * code/trunk/src/libraries/core/SmartPtr.h (copied) * code/trunk/src/libraries/core/SubclassIdentifier.h (copied) * code/trunk/src/libraries/core/Super.h (modified) * code/trunk/src/libraries/core/TclBind.cc (modified) * code/trunk/src/libraries/core/TclThreadManager.cc (modified) * code/trunk/src/libraries/core/WeakPtr.h (copied) * code/trunk/src/libraries/core/XMLPort.h (modified) * code/trunk/src/libraries/core/input/Button.cc (modified) * code/trunk/src/libraries/core/input/CMakeLists.txt (modified) * code/trunk/src/libraries/core/input/InputDevice.h (modified) * code/trunk/src/libraries/core/input/InputManager.cc (modified) * code/trunk/src/libraries/core/input/InputManager.h (modified) * code/trunk/src/libraries/core/input/InputState.cc (modified) * code/trunk/src/libraries/core/input/InputState.h (modified) * code/trunk/src/libraries/core/input/KeyBinder.cc (modified) * code/trunk/src/libraries/core/input/KeyBinder.h (modified) * code/trunk/src/libraries/core/input/KeyBinderManager.cc (copied) * code/trunk/src/libraries/core/input/KeyBinderManager.h (copied) * code/trunk/src/libraries/core/input/KeyDetector.cc (modified) * code/trunk/src/libraries/core/input/KeyDetector.h (modified) * code/trunk/src/libraries/core/input/Mouse.cc (modified) * code/trunk/src/libraries/network/Client.cc (modified) * code/trunk/src/libraries/network/Client.h (modified) * code/trunk/src/libraries/network/ClientConnection.cc (modified) * code/trunk/src/libraries/network/ClientConnection.h (modified) * code/trunk/src/libraries/network/ClientConnectionListener.cc (modified) * code/trunk/src/libraries/network/ClientConnectionListener.h (modified) * code/trunk/src/libraries/network/Connection.cc (modified) * code/trunk/src/libraries/network/Connection.h (modified) * code/trunk/src/libraries/network/GamestateClient.cc (modified) * code/trunk/src/libraries/network/GamestateManager.cc (modified) * code/trunk/src/libraries/network/NetworkFunction.cc (modified) * code/trunk/src/libraries/network/NetworkPrereqs.h (modified) * code/trunk/src/libraries/network/Server.cc (modified) * code/trunk/src/libraries/network/Server.h (modified) * code/trunk/src/libraries/network/ServerConnection.cc (modified) * code/trunk/src/libraries/network/ServerConnection.h (modified) * code/trunk/src/libraries/network/packet/CMakeLists.txt (modified) * code/trunk/src/libraries/network/packet/ClassID.cc (modified) * code/trunk/src/libraries/network/packet/Gamestate.cc (modified) * code/trunk/src/libraries/network/synchronisable/Synchronisable.cc (modified) * code/trunk/src/libraries/network/synchronisable/Synchronisable.h (modified) * code/trunk/src/libraries/tools/CMakeLists.txt (modified) * code/trunk/src/libraries/tools/ResourceLocation.cc (modified) * code/trunk/src/libraries/tools/Timer.cc (modified) * code/trunk/src/libraries/tools/Timer.h (modified) * code/trunk/src/libraries/tools/ToolsPrecompiledHeaders.h (deleted) * code/trunk/src/libraries/tools/ToolsPrereqs.h (modified) * code/trunk/src/libraries/util/CMakeLists.txt (modified) * code/trunk/src/libraries/util/Clock.cc (copied) * code/trunk/src/libraries/util/Clock.h (copied) * code/trunk/src/libraries/util/Scope.h (modified) * code/trunk/src/libraries/util/ScopedSingleton.h (deleted) * code/trunk/src/libraries/util/Singleton.h (modified) * code/trunk/src/libraries/util/UtilPrereqs.h (modified) * code/trunk/src/modules/CMakeLists.txt (modified) * code/trunk/src/modules/gamestates (deleted) * code/trunk/src/modules/objects/Attacher.cc (modified) * code/trunk/src/modules/objects/ObjectsPrereqs.h (modified) * code/trunk/src/modules/objects/Planet.cc (modified) * code/trunk/src/modules/objects/eventsystem/CMakeLists.txt (modified) * code/trunk/src/modules/objects/eventsystem/EventDispatcher.cc (modified) * code/trunk/src/modules/objects/eventsystem/EventDispatcher.h (modified) * code/trunk/src/modules/objects/eventsystem/EventFilter.cc (copied) * code/trunk/src/modules/objects/eventsystem/EventFilter.h (copied) * code/trunk/src/modules/objects/eventsystem/EventListener.cc (modified) * code/trunk/src/modules/objects/eventsystem/EventListener.h (modified) * code/trunk/src/modules/objects/eventsystem/EventName.cc (copied) * code/trunk/src/modules/objects/eventsystem/EventName.h (copied) * code/trunk/src/modules/objects/eventsystem/EventTarget.cc (modified) * code/trunk/src/modules/objects/eventsystem/EventTarget.h (modified) * code/trunk/src/modules/objects/triggers/CheckPoint.cc (modified) * code/trunk/src/modules/objects/triggers/EventTrigger.cc (modified) * code/trunk/src/modules/objects/triggers/EventTrigger.h (modified) * code/trunk/src/modules/objects/triggers/Trigger.cc (modified) * code/trunk/src/modules/overlays/FadeoutText.cc (modified) * code/trunk/src/modules/overlays/FadeoutText.h (modified) * code/trunk/src/modules/overlays/OverlaysPrereqs.h (modified) * code/trunk/src/modules/overlays/hud/ChatOverlay.cc (modified) * code/trunk/src/modules/overlays/hud/ChatOverlay.h (modified) * code/trunk/src/modules/overlays/hud/HUDBar.cc (modified) * code/trunk/src/modules/overlays/hud/HUDHealthBar.cc (modified) * code/trunk/src/modules/overlays/hud/HUDHealthBar.h (modified) * code/trunk/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/trunk/src/modules/overlays/hud/TeamBaseMatchScore.cc (modified) * code/trunk/src/modules/overlays/hud/UnderAttackHealthBar.cc (modified) * code/trunk/src/modules/overlays/hud/UnderAttackHealthBar.h (modified) * code/trunk/src/modules/overlays/stats/CreateLines.cc (modified) * code/trunk/src/modules/overlays/stats/Scoreboard.cc (modified) * code/trunk/src/modules/overlays/stats/Scoreboard.h (modified) * code/trunk/src/modules/pong/CMakeLists.txt (modified) * code/trunk/src/modules/pong/Pong.cc (modified) * code/trunk/src/modules/pong/Pong.h (modified) * code/trunk/src/modules/pong/PongAI.cc (modified) * code/trunk/src/modules/pong/PongAI.h (modified) * code/trunk/src/modules/pong/PongBall.cc (modified) * code/trunk/src/modules/pong/PongBall.h (modified) * code/trunk/src/modules/pong/PongCenterpoint.cc (modified) * code/trunk/src/modules/pong/PongCenterpoint.h (modified) * code/trunk/src/modules/pong/PongPrecompiledHeaders.h (deleted) * code/trunk/src/modules/pong/PongPrereqs.h (modified) * code/trunk/src/modules/pong/PongScore.cc (modified) * code/trunk/src/modules/questsystem/QuestEffectBeacon.cc (modified) * code/trunk/src/modules/questsystem/QuestEffectBeacon.h (modified) * code/trunk/src/modules/questsystem/QuestGUI.cc (modified) * code/trunk/src/modules/questsystem/QuestManager.cc (modified) * code/trunk/src/modules/questsystem/QuestManager.h (modified) * code/trunk/src/modules/questsystem/QuestsystemPrecompiledHeaders.h (modified) * code/trunk/src/modules/questsystem/QuestsystemPrereqs.h (modified) * code/trunk/src/modules/questsystem/notifications/NotificationManager.cc (modified) * code/trunk/src/modules/questsystem/notifications/NotificationManager.h (modified) * code/trunk/src/modules/questsystem/notifications/NotificationQueue.cc (modified) * code/trunk/src/modules/weapons/MuzzleFlash.cc (modified) * code/trunk/src/modules/weapons/MuzzleFlash.h (modified) * code/trunk/src/modules/weapons/WeaponsPrereqs.h (modified) * code/trunk/src/modules/weapons/munitions/ReplenishingMunition.cc (modified) * code/trunk/src/modules/weapons/munitions/ReplenishingMunition.h (modified) * code/trunk/src/modules/weapons/projectiles/LightningGunProjectile.cc (modified) * code/trunk/src/modules/weapons/projectiles/LightningGunProjectile.h (modified) * code/trunk/src/modules/weapons/projectiles/ParticleProjectile.cc (modified) * code/trunk/src/modules/weapons/projectiles/Projectile.cc (modified) * code/trunk/src/modules/weapons/projectiles/Projectile.h (modified) * code/trunk/src/modules/weapons/weaponmodes/EnergyDrink.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/EnergyDrink.h (modified) * code/trunk/src/modules/weapons/weaponmodes/HsW01.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/HsW01.h (modified) * code/trunk/src/orxonox/CMakeLists.txt (modified) * code/trunk/src/orxonox/CameraManager.cc (modified) * code/trunk/src/orxonox/CameraManager.h (modified) * code/trunk/src/orxonox/Level.cc (modified) * code/trunk/src/orxonox/Level.h (modified) * code/trunk/src/orxonox/LevelManager.cc (modified) * code/trunk/src/orxonox/Main.cc (modified) * code/trunk/src/orxonox/OrxonoxPrereqs.h (modified) * code/trunk/src/orxonox/PawnManager.cc (modified) * code/trunk/src/orxonox/PlayerManager.cc (modified) * code/trunk/src/orxonox/PlayerManager.h (modified) * code/trunk/src/orxonox/Radar.cc (modified) * code/trunk/src/orxonox/Radar.h (modified) * code/trunk/src/orxonox/Scene.cc (modified) * code/trunk/src/orxonox/Scene.h (modified) * code/trunk/src/orxonox/Test.cc (modified) * code/trunk/src/orxonox/collisionshapes/CompoundCollisionShape.cc (modified) * code/trunk/src/orxonox/collisionshapes/WorldEntityCollisionShape.cc (modified) * code/trunk/src/orxonox/controllers/AIController.cc (modified) * code/trunk/src/orxonox/controllers/AIController.h (modified) * code/trunk/src/orxonox/controllers/ArtificialController.cc (modified) * code/trunk/src/orxonox/controllers/ArtificialController.h (modified) * code/trunk/src/orxonox/controllers/HumanController.cc (modified) * code/trunk/src/orxonox/controllers/HumanController.h (modified) * code/trunk/src/orxonox/controllers/WaypointController.cc (modified) * code/trunk/src/orxonox/controllers/WaypointPatrolController.cc (modified) * code/trunk/src/orxonox/controllers/WaypointPatrolController.h (modified) * code/trunk/src/orxonox/gamestates (copied) * code/trunk/src/orxonox/gamestates/CMakeLists.txt (copied) * code/trunk/src/orxonox/gamestates/GSClient.cc (copied) * code/trunk/src/orxonox/gamestates/GSClient.h (copied) * code/trunk/src/orxonox/gamestates/GSDedicated.cc (copied) * code/trunk/src/orxonox/gamestates/GSDedicated.h (copied) * code/trunk/src/orxonox/gamestates/GSDedicatedClient.cc (copied) * code/trunk/src/orxonox/gamestates/GSDedicatedClient.h (copied) * code/trunk/src/orxonox/gamestates/GSGraphics.cc (copied) * code/trunk/src/orxonox/gamestates/GSGraphics.h (copied) * code/trunk/src/orxonox/gamestates/GSIOConsole.cc (copied) * code/trunk/src/orxonox/gamestates/GSIOConsole.h (copied) * code/trunk/src/orxonox/gamestates/GSLevel.cc (copied) * code/trunk/src/orxonox/gamestates/GSLevel.h (copied) * code/trunk/src/orxonox/gamestates/GSMainMenu.cc (copied) * code/trunk/src/orxonox/gamestates/GSMainMenu.h (copied) * code/trunk/src/orxonox/gamestates/GSRoot.cc (copied) * code/trunk/src/orxonox/gamestates/GSRoot.h (copied) * code/trunk/src/orxonox/gamestates/GSServer.cc (copied) * code/trunk/src/orxonox/gamestates/GSServer.h (copied) * code/trunk/src/orxonox/gamestates/GSStandalone.cc (copied) * code/trunk/src/orxonox/gamestates/GSStandalone.h (copied) * code/trunk/src/orxonox/gametypes/Asteroids.cc (modified) * code/trunk/src/orxonox/gametypes/Gametype.cc (modified) * code/trunk/src/orxonox/gametypes/Gametype.h (modified) * code/trunk/src/orxonox/gametypes/TeamBaseMatch.cc (modified) * code/trunk/src/orxonox/gametypes/TeamBaseMatch.h (modified) * code/trunk/src/orxonox/gametypes/TeamDeathmatch.cc (modified) * code/trunk/src/orxonox/gametypes/UnderAttack.cc (modified) * code/trunk/src/orxonox/gametypes/UnderAttack.h (modified) * code/trunk/src/orxonox/graphics/CMakeLists.txt (modified) * code/trunk/src/orxonox/graphics/Camera.cc (modified) * code/trunk/src/orxonox/graphics/FadingBillboard.cc (modified) * code/trunk/src/orxonox/graphics/FadingBillboard.h (modified) * code/trunk/src/orxonox/graphics/ParticleEmitter.cc (modified) * code/trunk/src/orxonox/graphics/ParticleSpawner.cc (modified) * code/trunk/src/orxonox/graphics/ParticleSpawner.h (modified) * code/trunk/src/orxonox/infos/HumanPlayer.cc (modified) * code/trunk/src/orxonox/infos/PlayerInfo.cc (modified) * code/trunk/src/orxonox/infos/PlayerInfo.h (modified) * code/trunk/src/orxonox/interfaces/InterfaceCompilation.cc (modified) * code/trunk/src/orxonox/interfaces/NotificationListener.h (modified) * code/trunk/src/orxonox/interfaces/PawnListener.h (deleted) * code/trunk/src/orxonox/interfaces/RadarViewable.cc (modified) * code/trunk/src/orxonox/items/Engine.cc (modified) * code/trunk/src/orxonox/items/Engine.h (modified) * code/trunk/src/orxonox/items/MultiStateEngine.cc (modified) * code/trunk/src/orxonox/overlays/CMakeLists.txt (modified) * code/trunk/src/orxonox/overlays/InGameConsole.cc (modified) * code/trunk/src/orxonox/overlays/InGameConsole.h (modified) * code/trunk/src/orxonox/overlays/Map.cc (modified) * code/trunk/src/orxonox/overlays/OrxonoxOverlay.h (modified) * code/trunk/src/orxonox/overlays/OverlayGroup.cc (modified) * code/trunk/src/orxonox/pickup/DroppedItem.cc (modified) * code/trunk/src/orxonox/pickup/DroppedItem.h (modified) * code/trunk/src/orxonox/pickup/ModifierPickup.cc (modified) * code/trunk/src/orxonox/pickup/ModifierPickup.h (modified) * code/trunk/src/orxonox/pickup/PickupSpawner.cc (modified) * code/trunk/src/orxonox/pickup/PickupSpawner.h (modified) * code/trunk/src/orxonox/pickup/items/HealthImmediate.cc (modified) * code/trunk/src/orxonox/pickup/items/HealthUsable.cc (modified) * code/trunk/src/orxonox/pickup/items/Jump.cc (modified) * code/trunk/src/orxonox/sound/AmbientSound.cc (copied) * code/trunk/src/orxonox/sound/AmbientSound.h (copied) * code/trunk/src/orxonox/sound/BaseSound.cc (copied) * code/trunk/src/orxonox/sound/BaseSound.h (copied) * code/trunk/src/orxonox/sound/CMakeLists.txt (modified) * code/trunk/src/orxonox/sound/SoundBase.cc (deleted) * code/trunk/src/orxonox/sound/SoundBase.h (deleted) * code/trunk/src/orxonox/sound/SoundMainMenu.cc (deleted) * code/trunk/src/orxonox/sound/SoundMainMenu.h (deleted) * code/trunk/src/orxonox/sound/SoundManager.cc (modified) * code/trunk/src/orxonox/sound/SoundManager.h (modified) * code/trunk/src/orxonox/sound/WorldSound.cc (copied) * code/trunk/src/orxonox/sound/WorldSound.h (copied) * code/trunk/src/orxonox/weaponsystem/Munition.cc (modified) * code/trunk/src/orxonox/weaponsystem/Munition.h (modified) * code/trunk/src/orxonox/weaponsystem/Weapon.cc (modified) * code/trunk/src/orxonox/weaponsystem/Weapon.h (modified) * code/trunk/src/orxonox/weaponsystem/WeaponMode.cc (modified) * code/trunk/src/orxonox/weaponsystem/WeaponMode.h (modified) * code/trunk/src/orxonox/weaponsystem/WeaponPack.cc (modified) * code/trunk/src/orxonox/weaponsystem/WeaponSlot.cc (modified) * code/trunk/src/orxonox/weaponsystem/WeaponSystem.cc (modified) * code/trunk/src/orxonox/worldentities/BigExplosion.cc (modified) * code/trunk/src/orxonox/worldentities/BigExplosion.h (modified) * code/trunk/src/orxonox/worldentities/CameraPosition.cc (modified) * code/trunk/src/orxonox/worldentities/ControllableEntity.cc (modified) * code/trunk/src/orxonox/worldentities/ControllableEntity.h (modified) * code/trunk/src/orxonox/worldentities/ExplosionChunk.cc (modified) * code/trunk/src/orxonox/worldentities/ExplosionChunk.h (modified) * code/trunk/src/orxonox/worldentities/MovableEntity.cc (modified) * code/trunk/src/orxonox/worldentities/MovableEntity.h (modified) * code/trunk/src/orxonox/worldentities/SpawnPoint.cc (modified) * code/trunk/src/orxonox/worldentities/SpawnPoint.h (modified) * code/trunk/src/orxonox/worldentities/WorldEntity.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/Destroyer.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/Spectator.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/TeamBaseMatchBase.cc (modified) Merged core5 branch back to the trunk. Key features include clean ... Mon, 12 Oct 2009 15:38:40 GMT rgrieder [5928] * code/branches/core5/data/particle/ExplosionComp1.particle (modified) Fixed typo in a particle script. Sun, 11 Oct 2009 19:50:53 GMT rgrieder [5927] * code/branches/core5/src/libraries/core/PathConfig.cc (modified) Windows fix: Paths containing "fancy" stuff like '.' were not ... Fri, 09 Oct 2009 22:56:55 GMT scheusso [5926] * code/branches/core5/src/libraries/network/ServerConnection.cc (modified) more consistent client disconnection handling Fri, 09 Oct 2009 16:46:54 GMT rgrieder [5925] * code/branches/core5/src/libraries/core/GUIManager.h (modified) * code/branches/core5/src/libraries/core/GraphicsManager.cc (modified) * code/branches/core5/src/modules/objects/Planet.cc (modified) * code/branches/core5/src/orxonox/CameraManager.cc (modified) * code/branches/core5/src/orxonox/graphics/Camera.cc (modified) Reapplied some of the changes that got reverted in the last commit ... Fri, 09 Oct 2009 16:04:16 GMT scheusso [5924] * code/branches/core5/src/libraries/core/GUIManager.h (modified) * code/branches/core5/src/libraries/core/GraphicsManager.cc (modified) * code/branches/core5/src/modules/objects/Planet.cc (modified) * code/branches/core5/src/orxonox/CameraManager.cc (modified) * code/branches/core5/src/orxonox/CameraManager.h (modified) * code/branches/core5/src/orxonox/Scene.cc (modified) * code/branches/core5/src/orxonox/Scene.h (modified) * code/branches/core5/src/orxonox/graphics/Camera.cc (modified) reverted r5911 partially and removed fallbackcamera level scene now ... Fri, 09 Oct 2009 15:47:46 GMT rgrieder [5923] * code/trunk/cmake/PackageConfig.cmake (modified) Allowing multiple major dependency versions. Currently this is 3.1 ... Fri, 09 Oct 2009 15:15:14 GMT landauf [5922] * code/branches/core5/src/orxonox/gamestates/GSLevel.cc (modified) * code/branches/core5/src/orxonox/gamestates/GSLevel.h (modified) list of remaining objects after a level unloading Fri, 09 Oct 2009 15:09:26 GMT scheusso [5921] * code/branches/core5/src/libraries/core/input/InputManager.cc (modified) build fix for linux Fri, 09 Oct 2009 15:04:23 GMT scheusso [5920] * code/branches/core5/src/orxonox/gamestates/GSMainMenu.cc (modified) something went wrong with one of my commits Fri, 09 Oct 2009 15:00:22 GMT scheusso [5919] * code/branches/core5/src/libraries/network/Client.cc (modified) forgot to remove a debug line Fri, 09 Oct 2009 14:54:31 GMT scheusso [5918] * code/branches/core5/src/orxonox/gamestates/GSMainMenu.cc (modified) * code/branches/core5/src/orxonox/gamestates/GSMainMenu.h (modified) * code/branches/core5/src/orxonox/gamestates/GSRoot.cc (modified) * code/branches/core5/src/orxonox/gamestates/GSRoot.h (modified) 2 new console commands (startIOConsole, printObjects) Fri, 09 Oct 2009 14:44:50 GMT scheusso [5917] * code/branches/core5/src/orxonox/Test.cc (modified) * code/branches/core5/src/orxonox/collisionshapes/WorldEntityCollisionShape.cc (modified) * code/branches/core5/src/orxonox/gametypes/Gametype.cc (modified) * code/branches/core5/src/orxonox/gametypes/Gametype.h (modified) * code/branches/core5/src/orxonox/items/MultiStateEngine.cc (modified) * code/branches/core5/src/orxonox/weaponsystem/WeaponSlot.cc (modified) missing parts of last commit Fri, 09 Oct 2009 14:41:30 GMT scheusso [5916] * code/branches/core5/src/libraries/network/Client.cc (modified) * code/branches/core5/src/libraries/network/Client.h (modified) * code/branches/core5/src/libraries/network/ClientConnection.cc (modified) * code/branches/core5/src/libraries/network/ClientConnection.h (modified) * code/branches/core5/src/libraries/network/synchronisable/Synchronisable.cc (modified) * code/branches/core5/src/libraries/network/synchronisable/Synchronisable.h (modified) * code/branches/core5/src/modules/objects/triggers/Trigger.cc (modified) * code/branches/core5/src/orxonox/graphics/Camera.cc (modified) * code/branches/core5/src/orxonox/infos/HumanPlayer.cc (modified) * code/branches/core5/src/orxonox/worldentities/CameraPosition.cc (modified) * code/branches/core5/src/orxonox/worldentities/ControllableEntity.cc (modified) * code/branches/core5/src/orxonox/worldentities/SpawnPoint.cc (modified) * code/branches/core5/src/orxonox/worldentities/pawns/Spectator.cc (modified) some cleaning up in the network more to come