# # ChangeLog for / # # Generated by Trac 1.0.9 # Nov 25, 2024, 11:19:54 AM Thu, 22 May 2008 14:35:11 GMT scheusso [1379] * code/branches/network/bin/keybindings.ini (modified) * code/branches/network/src/network/ConnectionManager.cc (modified) * code/branches/network/src/network/ConnectionManager.h (modified) * code/branches/network/src/network/Server.cc (modified) * code/branches/network/src/network/Server.h (modified) * code/branches/network/src/orxonox/Orxonox.cc (modified) * code/branches/network/src/orxonox/Orxonox.h (modified) added command line argument --port Thu, 22 May 2008 14:24:32 GMT scheusso [1378] * code/branches/network/src/network/ClientInformation.cc (modified) * code/branches/network/src/network/ConnectionManager.cc (modified) * code/branches/network/src/network/ConnectionManager.h (modified) various enhancements with enet handling (serverside in connectionmanager) Thu, 22 May 2008 14:23:29 GMT dumenim [1377] * code/branches/network/src/network/Client.cc (modified) * code/branches/network/src/network/ClientConnection.cc (modified) * code/branches/network/src/network/ClientConnection.h (modified) some changes on clientside (replaces some enet_host_service with ... Thu, 22 May 2008 14:15:26 GMT FelixSchulthess [1376] * code/trunk/bin/keybindings.ini (modified) * code/trunk/bin/levels/sample.oxw (modified) modified level file Thu, 22 May 2008 14:01:09 GMT FelixSchulthess [1375] * code/trunk/src/orxonox/hud/HUD.cc (modified) minor change Thu, 22 May 2008 13:57:27 GMT FelixSchulthess [1374] * code/trunk/bin/keybindings.ini (modified) * code/trunk/src/orxonox/Orxonox.cc (modified) * code/trunk/src/orxonox/hud/HUD.cc (modified) * code/trunk/src/orxonox/hud/HUD.h (modified) added fps counter Thu, 22 May 2008 13:26:06 GMT rgrieder [1373] * code/branches/network/src/orxonox/hud/BarOverlayElement.cc (modified) * code/branches/network/src/orxonox/hud/RadarObject.cc (modified) * code/branches/network/src/orxonox/hud/RadarOverlayElement.cc (modified) * code/branches/network/visual_studio/vc8/orxonox.vcproj (modified) - HUD additions for msvc Thu, 22 May 2008 13:26:05 GMT FelixSchulthess [1372] * code/trunk/bin/keybindings.ini (modified) added keybinding tab for radar cycle Thu, 22 May 2008 13:12:46 GMT scheusso [1371] * code/branches/network (copied) create new network branch Thu, 22 May 2008 13:12:26 GMT scheusso [1370] * code/branches/merge (deleted) delete merge Thu, 22 May 2008 13:12:10 GMT scheusso [1369] * code/branches/FICN (deleted) delete ficn Thu, 22 May 2008 13:11:56 GMT scheusso [1368] * code/branches/network3 (deleted) delete network3 Thu, 22 May 2008 13:11:46 GMT scheusso [1367] * code/branches/network2 (deleted) delete network2 Thu, 22 May 2008 13:11:32 GMT scheusso [1366] * code/branches/network (deleted) delete old branch Thu, 22 May 2008 13:09:55 GMT scheusso [1365] * code/branches/network/trunk (copied) create new network branch Thu, 22 May 2008 13:03:14 GMT rgrieder [1364] * code/trunk/bin/keybindings.ini (modified) changed line endings in keybindings.ini Thu, 22 May 2008 12:57:24 GMT scheusso [1363] * code/trunk/src/orxonox/hud/BarOverlayElement.cc~ (deleted) * code/trunk/src/orxonox/hud/BarOverlayElement.h~ (deleted) * code/trunk/src/orxonox/hud/OverlayElementFactories.h~ (deleted) * code/trunk/src/orxonox/hud/RadarOverlayElement.cc~ (deleted) * code/trunk/src/orxonox/hud/RadarOverlayElement.h~ (deleted) removed backup files Thu, 22 May 2008 12:56:48 GMT scheusso [1362] * code/trunk/bin/keybindings.ini (modified) * code/trunk/bin/levels/sample.oxw (modified) * code/trunk/src/orxonox/CMakeLists.txt (modified) * code/trunk/src/orxonox/Orxonox.cc (modified) * code/trunk/src/orxonox/console/InGameConsole.cc (modified) * code/trunk/src/orxonox/hud/BarOverlayElement.cc (copied) * code/trunk/src/orxonox/hud/BarOverlayElement.cc~ (copied) * code/trunk/src/orxonox/hud/BarOverlayElement.h (copied) * code/trunk/src/orxonox/hud/BarOverlayElement.h~ (copied) * code/trunk/src/orxonox/hud/HUD.cc (modified) * code/trunk/src/orxonox/hud/HUD.h (modified) * code/trunk/src/orxonox/hud/OverlayElementFactories.h (copied) * code/trunk/src/orxonox/hud/OverlayElementFactories.h~ (copied) * code/trunk/src/orxonox/hud/RadarObject.cc (copied) * code/trunk/src/orxonox/hud/RadarObject.h (copied) * code/trunk/src/orxonox/hud/RadarOverlayElement.cc (copied) * code/trunk/src/orxonox/hud/RadarOverlayElement.cc~ (copied) * code/trunk/src/orxonox/hud/RadarOverlayElement.h (copied) * code/trunk/src/orxonox/hud/RadarOverlayElement.h~ (copied) * code/trunk/src/orxonox/objects/SpaceShip.cc (modified) * code/trunk/src/orxonox/objects/SpaceShip.h (modified) merged hud3 branch into trunk and changed camera orientation Thu, 22 May 2008 12:09:33 GMT scheusso [1361] * code/branches/merge/src/network/ClientInformation.cc (modified) * code/branches/merge/src/network/ClientInformation.h (modified) * code/branches/merge/src/network/ConnectionManager.cc (modified) * code/branches/merge/src/network/GameStateClient.cc (modified) * code/branches/merge/src/network/GameStateClient.h (modified) * code/branches/merge/src/network/GameStateManager.cc (modified) * code/branches/merge/src/network/PacketManager.h (modified) * code/branches/merge/src/network/Synchronisable.cc (modified) * code/branches/merge/src/orxonox/objects/WorldEntity.cc (modified) reverted some changes from previous version Thu, 22 May 2008 12:02:06 GMT rgrieder [1360] * code/trunk/src/network/Client.cc (modified) * code/trunk/src/network/ClientInformation.cc (modified) * code/trunk/src/network/ClientInformation.h (modified) * code/trunk/src/network/ConnectionManager.cc (modified) * code/trunk/src/network/GameStateClient.cc (modified) * code/trunk/src/network/GameStateClient.h (modified) * code/trunk/src/network/GameStateManager.cc (modified) * code/trunk/src/network/NetworkPrereqs.h (modified) * code/trunk/src/network/PacketBuffer.cc (modified) * code/trunk/src/network/PacketBuffer.h (modified) * code/trunk/src/network/PacketDecoder.cc (modified) * code/trunk/src/network/PacketGenerator.cc (modified) * code/trunk/src/network/PacketManager.h (modified) * code/trunk/src/network/Server.cc (modified) * code/trunk/src/network/Synchronisable.cc (modified) * code/trunk/src/network/diffTest.cc (modified) * code/trunk/src/orxonox/OrxonoxPlatform.h (modified) * code/trunk/src/orxonox/objects/Projectile.cc (modified) * code/trunk/src/orxonox/objects/SpaceShip.cc (modified) * code/trunk/src/orxonox/objects/SpaceShip.h (modified) * code/trunk/src/orxonox/objects/WorldEntity.cc (modified) merged merge branch back to trunk Thu, 22 May 2008 11:34:23 GMT FelixSchulthess [1359] * code/branches/hud3/src/orxonox/hud/HUD.cc (modified) minor fix Thu, 22 May 2008 11:24:20 GMT FelixSchulthess [1358] * code/branches/hud3/src/orxonox/hud/RadarOverlayElement.cc (modified) added console command cycleFocus to cycle through radar objects Thu, 22 May 2008 11:10:56 GMT FelixSchulthess [1357] * code/branches/hud3/src/orxonox/hud/RadarOverlayElement.cc (modified) fixed small but stupid problem with arctan Thu, 22 May 2008 11:05:53 GMT FelixSchulthess [1356] * code/branches/hud3/bin/levels/sample.oxw (modified) * code/branches/hud3/src/orxonox/hud/HUD.cc (modified) * code/branches/hud3/src/orxonox/hud/HUD.h (modified) * code/branches/hud3/src/orxonox/hud/RadarOverlayElement.cc (modified) * code/branches/hud3/src/orxonox/hud/RadarOverlayElement.h (modified) added distance display Thu, 22 May 2008 09:53:19 GMT scheusso [1355] * code/branches/merge/src/network/ClientInformation.cc (modified) * code/branches/merge/src/network/ClientInformation.h (modified) * code/branches/merge/src/network/ConnectionManager.cc (modified) * code/branches/merge/src/network/GameStateClient.cc (modified) * code/branches/merge/src/network/GameStateClient.h (modified) * code/branches/merge/src/network/GameStateManager.cc (modified) * code/branches/merge/src/network/PacketManager.h (modified) * code/branches/merge/src/network/Synchronisable.cc (modified) * code/branches/merge/src/orxonox/objects/WorldEntity.cc (modified) some enhanced enet usage (gamestates are not reliable anymore - we ... Thu, 22 May 2008 08:29:04 GMT FelixSchulthess [1354] * code/branches/hud3/src/orxonox/hud/RadarOverlayElement.cc (modified) nothing changed... Thu, 22 May 2008 08:00:18 GMT FelixSchulthess [1353] * code/branches/hud3/src/orxonox/hud/RadarOverlayElement.cc (modified) * code/branches/hud3/src/orxonox/hud/RadarOverlayElement.h (modified) minor enhancement Thu, 22 May 2008 07:14:57 GMT FelixSchulthess [1352] * code/branches/hud3/bin/levels/sample.oxw (modified) * code/branches/hud3/src/orxonox/hud/HUD.cc (modified) minor changes Wed, 21 May 2008 23:18:18 GMT landauf [1351] * code/branches/console/src/core/CommandEvaluation.cc (modified) * code/branches/console/src/core/CommandEvaluation.h (modified) * code/branches/console/src/core/CommandExecutor.cc (modified) * code/branches/console/src/core/CommandExecutor.h (modified) changed large parts of CommandExecutor and CommandEvaluation. very ... Wed, 21 May 2008 21:00:40 GMT FelixSchulthess [1350] * code/branches/hud3/src/orxonox/hud/HUD.cc (modified) * code/branches/hud3/src/orxonox/hud/RadarOverlayElement.cc (modified) * code/branches/hud3/src/orxonox/hud/RadarOverlayElement.h (modified) added a navigation marker Wed, 21 May 2008 19:07:08 GMT rgrieder [1349] * code/trunk/bin/keybindings.ini (modified) * code/trunk/src/core/CommandExecutor.cc (modified) * code/trunk/src/core/CommandExecutor.h (modified) * code/trunk/src/core/CorePrereqs.h (modified) * code/trunk/src/core/Executor.cc (modified) * code/trunk/src/core/Executor.h (modified) * code/trunk/src/core/InputBuffer.cc (modified) * code/trunk/src/core/InputBuffer.h (modified) * code/trunk/src/core/InputHandler.cc (modified) * code/trunk/src/core/InputHandler.h (modified) * code/trunk/src/core/InputInterfaces.h (modified) * code/trunk/src/core/InputManager.cc (modified) * code/trunk/src/core/InputManager.h (modified) * code/trunk/src/core/SignalHandler.cc (modified) * code/trunk/src/ois/OISJoyStick.cpp (modified) * code/trunk/src/ois/OISJoyStick.h (modified) * code/trunk/src/ois/OISKeyboard.cpp (modified) * code/trunk/src/ois/OISKeyboard.h (modified) * code/trunk/src/ois/OISMouse.h (modified) * code/trunk/src/ois/OISObject.h (modified) * code/trunk/src/ois/linux/LinuxKeyboard.cpp (modified) * code/trunk/src/ois/linux/LinuxKeyboard.h (modified) * code/trunk/src/ois/mac/MacKeyboard.cpp (modified) * code/trunk/src/ois/mac/MacKeyboard.h (modified) * code/trunk/src/ois/win32/Win32JoyStick.cpp (modified) * code/trunk/src/ois/win32/Win32KeyBoard.cpp (modified) * code/trunk/src/ois/win32/Win32KeyBoard.h (modified) * code/trunk/src/orxonox/GraphicsEngine.cc (modified) * code/trunk/src/orxonox/Orxonox.cc (modified) * code/trunk/src/orxonox/objects/SpaceShip.cc (modified) * code/trunk/src/orxonox/objects/SpaceShip.h (modified) * code/trunk/src/util/Math.h (modified) * code/trunk/src/util/SubString.cc (modified) * code/trunk/src/util/SubString.h (modified) - merged input branch back to trunk Wed, 21 May 2008 19:05:12 GMT rgrieder [1348] * code/branches/input/src/core/InputHandler.cc (modified) removed debug ouput Wed, 21 May 2008 18:56:31 GMT rgrieder [1347] * code/branches/input/src/core/InputHandler.cc (modified) * code/branches/input/src/core/InputHandler.h (modified) - gcc knows more... Wed, 21 May 2008 18:20:58 GMT FelixSchulthess [1346] * code/branches/hud3/src/orxonox/CMakeLists.txt (modified) * code/branches/hud3/src/orxonox/hud/RadarObject.cc (added) * code/branches/hud3/src/orxonox/hud/RadarObject.h (added) * code/branches/hud3/src/orxonox/hud/RadarOverlayElement.cc (modified) * code/branches/hud3/src/orxonox/hud/RadarOverlayElement.h (modified) splitted two classes in two files Wed, 21 May 2008 18:09:03 GMT rgrieder [1345] * code/branches/input/bin/keybindings.ini (modified) * code/branches/input/src/core/InputManager.cc (modified) * code/branches/input/src/orxonox/GraphicsEngine.cc (modified) * code/branches/input/visual_studio/vc8/orxonox.vcproj (modified) - commented silly key bindings Wed, 21 May 2008 16:26:15 GMT rgrieder [1344] * code/branches/input/bin/keybindings.ini (modified) * code/branches/input/src/core/InputHandler.cc (modified) * code/branches/input/src/core/InputHandler.h (modified) * code/branches/input/src/util/Math.h (modified) - added scroll wheel support - improved mouse input handling - ... Wed, 21 May 2008 14:41:13 GMT FelixSchulthess [1343] * code/branches/hud3/src/orxonox/hud/RadarOverlayElement.cc (modified) * code/branches/hud3/src/orxonox/hud/RadarOverlayElement.h (modified) finally: the radar dots move continiously Wed, 21 May 2008 10:57:10 GMT FelixSchulthess [1342] * code/branches/hud3/src/orxonox/hud/BarOverlayElement.cc (modified) * code/branches/hud3/src/orxonox/hud/BarOverlayElement.cc~ (modified) * code/branches/hud3/src/orxonox/hud/BarOverlayElement.h (modified) * code/branches/hud3/src/orxonox/hud/BarOverlayElement.h~ (modified) * code/branches/hud3/src/orxonox/hud/HUD.cc (modified) * code/branches/hud3/src/orxonox/hud/RadarOverlayElement.cc (modified) * code/branches/hud3/src/orxonox/hud/RadarOverlayElement.cc~ (modified) removed some warnings caused by implicit conversion Tue, 20 May 2008 23:33:42 GMT landauf [1341] * code/branches/console/src/core/CMakeLists.txt (modified) * code/branches/console/src/core/CommandEvaluation.cc (added) * code/branches/console/src/core/CommandEvaluation.h (added) * code/branches/console/src/core/CommandExecutor.cc (modified) * code/branches/console/src/core/CommandExecutor.h (modified) * code/branches/console/src/core/ConfigFileManager.cc (modified) * code/branches/console/src/core/ConsoleCommand.h (modified) * code/branches/console/src/core/ConsoleCommandCompilation.cc (added) * code/branches/console/src/core/ConsoleCommandCompilation.h (added) * code/branches/console/src/core/CorePrereqs.h (modified) * code/branches/console/src/core/Executor.cc (modified) * code/branches/console/src/core/Executor.h (modified) * code/branches/console/src/core/IRC.cc (modified) * code/branches/console/src/core/Identifier.cc (modified) * code/branches/console/src/core/Identifier.h (modified) * code/branches/console/src/core/InputManager.cc (modified) * code/branches/console/src/core/OutputHandler.cc (modified) * code/branches/console/src/core/TclBind.cc (modified) * code/branches/console/src/core/TclThreadManager.cc (modified) * code/branches/console/src/core/XMLPort.h (modified) * code/branches/console/src/orxonox/Orxonox.cc (modified) * code/branches/console/src/orxonox/console/InGameConsole.cc (modified) * code/branches/console/src/orxonox/objects/Ambient.cc (modified) * code/branches/console/src/orxonox/objects/SpaceShip.cc (modified) * code/branches/console/src/orxonox/tools/Timer.cc (modified) * code/branches/console/src/orxonox/tools/Timer.h (modified) big commit, but not much changes in code: - put CommandEvaluation ... Tue, 20 May 2008 22:23:29 GMT rgrieder [1340] * code/branches/input/bin/keybindings.ini (modified) * code/branches/input/src/core/CommandExecutor.h (modified) * code/branches/input/src/core/CorePrereqs.h (modified) * code/branches/input/src/core/Executor.cc (modified) * code/branches/input/src/core/Executor.h (modified) * code/branches/input/src/core/InputBuffer.cc (modified) * code/branches/input/src/core/InputBuffer.h (modified) * code/branches/input/src/core/InputHandler.cc (modified) * code/branches/input/src/core/InputHandler.h (modified) * code/branches/input/src/core/InputInterfaces.h (modified) * code/branches/input/src/core/InputManager.cc (modified) * code/branches/input/src/orxonox/Orxonox.cc (modified) * code/branches/input/src/orxonox/objects/SpaceShip.cc (modified) * code/branches/input/src/orxonox/objects/SpaceShip.h (modified) - tried a more object oriented approach for the KeyBinder - things ... Tue, 20 May 2008 21:51:33 GMT FelixSchulthess [1339] * code/branches/hud3/bin/levels/sample.oxw (modified) * code/branches/hud3/src/orxonox/hud/HUD.cc (modified) * code/branches/hud3/src/orxonox/hud/RadarOverlayElement.cc (modified) * code/branches/hud3/src/orxonox/hud/RadarOverlayElement.h (modified) * code/branches/hud3/src/orxonox/objects/SpaceShip.cc (modified) added full functionality for RadarObjects and two space tomatoes Tue, 20 May 2008 20:56:35 GMT landauf [1338] * code/branches/console/src/orxonox/console/InGameConsole.cc (modified) renamed the overlay-elements in InGameConsole to more specific names Tue, 20 May 2008 17:08:57 GMT landauf [1337] * code/branches/console/cmake/FindBoost.cmake (modified) * code/branches/console/src/core/TclThreadManager.cc (modified) * code/branches/console/src/core/TclThreadManager.h (modified) TclThreadManager should now work with old and new versions of boost. ... Tue, 20 May 2008 15:58:37 GMT scheusso [1336] * code/branches/merge/src/network/PacketDecoder.cc (modified) * code/branches/merge/src/network/PacketGenerator.cc (modified) * code/branches/merge/src/network/PacketManager.h (modified) added crc checksum testing for submitted gamestates (can also be used ... Tue, 20 May 2008 11:38:30 GMT FelixSchulthess [1335] * code/branches/hud3/src/orxonox/hud/HUD.cc (modified) * code/branches/hud3/src/orxonox/hud/HUD.h (modified) * code/branches/hud3/src/orxonox/hud/RadarOverlayElement.cc (modified) * code/branches/hud3/src/orxonox/hud/RadarOverlayElement.cc~ (modified) * code/branches/hud3/src/orxonox/hud/RadarOverlayElement.h (modified) * code/branches/hud3/src/orxonox/hud/RadarOverlayElement.h~ (modified) edited radar to support multiple radar objects, wip though Mon, 19 May 2008 23:48:40 GMT landauf [1334] * code/branches/console/src/core/InputBuffer.cc (modified) * code/branches/console/src/core/OutputBuffer.cc (modified) * code/branches/console/src/core/Script.cc (modified) * code/branches/console/src/core/Shell.cc (modified) * code/branches/console/src/core/Shell.h (modified) * code/branches/console/src/orxonox/Orxonox.cc (modified) * code/branches/console/src/orxonox/Orxonox.h (modified) * code/branches/console/src/orxonox/console/InGameConsole.cc (modified) - added colored output in the InGameConsole, depending on the output ... Mon, 19 May 2008 22:09:08 GMT scheusso [1333] * code/branches/merge/src/network/GameStateClient.cc (modified) added some null-return-pointer handling in GameStateClient Mon, 19 May 2008 21:56:43 GMT FelixSchulthess [1332] * code/branches/hud3/src/orxonox/CMakeLists.txt (modified) * code/branches/hud3/src/orxonox/hud/HUD.cc (modified) a very good version to check in... Mon, 19 May 2008 21:21:55 GMT FelixSchulthess [1331] * code/branches/hud3/src/orxonox/CMakeLists.txt (modified) * code/branches/hud3/src/orxonox/hud/HUD.cc (modified) bug Mon, 19 May 2008 20:58:51 GMT FelixSchulthess [1330] * code/branches/hud3/src/orxonox/hud/BarV1.cc (deleted) * code/branches/hud3/src/orxonox/hud/BarV1.h (deleted) * code/branches/hud3/src/orxonox/hud/HUD.cc (modified) * code/branches/hud3/src/orxonox/hud/HUDV2.cc (deleted) * code/branches/hud3/src/orxonox/hud/HUDV2.h (deleted) removed old files Mon, 19 May 2008 20:51:53 GMT FelixSchulthess [1329] * code/branches/hud3/src/orxonox/hud/BarOverlayElement.cc (modified) * code/branches/hud3/src/orxonox/hud/BarOverlayElement.h (modified) * code/branches/hud3/src/orxonox/hud/HUD.cc (modified) * code/branches/hud3/src/orxonox/hud/RadarOverlayElement.cc (modified) * code/branches/hud3/src/orxonox/hud/RadarOverlayElement.h (modified) progress bars now resize automatically and have a new look Mon, 19 May 2008 19:39:23 GMT FelixSchulthess [1328] * code/branches/hud3/src/orxonox/hud/BarOverlayElement.cc (modified) * code/branches/hud3/src/orxonox/hud/BarOverlayElement.h (modified) * code/branches/hud3/src/orxonox/hud/HUD.cc (modified) * code/branches/hud3/src/orxonox/hud/HUD.h (modified) * code/branches/hud3/src/orxonox/hud/OverlayElementFactories.h (modified) * code/branches/hud3/src/orxonox/hud/RadarOverlayElement.cc (modified) * code/branches/hud3/src/orxonox/hud/RadarOverlayElement.h (modified) edited bar, removed smartbar and replaced functionality with a ... Mon, 19 May 2008 19:00:17 GMT landauf [1327] * code/branches/console/src/core/ConfigValueContainer.cc (modified) * code/branches/console/src/core/Shell.cc (modified) * code/branches/console/src/orxonox/console/InGameConsole.cc (modified) sync with notebook Mon, 19 May 2008 14:37:06 GMT landauf [1326] * code/branches/console/src/core/CoreSettings.cc (modified) * code/branches/console/src/core/CoreSettings.h (modified) * code/branches/console/src/core/Shell.cc (modified) * code/branches/console/src/core/Shell.h (modified) fixed crash when displaying debug-level 4 and 5 in the InGameConsole. ... Mon, 19 May 2008 13:54:50 GMT landauf [1325] * code/branches/console/src/core/ConfigValueContainer.cc (modified) * code/branches/console/src/core/ConfigValueContainer.h (modified) * code/branches/console/src/core/Shell.cc (modified) * code/branches/console/src/util/MultiTypePrimitive.h (modified) * code/branches/console/src/util/MultiTypeString.h (modified) removed bug in ConfigValueContainer with default-vector with size ... Mon, 19 May 2008 12:58:22 GMT landauf [1324] * code/branches/console/src/core/ConfigValueContainer.cc (modified) * code/branches/console/src/core/ConfigValueContainer.h (modified) * code/branches/console/src/core/ConfigValueIncludes.h (modified) * code/branches/console/src/core/Shell.cc (modified) * code/branches/console/src/util/Math.h (modified) Added a command-history to the console. you can scroll through all ... Mon, 19 May 2008 08:50:09 GMT rgrieder [1323] * code/branches/input/bin/keybindings.ini (modified) * code/branches/input/src/core/CommandExecutor.cc (modified) * code/branches/input/src/core/CommandExecutor.h (modified) * code/branches/input/src/core/CorePrereqs.h (modified) * code/branches/input/src/core/Executor.h (modified) * code/branches/input/src/core/InputBuffer.cc (modified) * code/branches/input/src/core/InputBuffer.h (modified) * code/branches/input/src/core/InputHandler.cc (modified) * code/branches/input/src/core/InputHandler.h (modified) * code/branches/input/src/core/InputInterfaces.h (modified) * code/branches/input/src/core/InputManager.cc (modified) * code/branches/input/src/core/InputManager.h (modified) * code/branches/input/src/core/SignalHandler.cc (modified) * code/branches/input/src/orxonox/objects/SpaceShip.cc (modified) * code/branches/input/src/orxonox/objects/SpaceShip.h (modified) * code/branches/input/src/util/Math.h (modified) * code/branches/input/src/util/SubString.cc (modified) * code/branches/input/src/util/SubString.h (modified) * code/branches/input/visual_studio/vc8/network.vcproj (modified) * code/branches/input/visual_studio/vc8/orxonox.vcproj (modified) Basically, almost everything about the input management is written, ... Mon, 19 May 2008 00:33:09 GMT landauf [1322] * code/branches/console/src/core/InputBuffer.h (modified) * code/branches/console/src/core/InputHandler.cc (modified) * code/branches/console/src/core/InputManager.cc (modified) * code/branches/console/src/core/OutputBuffer.cc (modified) * code/branches/console/src/core/OutputBuffer.h (modified) * code/branches/console/src/core/OutputHandler.cc (modified) * code/branches/console/src/core/Shell.cc (modified) * code/branches/console/src/core/Shell.h (modified) * code/branches/console/src/orxonox/console/InGameConsole.cc (modified) * code/branches/console/src/orxonox/console/InGameConsole.h (modified) The InGameConsole is now using the new Shell. There's a clear ... Mon, 19 May 2008 00:20:56 GMT landauf [1321] * code/branches/console/src/core/ConfigValueContainer.cc (modified) * code/branches/console/src/core/ConfigValueContainer.h (modified) changed ConfigValueContainer to use MultiTypeMath::assimilate and ... Mon, 19 May 2008 00:18:55 GMT landauf [1320] * code/branches/console/src/util/MultiTypeMath.cc (modified) * code/branches/console/src/util/MultiTypeMath.h (modified) * code/branches/console/src/util/MultiTypePrimitive.cc (modified) * code/branches/console/src/util/MultiTypePrimitive.h (modified) * code/branches/console/src/util/MultiTypeString.cc (modified) * code/branches/console/src/util/MultiTypeString.h (modified) changed the previously implemented assimilate function to take an ... Sun, 18 May 2008 22:55:41 GMT landauf [1319] * code/branches/console/src/util/Convert.h (modified) * code/branches/console/src/util/MultiType.h (modified) * code/branches/console/src/util/MultiTypeMath.cc (modified) * code/branches/console/src/util/MultiTypeMath.h (modified) * code/branches/console/src/util/MultiTypePrimitive.cc (modified) * code/branches/console/src/util/MultiTypePrimitive.h (modified) * code/branches/console/src/util/MultiTypeString.cc (modified) * code/branches/console/src/util/MultiTypeString.h (modified) added support for Vector4 to MultiTypeMath and added a new function ... Sun, 18 May 2008 20:00:17 GMT scheusso [1318] * code/branches/merge/src/network/ClientInformation.cc (modified) * code/branches/merge/src/network/ClientInformation.h (modified) * code/branches/merge/src/network/ConnectionManager.cc (modified) * code/branches/merge/src/network/PacketBuffer.cc (modified) * code/branches/merge/src/network/PacketBuffer.h (modified) * code/branches/merge/src/network/Server.cc (modified) * code/branches/merge/src/orxonox/objects/SpaceShip.cc (modified) * code/branches/merge/src/orxonox/objects/SpaceShip.h (modified) made clientinformation threadsafe and improved packetbuffer; wrote a ... Sat, 17 May 2008 23:28:08 GMT landauf [1317] * code/branches/console/src/core/InputBuffer.cc (modified) * code/branches/console/src/core/Shell.cc (modified) * code/branches/console/src/core/Shell.h (modified) * code/branches/console/src/orxonox/Orxonox.cc (modified) * code/branches/console/src/orxonox/Orxonox.h (modified) * code/branches/console/src/orxonox/console/InGameConsole.cc (modified) * code/branches/console/src/orxonox/console/InGameConsole.h (modified) changed some parts of InGameConsole to make it work with Shell, but I ... Sat, 17 May 2008 18:35:50 GMT rgrieder [1316] * code/trunk/media_r1700 (added) * code/trunk/visual_studio/vc8/network.vcproj (modified) - added simple media repository info file - fixed msvc release build Sat, 17 May 2008 13:53:27 GMT FelixSchulthess [1315] * code/branches/hud3/src/orxonox/hud/HUD.cc (modified) * code/branches/hud3/src/orxonox/objects/SpaceShip.cc (modified) svn save Sat, 17 May 2008 13:05:27 GMT FelixSchulthess [1314] * code/branches/hud3/src/orxonox/hud/BarOverlayElement.cc (modified) * code/branches/hud3/src/orxonox/hud/BarOverlayElement.h (modified) * code/branches/hud3/src/orxonox/hud/HUD.cc (modified) * code/branches/hud3/src/orxonox/hud/HUD.h (modified) * code/branches/hud3/src/orxonox/hud/RadarOverlayElement.cc (modified) * code/branches/hud3/src/orxonox/hud/RadarOverlayElement.h (modified) * code/branches/hud3/src/orxonox/objects/SpaceShip.cc (modified) * code/branches/hud3/src/orxonox/objects/SpaceShip.h (modified) added speedometer. Sat, 17 May 2008 01:58:19 GMT landauf [1313] * code/branches/console/src/core/CMakeLists.txt (modified) * code/branches/console/src/core/ClassManager.h (modified) * code/branches/console/src/core/ConfigValueContainer.cc (modified) * code/branches/console/src/core/ConfigValueContainer.h (modified) * code/branches/console/src/core/CorePrereqs.h (modified) * code/branches/console/src/core/Identifier.h (modified) * code/branches/console/src/core/InputBuffer.cc (modified) * code/branches/console/src/core/InputBuffer.h (modified) * code/branches/console/src/core/InputHandler.cc (modified) * code/branches/console/src/core/Iterator.h (modified) * code/branches/console/src/core/Language.cc (modified) * code/branches/console/src/core/Language.h (modified) * code/branches/console/src/core/OrxonoxClass.cc (modified) * code/branches/console/src/core/OrxonoxClass.h (modified) * code/branches/console/src/core/OutputBuffer.cc (modified) * code/branches/console/src/core/OutputBuffer.h (modified) * code/branches/console/src/core/OutputHandler.cc (modified) * code/branches/console/src/core/OutputHandler.h (modified) * code/branches/console/src/core/Shell.cc (modified) * code/branches/console/src/core/Shell.h (modified) * code/branches/console/src/orxonox/Orxonox.cc (modified) * code/branches/console/src/orxonox/console/InGameConsole.cc (modified) - implemented Shell, but not yet linked with the graphical console ... Fri, 16 May 2008 16:03:46 GMT landauf [1312] * code/branches/console/src/core/CMakeLists.txt (modified) * code/branches/console/src/core/CorePrereqs.h (modified) * code/branches/console/src/core/InputBuffer.cc (modified) * code/branches/console/src/core/InputBuffer.h (modified) * code/branches/console/src/core/OutputBuffer.cc (added) * code/branches/console/src/core/OutputBuffer.h (added) * code/branches/console/src/core/Shell.cc (added) * code/branches/console/src/core/Shell.h (added) changed InputBuffer, added OutputBuffer and made a first sketch of Shell. Fri, 16 May 2008 16:00:33 GMT FelixSchulthess [1311] * code/branches/hud3/src/orxonox/hud/RadarOverlayElement.cc (modified) repositioned hud layout Fri, 16 May 2008 15:57:05 GMT FelixSchulthess [1310] * code/branches/hud3/src/orxonox/hud/HUD.cc (modified) * code/branches/hud3/src/orxonox/hud/RadarOverlayElement.cc (modified) * code/branches/hud3/src/orxonox/hud/RadarOverlayElement.h (modified) * code/branches/hud3/src/orxonox/objects/SpaceShip.cc (modified) * code/branches/hud3/src/orxonox/objects/SpaceShip.h (modified) repositioned hud layout Fri, 16 May 2008 14:39:32 GMT FelixSchulthess [1309] * code/branches/hud3/bin/levels/sample.oxw (modified) * code/branches/hud3/src/orxonox/CMakeLists.txt (modified) * code/branches/hud3/src/orxonox/hud/RadarOverlayElement.cc.mine (deleted) * code/branches/hud3/src/orxonox/hud/RadarOverlayElement.cc.r1099 (deleted) * code/branches/hud3/src/orxonox/hud/RadarOverlayElement.cc.r1248 (deleted) removed strange files Fri, 16 May 2008 09:27:09 GMT FelixSchulthess [1308] * code/branches/hud3/bin/levels/sample.oxw (modified) * code/branches/hud3/src/orxonox/hud/HUD.h (modified) * code/branches/hud3/src/orxonox/hud/RadarOverlayElement.cc (modified) * code/branches/hud3/src/orxonox/hud/RadarOverlayElement.cc~ (modified) * code/branches/hud3/src/orxonox/hud/RadarOverlayElement.h (modified) * code/branches/hud3/src/orxonox/objects/SpaceShip.cc (modified) dot on radar moves now, but not continious (nonsatisfying) Thu, 15 May 2008 21:38:47 GMT bknecht [1307] * code/branches/script_trigger/bin/levels/sample.oxw (modified) * code/branches/script_trigger/src/core/CMakeLists.txt (modified) * code/branches/script_trigger/src/core/Loader.cc (modified) * code/branches/script_trigger/src/core/tolua/tolua.pkg (modified) * code/branches/script_trigger/src/orxonox/CMakeLists.txt (modified) created Script object and renamed old Script class to LuaBind Thu, 15 May 2008 21:33:46 GMT scheusso [1306] * code/branches/merge/src/network/Server.cc (modified) * code/branches/merge/src/network/Synchronisable.cc (modified) * code/branches/merge/src/orxonox/objects/Projectile.cc (modified) * code/branches/merge/src/orxonox/objects/SpaceShip.cc (modified) found a 'bug' in projectile - we set the networkid now everytime in ... Thu, 15 May 2008 21:00:06 GMT scheusso [1305] * code/branches/merge/src/network/ConnectionManager.cc (modified) * code/branches/merge/src/network/Synchronisable.cc (modified) * code/branches/merge/src/orxonox/objects/WorldEntity.cc (modified) bugfix in createship in connectionmanager/register more variables in ... Thu, 15 May 2008 20:35:14 GMT rgrieder [1304] * code/branches/input/src/ois/OISJoyStick.cpp (modified) * code/branches/input/src/ois/OISJoyStick.h (modified) * code/branches/input/src/ois/OISKeyboard.cpp (modified) * code/branches/input/src/ois/OISKeyboard.h (modified) * code/branches/input/src/ois/OISMouse.h (modified) * code/branches/input/src/ois/OISObject.h (modified) * code/branches/input/src/ois/linux/LinuxKeyboard.cpp (modified) * code/branches/input/src/ois/linux/LinuxKeyboard.h (modified) * code/branches/input/src/ois/mac/MacKeyboard.cpp (modified) * code/branches/input/src/ois/mac/MacKeyboard.h (modified) * code/branches/input/src/ois/win32/Win32JoyStick.cpp (modified) * code/branches/input/src/ois/win32/Win32KeyBoard.cpp (modified) * code/branches/input/src/ois/win32/Win32KeyBoard.h (modified) - updated OIS to the recent most v1.2 CVS checkout Thu, 15 May 2008 20:30:16 GMT scheusso [1303] * code/branches/merge/src/network/GameStateClient.cc (modified) enhanced gamestate loading (abort if data corrupted ;) ) Thu, 15 May 2008 20:10:47 GMT FelixSchulthess [1302] * code/branches/hud3/src/orxonox/hud/HUD.cc (modified) * code/branches/hud3/src/orxonox/hud/HUD.h (modified) * code/branches/hud3/src/orxonox/hud/OverlayElementFactories.h (modified) * code/branches/hud3/src/orxonox/hud/RadarOverlayElement.cc (modified) * code/branches/hud3/src/orxonox/hud/RadarOverlayElement.h (modified) * code/branches/hud3/src/orxonox/objects/SpaceShip.h (modified) using vectors instead of integers now Thu, 15 May 2008 20:10:11 GMT rgrieder [1301] * code/trunk/src/util/Sleep.h (modified) - see previous message- changed sleep macros to inline functions ... Thu, 15 May 2008 20:09:23 GMT rgrieder [1300] * code/branches/input/src/util/Sleep.h (modified) - changed sleep macros to inline functions (caused problem when ... Thu, 15 May 2008 20:08:41 GMT scheusso [1299] * code/branches/merge/src/network/Client.cc (modified) * code/branches/merge/src/network/ClientInformation.cc (modified) * code/branches/merge/src/network/ClientInformation.h (modified) * code/branches/merge/src/network/ConnectionManager.cc (modified) * code/branches/merge/src/network/GameStateManager.cc (modified) * code/branches/merge/src/network/PacketBuffer.cc (modified) * code/branches/merge/src/network/PacketDecoder.cc (modified) * code/branches/merge/src/network/Server.cc (modified) * code/branches/merge/src/network/diffTest.cc (modified) * code/branches/merge/src/orxonox/objects/SpaceShip.cc (modified) a huge fix in packetbuffer Thu, 15 May 2008 19:15:39 GMT rgrieder [1298] * code/branches/input (copied) new input branch Thu, 15 May 2008 19:15:05 GMT rgrieder [1297] * code/branches/input (deleted) Removed file/folder Thu, 15 May 2008 18:48:26 GMT bknecht [1296] * code/branches/script_trigger (copied) Created new branch for triggers and script object Thu, 15 May 2008 17:59:37 GMT FelixSchulthess [1295] * code/branches/hud3/src/orxonox/hud/RadarOverlayElement.cc (modified) * code/branches/hud3/src/orxonox/hud/RadarOverlayElement.cc~ (modified) * code/branches/hud3/src/orxonox/hud/RadarOverlayElement.h (modified) * code/branches/hud3/src/orxonox/hud/RadarOverlayElement.h~ (modified) * code/branches/hud3/src/orxonox/objects/SpaceShip.cc (modified) * code/branches/hud3/src/orxonox/objects/SpaceShip.h (modified) trying to make it tickable Thu, 15 May 2008 15:47:22 GMT scheusso [1294] * code/branches/merge/src/network/GameStateManager.cc (modified) * code/branches/merge/src/network/PacketGenerator.cc (modified) some minor bugfix in something we don't use yet ... Thu, 15 May 2008 15:44:55 GMT scheusso [1293] * code/trunk/CMakeLists.txt (modified) * code/trunk/TODO (copied) * code/trunk/bin/keybindings.ini (modified) * code/trunk/bin/levels/sample.oxw (modified) * code/trunk/bin/ogre.cfg-init (modified) * code/trunk/bin/run-script (modified) * code/trunk/cmake/FindBoost.cmake (modified) * code/trunk/src/core/BaseObject.cc (modified) * code/trunk/src/core/CommandExecutor.h (modified) * code/trunk/src/core/CoreIncludes.h (modified) * code/trunk/src/core/CorePrereqs.h (modified) * code/trunk/src/core/Debug.h (modified) * code/trunk/src/core/Error.cc (modified) * code/trunk/src/core/Error.h (modified) * code/trunk/src/core/InputBuffer.cc (modified) * code/trunk/src/core/InputBuffer.h (modified) * code/trunk/src/core/InputHandler.cc (modified) * code/trunk/src/core/InputHandler.h (modified) * code/trunk/src/core/InputInterfaces.h (copied) * code/trunk/src/core/InputManager.cc (modified) * code/trunk/src/core/InputManager.h (modified) * code/trunk/src/core/Namespace.cc (modified) * code/trunk/src/core/OrxonoxClass.cc (modified) * code/trunk/src/core/SignalHandler.cc (modified) * code/trunk/src/core/SignalHandler.h (modified) * code/trunk/src/core/Tickable.cc (modified) * code/trunk/src/core/Tickable.h (modified) * code/trunk/src/network (copied) * code/trunk/src/network/CMakeLists.txt (copied) * code/trunk/src/network/Client.cc (copied) * code/trunk/src/network/Client.h (copied) * code/trunk/src/network/ClientConnection.cc (copied) * code/trunk/src/network/ClientConnection.h (copied) * code/trunk/src/network/ClientInformation.cc (copied) * code/trunk/src/network/ClientInformation.h (copied) * code/trunk/src/network/ConnectionManager.cc (copied) * code/trunk/src/network/ConnectionManager.h (copied) * code/trunk/src/network/GameStateClient.cc (copied) * code/trunk/src/network/GameStateClient.h (copied) * code/trunk/src/network/GameStateManager.cc (copied) * code/trunk/src/network/GameStateManager.h (copied) * code/trunk/src/network/Makefile.norm (copied) * code/trunk/src/network/Makefile.tardis (copied) * code/trunk/src/network/Makefile.test (copied) * code/trunk/src/network/NetworkPrereqs.h (copied) * code/trunk/src/network/PacketBuffer.cc (copied) * code/trunk/src/network/PacketBuffer.h (copied) * code/trunk/src/network/PacketDecoder.cc (copied) * code/trunk/src/network/PacketGenerator.cc (copied) * code/trunk/src/network/PacketManager.h (copied) * code/trunk/src/network/PacketTypes.h (copied) * code/trunk/src/network/Server.cc (copied) * code/trunk/src/network/Server.h (copied) * code/trunk/src/network/Synchronisable.cc (copied) * code/trunk/src/network/Synchronisable.h (copied) * code/trunk/src/network/TODO (copied) * code/trunk/src/network/diffTest.cc (copied) * code/trunk/src/network/dummyclient.cc (copied) * code/trunk/src/network/dummyclient2.cc (copied) * code/trunk/src/network/dummyclient3.cc (copied) * code/trunk/src/network/dummyclient4.cc (copied) * code/trunk/src/network/dummyserver.cc (copied) * code/trunk/src/network/dummyserver3.cc (copied) * code/trunk/src/network/dummyserver4.cc (copied) * code/trunk/src/orxonox/CMakeLists.txt (modified) * code/trunk/src/orxonox/GraphicsEngine.cc (modified) * code/trunk/src/orxonox/GraphicsEngine.h (modified) * code/trunk/src/orxonox/Main.cc (modified) * code/trunk/src/orxonox/Orxonox.cc (modified) * code/trunk/src/orxonox/Orxonox.h (modified) * code/trunk/src/orxonox/OrxonoxPlatform.h (modified) * code/trunk/src/orxonox/console/InGameConsole.cc (modified) * code/trunk/src/orxonox/objects/Ambient.cc (modified) * code/trunk/src/orxonox/objects/Ambient.h (modified) * code/trunk/src/orxonox/objects/Camera.cc (modified) * code/trunk/src/orxonox/objects/Camera.h (modified) * code/trunk/src/orxonox/objects/CameraHandler.cc (copied) * code/trunk/src/orxonox/objects/CameraHandler.h (copied) * code/trunk/src/orxonox/objects/Explosion.cc (modified) * code/trunk/src/orxonox/objects/Model.cc (modified) * code/trunk/src/orxonox/objects/Model.h (modified) * code/trunk/src/orxonox/objects/NPC.cc (modified) * code/trunk/src/orxonox/objects/NPC.h (modified) * code/trunk/src/orxonox/objects/Projectile.cc (modified) * code/trunk/src/orxonox/objects/Skybox.cc (modified) * code/trunk/src/orxonox/objects/Skybox.h (modified) * code/trunk/src/orxonox/objects/SpaceShip.cc (modified) * code/trunk/src/orxonox/objects/SpaceShip.h (modified) * code/trunk/src/orxonox/objects/WorldEntity.cc (modified) * code/trunk/src/orxonox/particle/ParticleInterface.cc (modified) * code/trunk/src/orxonox/tools/Timer.cc (modified) * code/trunk/visual_studio/base_properties_debug.vsprops (modified) * code/trunk/visual_studio/network_properties.vsprops (modified) * code/trunk/visual_studio/orxonox_properties.vsprops (modified) * code/trunk/visual_studio/vc8/core.vcproj (modified) * code/trunk/visual_studio/vc8/network.vcproj (modified) * code/trunk/visual_studio/vc8/ois.vcproj (modified) * code/trunk/visual_studio/vc8/orxonox.vcproj (modified) merged changes from input & camera & network branch into trunk Thu, 15 May 2008 15:37:06 GMT FelixSchulthess [1292] * code/branches/hud3/src/orxonox/console/InGameConsole.cc (modified) * code/branches/hud3/src/orxonox/hud/RadarOverlayElement.cc (modified) * code/branches/hud3/src/orxonox/hud/RadarOverlayElement.cc~ (modified) * code/branches/hud3/src/orxonox/hud/RadarOverlayElement.h (modified) * code/branches/hud3/src/orxonox/hud/RadarOverlayElement.h~ (modified) * code/branches/hud3/src/orxonox/objects/SpaceShip.cc (modified) * code/branches/hud3/src/orxonox/objects/SpaceShip.h (modified) svn save Thu, 15 May 2008 15:18:08 GMT scheusso [1291] * code/branches/merge/TODO (modified) * code/branches/merge/src/network/Synchronisable.cc (modified) * code/branches/merge/src/orxonox/objects/Camera.cc (modified) * code/branches/merge/src/orxonox/objects/SpaceShip.cc (modified) some changes got lost(camera) Thu, 15 May 2008 14:55:05 GMT FelixSchulthess [1290] * code/branches/hud3/bin/levels/sample.oxw (modified) * code/branches/hud3/src/orxonox/console/InGameConsole.cc (modified) * code/branches/hud3/src/orxonox/hud/RadarOverlayElement.cc (modified) * code/branches/hud3/src/orxonox/hud/RadarOverlayElement.cc~ (modified) * code/branches/hud3/src/orxonox/hud/RadarOverlayElement.h (modified) * code/branches/hud3/src/orxonox/hud/RadarOverlayElement.h~ (modified) corrected syntax Thu, 15 May 2008 14:43:20 GMT scheusso [1289] * code/branches/merge/src/orxonox/objects/Camera.cc (modified) * code/branches/merge/src/orxonox/objects/Camera.h (modified) * code/branches/merge/src/orxonox/objects/CameraHandler.cc (modified) * code/branches/merge/src/orxonox/objects/SpaceShip.cc (modified) merged camera change into merger branch Thu, 15 May 2008 14:16:45 GMT rgrieder [1288] * code/branches/merge/src/core/InputManager.cc (modified) - hackfix for the SpaceShip Thu, 15 May 2008 13:54:30 GMT bknecht [1287] * code/branches/camera/bin/ogre.cfg-init (modified) * code/branches/camera/src/orxonox/objects/Camera.cc (modified) * code/branches/camera/src/orxonox/objects/Camera.h (modified) * code/branches/camera/src/orxonox/objects/CameraHandler.cc (modified) * code/branches/camera/src/orxonox/objects/SpaceShip.cc (modified) camera stuff works now, but maybe need some adjustments, please test ... Thu, 15 May 2008 13:49:49 GMT chaiy [1286] * code/branches/hud3/src/orxonox/hud/RadarOverlayElement.cc (modified) * code/branches/hud3/src/orxonox/hud/RadarOverlayElement.cc~ (modified) * code/branches/hud3/src/orxonox/hud/RadarOverlayElement.h (modified) * code/branches/hud3/src/orxonox/hud/RadarOverlayElement.h~ (modified) radar works well Thu, 15 May 2008 13:06:52 GMT rgrieder [1285] * code/branches/merge/src/core/InputManager.cc (modified) - bugfix in InputManager Thu, 15 May 2008 12:55:13 GMT scheusso [1284] * code/branches/merge/src/network/Client.cc (modified) * code/branches/merge/src/orxonox/objects/SpaceShip.cc (modified) spaceship fix Thu, 15 May 2008 12:16:54 GMT chaiy [1283] * code/branches/hud3/src/orxonox/hud/BarOverlayElement.cc (added) * code/branches/hud3/src/orxonox/hud/BarOverlayElement.cc~ (added) * code/branches/hud3/src/orxonox/hud/BarOverlayElement.h (added) * code/branches/hud3/src/orxonox/hud/BarOverlayElement.h~ (added) * code/branches/hud3/src/orxonox/hud/BarV1.cc (added) * code/branches/hud3/src/orxonox/hud/BarV1.h (added) * code/branches/hud3/src/orxonox/hud/HUDV2.cc (added) * code/branches/hud3/src/orxonox/hud/HUDV2.h (added) * code/branches/hud3/src/orxonox/hud/OverlayElementFactories.h (added) * code/branches/hud3/src/orxonox/hud/OverlayElementFactories.h~ (added) * code/branches/hud3/src/orxonox/hud/RadarOverlayElement.cc (added) * code/branches/hud3/src/orxonox/hud/RadarOverlayElement.cc.mine (added) * code/branches/hud3/src/orxonox/hud/RadarOverlayElement.cc.r1099 (added) * code/branches/hud3/src/orxonox/hud/RadarOverlayElement.cc.r1248 (added) * code/branches/hud3/src/orxonox/hud/RadarOverlayElement.cc~ (added) * code/branches/hud3/src/orxonox/hud/RadarOverlayElement.h (added) * code/branches/hud3/src/orxonox/hud/RadarOverlayElement.h~ (added) new hud branch, since hud2 doesnt work on tardis Thu, 15 May 2008 12:14:44 GMT scheusso [1282] * code/branches/merge/bin/levels/sample.oxw (modified) * code/branches/merge/bin/run-script (modified) * code/branches/merge/src/network/ConnectionManager.cc (modified) * code/branches/merge/src/network/GameStateManager.cc (modified) made gamestatemanager::cleanup a bit safer ;) Thu, 15 May 2008 12:14:28 GMT chaiy [1281] * code/branches/hud3/src/orxonox/CMakeLists.txt (modified) * code/branches/hud3/src/orxonox/Orxonox.cc (modified) * code/branches/hud3/src/orxonox/hud/HUD.cc (modified) * code/branches/hud3/src/orxonox/hud/HUD.h (modified) irgendwas sinnvolles Thu, 15 May 2008 11:46:14 GMT chaiy [1280] * code/branches/hud3 (copied) hello