# # ChangeLog for / # # Generated by Trac 1.0.9 # Nov 25, 2024, 3:07:19 PM Wed, 28 May 2008 21:54:17 GMT rgrieder [1467] * code/branches/network/presentation/input (added) * code/branches/network/presentation/input/Slide1.ppt (added) added my slide Wed, 28 May 2008 21:40:06 GMT janise [1466] * code/branches/network/src/orxonox/GraphicsEngine.cc (modified) * code/branches/network/src/orxonox/GraphicsEngine.h (modified) * code/branches/network/src/orxonox/Orxonox.cc (modified) * code/branches/network/src/orxonox/objects/Model.cc (modified) compositors and shader work with hacks. added a directional light Wed, 28 May 2008 21:12:18 GMT rgrieder [1465] * code/branches/network/src/core/InputManager.cc (modified) * code/branches/network/src/core/KeyBinder.cc (modified) * code/branches/network/src/orxonox/objects/Camera.cc (modified) - fixed bug with shaking camera - made part of camera adjustments ... Wed, 28 May 2008 20:56:49 GMT scheusso [1464] * code/branches/network/src/network/Client.cc (modified) * code/branches/network/src/network/GameStateClient.cc (modified) * code/branches/network/src/orxonox/objects/WorldEntity.cc (modified) enabled prediction for WE (synchronise velocity/acceleration) Wed, 28 May 2008 20:29:58 GMT FelixSchulthess [1463] * code/branches/network/bin/levels/sample.oxw (modified) * code/branches/network/src/orxonox/hud/HUD.cc (modified) * code/branches/network/src/orxonox/hud/RadarOverlayElement.cc (modified) minor hud/radar adjustments Wed, 28 May 2008 19:41:17 GMT scheusso [1462] * code/branches/network/src/network/GameStateManager.cc (modified) fixed a bug in nacking Wed, 28 May 2008 18:07:32 GMT rgrieder [1461] * code/branches/network/src/core/InputBuffer.h (modified) * code/branches/network/src/core/InputManager.cc (modified) * code/branches/network/src/core/KeyBinder.cc (modified) * code/branches/network/src/core/KeyBinder.h (modified) * code/branches/network/src/cpptcl/CppTcl.cc (modified) * code/branches/network/src/orxonox/hud/HUD.cc (modified) - "set" --> "config" - adjusted Shell output levels for keybind and ... Wed, 28 May 2008 17:47:40 GMT FelixSchulthess [1460] * code/branches/network/src/orxonox/hud/Navigation.cc (modified) removed debug output Wed, 28 May 2008 17:35:31 GMT FelixSchulthess [1459] * code/branches/network/src/orxonox/hud/Navigation.cc (modified) fix Wed, 28 May 2008 17:29:16 GMT FelixSchulthess [1458] * code/branches/network/src/orxonox/hud/Navigation.cc (modified) do not play with typecasts... Wed, 28 May 2008 17:21:06 GMT FelixSchulthess [1457] * code/branches/network/src/orxonox/hud/Navigation.cc (modified) removed three warnings Wed, 28 May 2008 17:12:28 GMT FelixSchulthess [1456] * code/branches/network/src/orxonox/hud/HUD.cc (modified) * code/branches/network/src/orxonox/hud/HUD.h (modified) * code/branches/network/src/orxonox/hud/Navigation.cc (modified) * code/branches/network/src/orxonox/hud/Navigation.h (modified) * code/branches/network/src/orxonox/hud/RadarObject.cc (modified) * code/branches/network/src/orxonox/hud/RadarObject.h (modified) * code/branches/network/src/orxonox/hud/RadarOverlayElement.cc (modified) using a std::set for the radar objects, which still has a the small ... Wed, 28 May 2008 17:06:19 GMT rgrieder [1455] * code/branches/network/src/core/InputManager.cc (modified) * code/branches/network/src/cpptcl/CppTcl.cc (modified) * code/branches/network/src/orxonox/console/InGameConsole.cc (modified) - 'fixed' a bug in CppTcl.cc, but why would map::find pose a problem ... Wed, 28 May 2008 16:45:02 GMT landauf [1454] * code/branches/network/src/core/TclBind.cc (modified) * code/branches/network/src/orxonox/GraphicsEngine.cc (modified) * code/branches/network/src/orxonox/Orxonox.cc (modified) * code/branches/network/src/orxonox/console/InGameConsole.h (modified) * code/branches/network/src/orxonox/hud/BarOverlayElement.cc (modified) * code/branches/network/src/orxonox/hud/BarOverlayElement.h (modified) * code/branches/network/src/orxonox/hud/HUD.cc (modified) * code/branches/network/src/orxonox/hud/HUD.h (modified) * code/branches/network/src/orxonox/hud/Navigation.cc (modified) * code/branches/network/src/orxonox/hud/Navigation.h (modified) * code/branches/network/src/orxonox/hud/OverlayElementFactories.h (modified) * code/branches/network/src/orxonox/hud/RadarObject.cc (modified) * code/branches/network/src/orxonox/hud/RadarObject.h (modified) * code/branches/network/src/orxonox/hud/RadarOverlayElement.cc (modified) * code/branches/network/src/orxonox/hud/RadarOverlayElement.h (modified) * code/branches/network/src/orxonox/objects/Projectile.cc (modified) * code/branches/network/src/orxonox/objects/Projectile.h (modified) * code/branches/network/src/orxonox/objects/SpaceShip.cc (modified) * code/branches/network/src/orxonox/objects/SpaceShip.h (modified) fixed tcl initialisation bug Wed, 28 May 2008 15:06:45 GMT scheusso [1453] * code/branches/network/src/orxonox/objects/SpaceShip.cc (modified) the spaceships of the other players now also have a radarpoint and ... Wed, 28 May 2008 13:09:33 GMT rgrieder [1452] * code/branches/network/src/core/OutputHandler.cc (modified) * code/branches/network/src/core/OutputHandler.h (modified) * code/branches/network/visual_studio/vc8/core.vcproj (modified) - removed Shell.h dependency from OutputHandler.h to avoid ... Wed, 28 May 2008 12:39:46 GMT FelixSchulthess [1451] * code/branches/network/bin/def_keybindings.ini (modified) * code/branches/network/src/orxonox/hud/HUD.cc (modified) * code/branches/network/src/orxonox/hud/HUD.h (modified) possible to toggle FPS and Render time display with F1 and F2 Wed, 28 May 2008 12:08:03 GMT FelixSchulthess [1450] * code/branches/network/src/orxonox/hud/HUD.cc (modified) * code/branches/network/src/orxonox/hud/HUD.h (modified) * code/branches/network/src/orxonox/hud/Navigation.cc (modified) * code/branches/network/src/orxonox/hud/RadarObject.cc (modified) * code/branches/network/src/orxonox/hud/RadarObject.h (modified) * code/branches/network/src/orxonox/hud/RadarOverlayElement.cc (modified) making radar objects from scene nodes now. radar object supporting ... Wed, 28 May 2008 09:02:36 GMT rgrieder [1449] * code/branches/network/bin/def_keybindings.ini (modified) * code/branches/network/src/core/InputBuffer.h (modified) * code/branches/network/src/core/Shell.cc (modified) * code/branches/network/visual_studio/vc8/core.vcproj (modified) - updated msvc files - hack-fixed a hack that probably wasn't even ... Wed, 28 May 2008 08:54:20 GMT scheusso [1448] * code/branches/network/src/orxonox/objects/SpaceShip.cc (modified) * code/branches/network/src/orxonox/objects/WorldEntity.cc (modified) removed debug output Wed, 28 May 2008 03:41:43 GMT landauf [1447] * code/branches/network/src/core/Shell.cc (modified) ok, I fixed something. Wed, 28 May 2008 03:30:11 GMT landauf [1446] * code/branches/network/CMakeLists.txt (modified) * code/branches/network/bin/disco.txt (modified) * code/branches/network/bin/irc.tcl (copied) * code/branches/network/bin/remote.tcl (copied) * code/branches/network/bin/telnet_server.tcl (copied) * code/branches/network/cmake/FindBoost.cmake (modified) * code/branches/network/src/audio/AudioStream.cc (modified) * code/branches/network/src/core/ArgumentCompleter.h (copied) * code/branches/network/src/core/ArgumentCompletionFunctions.cc (copied) * code/branches/network/src/core/ArgumentCompletionFunctions.h (copied) * code/branches/network/src/core/ArgumentCompletionListElement.h (copied) * code/branches/network/src/core/CMakeLists.txt (modified) * code/branches/network/src/core/ClassManager.h (modified) * code/branches/network/src/core/CommandEvaluation.cc (copied) * code/branches/network/src/core/CommandEvaluation.h (copied) * code/branches/network/src/core/CommandExecutor.cc (modified) * code/branches/network/src/core/CommandExecutor.h (modified) * code/branches/network/src/core/ConfigFileManager.cc (modified) * code/branches/network/src/core/ConfigFileManager.h (modified) * code/branches/network/src/core/ConfigValueContainer.cc (modified) * code/branches/network/src/core/ConfigValueContainer.h (modified) * code/branches/network/src/core/ConfigValueIncludes.h (modified) * code/branches/network/src/core/ConsoleCommand.cc (copied) * code/branches/network/src/core/ConsoleCommand.h (modified) * code/branches/network/src/core/ConsoleCommandCompilation.cc (copied) * code/branches/network/src/core/ConsoleCommandCompilation.h (copied) * code/branches/network/src/core/CorePrereqs.h (modified) * code/branches/network/src/core/CoreSettings.cc (modified) * code/branches/network/src/core/CoreSettings.h (modified) * code/branches/network/src/core/Debug.h (modified) * code/branches/network/src/core/Executor.cc (modified) * code/branches/network/src/core/Executor.h (modified) * code/branches/network/src/core/IRC.cc (copied) * code/branches/network/src/core/IRC.h (copied) * code/branches/network/src/core/Identifier.cc (modified) * code/branches/network/src/core/Identifier.h (modified) * code/branches/network/src/core/InputBuffer.cc (modified) * code/branches/network/src/core/InputBuffer.h (modified) * code/branches/network/src/core/InputManager.cc (modified) * code/branches/network/src/core/Iterator.h (modified) * code/branches/network/src/core/KeyBinder.cc (modified) * code/branches/network/src/core/KeyBinder.h (modified) * code/branches/network/src/core/Language.cc (modified) * code/branches/network/src/core/Language.h (modified) * code/branches/network/src/core/OrxonoxClass.cc (modified) * code/branches/network/src/core/OrxonoxClass.h (modified) * code/branches/network/src/core/OutputBuffer.cc (copied) * code/branches/network/src/core/OutputBuffer.h (copied) * code/branches/network/src/core/OutputHandler.cc (modified) * code/branches/network/src/core/OutputHandler.h (modified) * code/branches/network/src/core/Script.cc (modified) * code/branches/network/src/core/Shell.cc (copied) * code/branches/network/src/core/Shell.h (copied) * code/branches/network/src/core/TclBind.cc (modified) * code/branches/network/src/core/TclBind.h (modified) * code/branches/network/src/core/TclThreadManager.cc (copied) * code/branches/network/src/core/TclThreadManager.h (copied) * code/branches/network/src/core/XMLPort.h (modified) * code/branches/network/src/cpptcl/CppTcl.cc (modified) * code/branches/network/src/network/CMakeLists.txt (modified) * code/branches/network/src/network/GameStateClient.cc (modified) * code/branches/network/src/network/PacketDecoder.cc (modified) * code/branches/network/src/network/dummyclient3.cc (modified) * code/branches/network/src/orxonox/GraphicsEngine.cc (modified) * code/branches/network/src/orxonox/Orxonox.cc (modified) * code/branches/network/src/orxonox/Orxonox.h (modified) * code/branches/network/src/orxonox/console/InGameConsole.cc (modified) * code/branches/network/src/orxonox/console/InGameConsole.h (modified) * code/branches/network/src/orxonox/hud/HUD.cc (modified) * code/branches/network/src/orxonox/objects/Ambient.cc (modified) * code/branches/network/src/orxonox/objects/SpaceShip.cc (modified) * code/branches/network/src/orxonox/tools/Timer.cc (modified) * code/branches/network/src/orxonox/tools/Timer.h (modified) * code/branches/network/src/util/Convert.h (modified) * code/branches/network/src/util/Math.h (modified) * code/branches/network/src/util/MultiType.h (modified) * code/branches/network/src/util/MultiTypeMath.cc (modified) * code/branches/network/src/util/MultiTypeMath.h (modified) * code/branches/network/src/util/MultiTypePrimitive.cc (modified) * code/branches/network/src/util/MultiTypePrimitive.h (modified) * code/branches/network/src/util/MultiTypeString.cc (modified) * code/branches/network/src/util/MultiTypeString.h (modified) * code/branches/network/src/util/String.cc (modified) * code/branches/network/src/util/String.h (modified) merged console branch into network branch after several heavy ... Tue, 27 May 2008 23:12:45 GMT landauf [1445] * code/branches/network/CMakeLists.txt (modified) * code/branches/network/cmake/FindDirectX.cmake (added) * code/branches/network/cmake/FindZLIB.cmake (modified) * code/branches/network/src/core/XMLPort.h (modified) * code/branches/network/src/ois/CMakeLists.txt (modified) * code/branches/network/src/ois/OISException.cpp (modified) * code/branches/network/src/ois/OISException.h (modified) fixed some parts of the cmake-files to work with windows Tue, 27 May 2008 22:01:16 GMT rgrieder [1444] * code/branches/network/src/core/ConfigValueContainer.cc (modified) * code/branches/network/src/core/ConfigValueIncludes.h (modified) * code/branches/network/src/core/CorePrereqs.h (modified) * code/branches/network/src/core/InputInterfaces.h (modified) * code/branches/network/src/core/InputManager.cc (modified) * code/branches/network/src/core/InputManager.h (modified) * code/branches/network/src/core/KeyBinder.cc (modified) * code/branches/network/src/core/KeyBinder.h (modified) * code/branches/network/src/orxonox/hud/Navigation.cc (modified) Added 'calibrate' command for the joystick Simply type 'calibrate', ... Tue, 27 May 2008 20:44:39 GMT scheusso [1443] * code/branches/network/src/network/ClientConnection.h (modified) * code/branches/network/src/orxonox/Orxonox.cc (modified) * code/branches/network/src/orxonox/objects/SpaceShip.cc (modified) * code/branches/network/src/orxonox/objects/WorldEntity.cc (modified) the client stops now when conenction establishment fails --- testing ... Tue, 27 May 2008 19:39:28 GMT landauf [1442] * code/branches/console/CMakeLists.txt (modified) * code/branches/console/src/core/ArgumentCompletionFunctions.cc (modified) * code/branches/console/src/core/CMakeLists.txt (modified) * code/branches/console/src/core/OutputBuffer.cc (modified) - filesystem-autocompletion uses now boost::filesystem - fixed a ... Tue, 27 May 2008 16:29:08 GMT landauf [1441] * code/branches/console/src/core/ArgumentCompleter.h (modified) * code/branches/console/src/core/ArgumentCompletionFunctions.cc (modified) * code/branches/console/src/core/ArgumentCompletionFunctions.h (modified) * code/branches/console/src/core/ArgumentCompletionListElement.h (added) * 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) * code/branches/console/src/core/ConsoleCommand.h (modified) * code/branches/console/src/core/CorePrereqs.h (modified) * code/branches/console/src/core/TclThreadManager.cc (modified) * code/branches/console/src/core/TclThreadManager.h (modified) you'll love this: separated displayed strings in autocompletion from ... Tue, 27 May 2008 09:23:32 GMT scheusso [1440] * code/branches/network/src/network/Client.cc (modified) * code/branches/network/src/network/Client.h (modified) * code/branches/network/src/network/PacketDecoder.cc (modified) * code/branches/network/src/network/PacketGenerator.cc (modified) * code/branches/network/src/network/PacketManager.h (modified) * code/branches/network/src/network/PacketTypes.h (modified) cleanup up packetgenerator/decoder and improved speed of gamestate ... Tue, 27 May 2008 02:41:48 GMT landauf [1439] * code/branches/console/src/core/ArgumentCompletionFunctions.cc (modified) debugoutput-- Tue, 27 May 2008 02:30:15 GMT landauf [1438] * code/branches/console/src/audio/AudioStream.cc (modified) * code/branches/console/src/core/Script.cc (modified) * code/branches/console/src/core/TclBind.cc (modified) * code/branches/console/src/network/GameStateClient.cc (modified) * code/branches/console/src/network/PacketDecoder.cc (modified) * code/branches/console/src/network/dummyclient3.cc (modified) removed some other (potential) bugs or dangerous code lines Tue, 27 May 2008 02:15:47 GMT landauf [1437] * code/branches/console/src/core/CommandExecutor.cc (modified) * code/branches/console/src/core/ConsoleCommandCompilation.cc (modified) removed debug output and fixed a small stupid bug ;) Tue, 27 May 2008 01:01:49 GMT landauf [1436] * code/branches/console/src/core/ArgumentCompleter.h (modified) * code/branches/console/src/core/ArgumentCompletionFunctions.cc (modified) * code/branches/console/src/core/ArgumentCompletionFunctions.h (modified) * code/branches/console/src/core/CommandExecutor.cc (modified) * code/branches/console/src/core/ConfigFileManager.cc (modified) * code/branches/console/src/core/ConsoleCommandCompilation.cc (modified) cool stuff: autocompletion works with filesystem (has to be tested on ... Mon, 26 May 2008 23:17:33 GMT landauf [1435] * code/branches/console/src/core/CommandEvaluation.cc (modified) * code/branches/console/src/core/CommandExecutor.cc (modified) * code/branches/console/src/core/ConfigFileManager.cc (modified) * code/branches/console/src/util/MultiTypeMath.cc (modified) * code/branches/console/src/util/MultiTypeMath.h (modified) * code/branches/console/src/util/MultiTypeString.cc (modified) * code/branches/console/src/util/MultiTypeString.h (modified) after some changes in MultiTypeMath and co., the new config and ... Mon, 26 May 2008 22:27:13 GMT landauf [1434] * code/branches/console/src/core/ArgumentCompletionFunctions.cc (modified) * code/branches/console/src/core/ArgumentCompletionFunctions.h (modified) * 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) * code/branches/console/src/core/ConfigFileManager.cc (modified) * code/branches/console/src/core/ConfigFileManager.h (modified) * code/branches/console/src/core/ConsoleCommand.cc (modified) * code/branches/console/src/core/ConsoleCommand.h (modified) * code/branches/console/src/core/TclThreadManager.cc (modified) * code/branches/console/src/core/TclThreadManager.h (modified) autocompletion is almost done Mon, 26 May 2008 20:10:55 GMT scheusso [1433] * code/branches/network/src/network/ClientInformation.cc (modified) * code/branches/network/src/network/ClientInformation.h (modified) * code/branches/network/src/network/Server.cc (modified) clientinformation is now not threadsafe anymore (not neccessary and ... Mon, 26 May 2008 20:06:36 GMT scheusso [1432] * code/branches/network/TODO (modified) * code/branches/network/src/network/ClientInformation.h (modified) * code/branches/network/src/network/GameStateClient.cc (modified) * code/branches/network/src/network/GameStateManager.cc (modified) * code/branches/network/src/network/PacketDecoder.cc (modified) * code/branches/network/src/network/PacketGenerator.cc (modified) * code/branches/network/src/orxonox/Orxonox.cc (modified) found a bug in gamestate diffing (in some cases the gamestate diffed ... Mon, 26 May 2008 19:21:53 GMT scheusso [1431] * code/branches/network/src/network/Client.cc (modified) * code/branches/network/src/network/Client.h (modified) * code/branches/network/src/network/ClientInformation.cc (modified) * code/branches/network/src/network/ClientInformation.h (modified) * code/branches/network/src/network/GameStateClient.cc (modified) * code/branches/network/src/network/GameStateManager.cc (modified) * code/branches/network/src/network/GameStateManager.h (modified) * code/branches/network/src/network/Server.cc (modified) * code/branches/network/src/network/Synchronisable.cc (modified) * code/branches/network/src/network/diffTest.cc (modified) * code/branches/network/src/orxonox/objects/SpaceShip.cc (modified) another one bites the dust: solved that problem with zeros in the ... Mon, 26 May 2008 18:30:33 GMT landauf [1430] * code/branches/console/src/core/ArgumentCompleter.h (added) * code/branches/console/src/core/ArgumentCompletionFunctions.cc (modified) * code/branches/console/src/core/ArgumentCompletionFunctions.h (modified) * code/branches/console/src/core/CommandEvaluation.cc (modified) * code/branches/console/src/core/CommandExecutor.cc (modified) * code/branches/console/src/core/CommandExecutor.h (modified) * code/branches/console/src/core/ConsoleCommand.cc (modified) * code/branches/console/src/core/ConsoleCommand.h (modified) * code/branches/console/src/core/CorePrereqs.h (modified) I start to like it Mon, 26 May 2008 09:52:15 GMT scheusso [1429] * code/branches/network/presentation/network/overview2.dia (modified) * code/branches/network/presentation/network/overview2.png (modified) * code/branches/network/presentation/network/slides-new.odp (modified) extended slides from presentation and changed a diagramm Mon, 26 May 2008 09:36:50 GMT rgrieder [1428] * code/branches/network/src/core/ConfigValueIncludes.h (modified) * code/branches/network/src/core/InputManager.cc (modified) * code/branches/network/src/core/InputManager.h (modified) * code/branches/network/src/core/KeyBinder.cc (modified) * code/branches/network/src/core/KeyBinder.h (modified) - added SetConfigValueGeneric to set the config value of the actual ... Mon, 26 May 2008 01:08:39 GMT landauf [1427] * 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) * code/branches/console/src/orxonox/objects/SpaceShip.cc (modified) CommandExecutor seems to work very well right now. yet to come: ... Sun, 25 May 2008 22:00:20 GMT rgrieder [1426] * code/branches/network/media_HEAD (moved) * code/branches/network/src/core/InputManager.cc (modified) * code/branches/network/src/core/InputManager.h (modified) * code/branches/network/src/core/KeyBinder.cc (modified) * code/branches/network/src/core/KeyBinder.h (modified) - you can now tpye "keybind command" and then press a button/key to ... Sun, 25 May 2008 21:08:19 GMT scheusso [1425] * code/branches/network/src/network/Client.cc (modified) * code/branches/network/src/network/GameStateClient.cc (modified) * code/branches/network/src/network/GameStateClient.h (modified) * code/branches/network/src/network/GameStateManager.cc (modified) * code/branches/network/src/network/GameStateManager.h (modified) * code/branches/network/src/network/Server.cc (modified) * code/branches/network/src/network/Synchronisable.cc (modified) * code/branches/network/src/network/Synchronisable.h (modified) * code/branches/network/src/orxonox/objects/Ambient.h (modified) * code/branches/network/src/orxonox/objects/Explosion.cc (modified) * code/branches/network/src/orxonox/objects/Explosion.h (modified) * code/branches/network/src/orxonox/objects/Model.h (modified) * code/branches/network/src/orxonox/objects/NPC.cc (modified) * code/branches/network/src/orxonox/objects/NPC.h (modified) * code/branches/network/src/orxonox/objects/Projectile.cc (modified) * code/branches/network/src/orxonox/objects/Projectile.h (modified) * code/branches/network/src/orxonox/objects/Skybox.h (modified) * code/branches/network/src/orxonox/objects/SpaceShip.cc (modified) * code/branches/network/src/orxonox/objects/SpaceShip.h (modified) * code/branches/network/src/orxonox/objects/WorldEntity.cc (modified) * code/branches/network/src/orxonox/objects/WorldEntity.h (modified) implemented some sort of buffer for the spaceship movements (makes ... Sun, 25 May 2008 19:58:14 GMT landauf [1424] * 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) * code/branches/console/src/core/OutputBuffer.h (modified) * code/branches/console/src/core/Shell.cc (modified) * code/branches/console/src/core/Shell.h (modified) * code/branches/console/src/core/TclThreadManager.cc (modified) * code/branches/console/src/orxonox/console/InGameConsole.cc (modified) finally got a good approach for the CommandExecutor parser. more to come. Sun, 25 May 2008 18:33:54 GMT rgrieder [1423] * code/branches/ogre (deleted) removed obsolete branch Sun, 25 May 2008 18:29:05 GMT rgrieder [1422] * code/branches/network/src/core/InputManager.cc (modified) * code/branches/network/src/core/KeyBinder.cc (modified) * code/branches/network/src/orxonox/Orxonox.cc (modified) * code/branches/network/src/orxonox/hud/HUD.cc (modified) * code/branches/network/src/orxonox/hud/HUD.h (modified) * code/branches/network/visual_studio/base_properties_release.vsprops (modified) - added a little text box to the HUD that says how much of the main ... Sun, 25 May 2008 12:22:23 GMT scheusso [1421] * code/branches/network/src/orxonox/objects/Explosion.cc (modified) * code/branches/network/src/orxonox/objects/Explosion.h (modified) forgot to add the appropriate create function in Explosion Sun, 25 May 2008 12:19:39 GMT rgrieder [1420] * code/branches/network/src/core/KeyBinder.cc (modified) * code/branches/network/src/core/KeyBinder.h (modified) - fixed 2 bugs Sun, 25 May 2008 12:06:26 GMT rgrieder [1419] * code/branches/network/bin/def_keybindings.ini (modified) - merged def_keybindings.ini back to rev 1417, but set svn property ... Sun, 25 May 2008 11:40:11 GMT scheusso [1418] * code/branches/network/bin/def_keybindings.ini (modified) * code/branches/network/src/network/Synchronisable.cc (modified) * code/branches/network/src/network/Synchronisable.h (modified) * code/branches/network/src/orxonox/objects/Ambient.cc (modified) * code/branches/network/src/orxonox/objects/Projectile.cc (modified) * code/branches/network/src/orxonox/objects/Skybox.cc (modified) * code/branches/network/src/orxonox/objects/WorldEntity.h (modified) * code/branches/network/src/orxonox/objects/weapon/AmmunitionDump.h (modified) * code/branches/network/src/orxonox/objects/weapon/BulletManager.h (modified) copied old keybindings to new def_keybindings and made some changes ... Sun, 25 May 2008 00:56:09 GMT landauf [1417] * code/branches/console/src/core/CommandEvaluation.h (modified) * code/branches/console/src/core/CommandExecutor.cc (modified) changes in CommandExecutor and CommandEvaluation Sat, 24 May 2008 23:11:51 GMT landauf [1416] * code/branches/console/src/core/ArgumentCompletionFunctions.cc (modified) * code/branches/console/src/core/ArgumentCompletionFunctions.h (modified) * code/branches/console/src/core/CommandEvaluation.cc (modified) * code/branches/console/src/core/CommandExecutor.cc (modified) * code/branches/console/src/core/ConsoleCommand.cc (modified) * code/branches/console/src/core/ConsoleCommand.h (modified) * code/branches/console/src/core/Debug.h (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/orxonox/GraphicsEngine.cc (modified) * code/branches/console/src/orxonox/console/InGameConsole.cc (modified) * code/branches/console/src/orxonox/console/InGameConsole.h (modified) - fixed a bug in CommandExecutor - InGameConsole wraps now too long ... Sat, 24 May 2008 20:23:37 GMT scheusso [1415] * code/branches/network/CMakeLists.txt (modified) * code/branches/network/updateMedia.sh (added) added script to update media repository Sat, 24 May 2008 20:08:42 GMT rgrieder [1414] * code/branches/network/src/audio/AudioPrereqs.h (modified) * code/branches/network/src/core/CorePrereqs.h (modified) * code/branches/network/src/core/InputManager.cc (modified) * code/branches/network/src/core/KeyBinder.cc (modified) * code/branches/network/src/core/KeyBinder.h (modified) * code/branches/network/src/network/NetworkPrereqs.h (modified) * code/branches/network/src/orxonox/GraphicsEngine.h (modified) * code/branches/network/src/orxonox/Main.cc (modified) * code/branches/network/src/orxonox/Orxonox.cc (modified) * code/branches/network/src/orxonox/OrxonoxPrereqs.h (modified) * code/branches/network/src/orxonox/OrxonoxStableHeaders.h (modified) * code/branches/network/src/orxonox/hud/HUD.cc (modified) * code/branches/network/src/orxonox/hud/HUD.h (modified) * code/branches/network/src/util/OrxonoxPlatform.h (moved) * code/branches/network/src/util/UtilPrereqs.h (modified) * code/branches/network/visual_studio/vc8/orxonox.vcproj (modified) * code/branches/network/visual_studio/vc8/util.vcproj (modified) - moved OrxonoxPlatform.h to util (didn't even notice util recently) ... Sat, 24 May 2008 18:12:20 GMT rgrieder [1413] * code/branches/network/bin/def_keybindings.ini (added) * code/branches/network/bin/keybindings.ini (deleted) * code/branches/network/src/core/CMakeLists.txt (modified) * code/branches/network/src/core/ConfigFileManager.cc (modified) * code/branches/network/src/core/ConfigFileManager.h (modified) * code/branches/network/src/core/CorePrereqs.h (modified) * code/branches/network/src/core/InputBuffer.cc (modified) * code/branches/network/src/core/InputBuffer.h (modified) * code/branches/network/src/core/InputInterfaces.h (modified) * code/branches/network/src/core/InputManager.cc (modified) * code/branches/network/src/core/InputManager.h (modified) * code/branches/network/src/core/KeyBinder.cc (moved) * code/branches/network/src/core/KeyBinder.h (moved) * code/branches/network/src/orxonox/Orxonox.cc (modified) * code/branches/network/src/orxonox/objects/SpaceShip.cc (modified) * code/branches/network/visual_studio/vc8/core.vcproj (modified) - renamed InputHandler to KeyBinder - added feature to detect a key ... Sat, 24 May 2008 15:44:20 GMT rgrieder [1412] * code/branches/network/src/orxonox/hud/BarOverlayElement.h (modified) - applied r1410 again Sat, 24 May 2008 15:35:34 GMT FelixSchulthess [1411] * code/branches/network/src/orxonox/Orxonox.cc (modified) * code/branches/network/src/orxonox/hud/BarOverlayElement.cc (modified) * code/branches/network/src/orxonox/hud/BarOverlayElement.h (modified) * code/branches/network/src/orxonox/hud/HUD.cc (modified) * code/branches/network/src/orxonox/hud/HUD.h (modified) * code/branches/network/src/orxonox/hud/Navigation.cc (modified) * code/branches/network/src/orxonox/hud/RadarObject.h (modified) * code/branches/network/src/orxonox/hud/RadarOverlayElement.h (modified) rewritten navigation algebra... very ugly, and not optimized Sat, 24 May 2008 13:38:39 GMT rgrieder [1410] * code/branches/network/src/orxonox/OrxonoxPrereqs.h (modified) * code/branches/network/src/orxonox/hud/BarOverlayElement.cc (modified) * code/branches/network/src/orxonox/hud/BarOverlayElement.h (modified) * code/branches/network/src/orxonox/hud/HUD.cc (modified) * code/branches/network/src/orxonox/hud/HUD.h (modified) * code/branches/network/src/orxonox/hud/Navigation.cc (modified) * code/branches/network/src/orxonox/hud/Navigation.h (modified) * code/branches/network/src/orxonox/hud/OverlayElementFactories.h (modified) * code/branches/network/src/orxonox/hud/RadarObject.cc (modified) * code/branches/network/src/orxonox/hud/RadarObject.h (modified) * code/branches/network/src/orxonox/hud/RadarOverlayElement.cc (modified) * code/branches/network/src/orxonox/hud/RadarOverlayElement.h (modified) * code/branches/network/visual_studio/vc8/orxonox.vcproj (modified) - converted tabs to spaces in HUD - adjusted msvc project Sat, 24 May 2008 12:57:43 GMT scheusso [1409] * code/branches/network/src/network/Client.cc (modified) * code/branches/network/src/network/ClientConnection.cc (modified) * code/branches/network/src/network/ClientConnection.h (modified) * code/branches/network/src/network/ConnectionManager.cc (modified) * code/branches/network/src/network/ConnectionManager.h (modified) * code/branches/network/src/network/PacketBuffer.cc (modified) * code/branches/network/src/network/PacketBuffer.h (modified) * code/branches/network/src/network/Server.cc (modified) * code/branches/network/src/network/Server.h (modified) * code/branches/network/src/orxonox/objects/Camera.cc (modified) changed concept of threading, had to change packetbuffer (using ... Sat, 24 May 2008 12:07:04 GMT FelixSchulthess [1408] * code/branches/network/src/orxonox/hud/RadarObject.cc (modified) * code/branches/network/src/orxonox/hud/RadarObject.h (modified) * code/branches/network/src/orxonox/hud/RadarOverlayElement.cc (modified) * code/branches/network/src/orxonox/hud/RadarOverlayElement.h (modified) * code/branches/network/src/orxonox/objects/SpaceShip.cc (modified) compiles now with changes from trunk Sat, 24 May 2008 11:49:54 GMT rgrieder [1407] * 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/hud/BarOverlayElement.cc (modified) * code/trunk/src/orxonox/hud/BarOverlayElement.h (modified) * code/trunk/src/orxonox/hud/HUD.cc (modified) * code/trunk/src/orxonox/hud/HUD.h (modified) * code/trunk/src/orxonox/hud/Navigation.cc (deleted) * code/trunk/src/orxonox/hud/Navigation.h (deleted) * code/trunk/src/orxonox/hud/RadarObject.cc (modified) * code/trunk/src/orxonox/hud/RadarObject.h (modified) * code/trunk/src/orxonox/hud/RadarOverlayElement.cc (modified) * code/trunk/src/orxonox/hud/RadarOverlayElement.h (modified) * code/trunk/src/orxonox/objects/Camera.h (modified) * code/trunk/src/orxonox/objects/SpaceShip.cc (modified) * code/trunk/src/orxonox/objects/SpaceShip.h (modified) - reverted the HUD changes to ease up back merge from network branch ... Sat, 24 May 2008 11:39:05 GMT rgrieder [1406] * code/branches/network/bin/keybindings.ini (modified) * code/branches/network/bin/levels/sample.oxw (modified) * code/branches/network/src/orxonox/CMakeLists.txt (modified) * code/branches/network/src/orxonox/Orxonox.cc (modified) * code/branches/network/src/orxonox/hud/BarOverlayElement.cc (modified) * code/branches/network/src/orxonox/hud/BarOverlayElement.h (modified) * code/branches/network/src/orxonox/hud/HUD.cc (modified) * code/branches/network/src/orxonox/hud/HUD.h (modified) * code/branches/network/src/orxonox/hud/Navigation.cc (copied) * code/branches/network/src/orxonox/hud/Navigation.h (copied) * code/branches/network/src/orxonox/hud/RadarObject.cc (modified) * code/branches/network/src/orxonox/hud/RadarObject.h (modified) * code/branches/network/src/orxonox/hud/RadarOverlayElement.cc (modified) * code/branches/network/src/orxonox/hud/RadarOverlayElement.h (modified) * code/branches/network/src/orxonox/objects/Camera.h (modified) * code/branches/network/src/orxonox/objects/SpaceShip.cc (modified) * code/branches/network/src/orxonox/objects/SpaceShip.h (modified) - merged Felix's changes from trunk to network branch - added ... Sat, 24 May 2008 11:27:38 GMT scheusso [1405] * code/branches/network/presentation/network (added) * code/branches/network/presentation/network/node.dia (moved) * code/branches/network/presentation/network/node.png (moved) * code/branches/network/presentation/network/overview2.dia (moved) * code/branches/network/presentation/network/overview2.png (moved) * code/branches/network/presentation/network/slides-new.odp (moved) * code/branches/network/presentation/network_structure.dia (deleted) * code/branches/network/presentation/overview-2.png (deleted) * code/branches/network/presentation/overview.dia (deleted) * code/branches/network/presentation/overview.jpg (deleted) * code/branches/network/presentation/slides.odp (deleted) cleaned up presentation folder Sat, 24 May 2008 11:13:15 GMT scheusso [1404] * code/branches/network/presentation/node.dia (added) * code/branches/network/presentation/node.png (added) * code/branches/network/presentation/overview2.dia (added) * code/branches/network/presentation/overview2.png (added) * code/branches/network/presentation/slides-new.odp (added) added new dia and changed slides (3slides now) Sat, 24 May 2008 09:51:54 GMT scheusso [1403] * code/branches/network/presentation (added) * code/branches/network/presentation/network_structure.dia (added) * code/branches/network/presentation/overview-2.png (added) * code/branches/network/presentation/overview.dia (added) * code/branches/network/presentation/overview.jpg (added) * code/branches/network/presentation/slides.odp (added) created presentation folder and added files from last presentation Sat, 24 May 2008 00:51:31 GMT landauf [1402] * code/branches/console/src/core/ArgumentCompletionFunctions.cc (modified) * 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) * code/branches/console/src/core/ConsoleCommand.cc (modified) backup-commit Fri, 23 May 2008 22:25:35 GMT FelixSchulthess [1401] * code/trunk/src/orxonox/objects/SpaceShip.cc (modified) better this way Fri, 23 May 2008 22:24:30 GMT FelixSchulthess [1400] * code/trunk/bin/levels/sample.oxw (modified) * code/trunk/src/orxonox/hud/HUD.cc (modified) * code/trunk/src/orxonox/hud/Navigation.cc (modified) * code/trunk/src/orxonox/hud/Navigation.h (modified) * code/trunk/src/orxonox/hud/RadarObject.h (modified) * code/trunk/src/orxonox/hud/RadarOverlayElement.cc (modified) * code/trunk/src/orxonox/hud/RadarOverlayElement.h (modified) * code/trunk/src/orxonox/objects/SpaceShip.cc (modified) * code/trunk/src/orxonox/objects/SpaceShip.h (modified) moved to spaceship what belonged there Fri, 23 May 2008 20:27:52 GMT FelixSchulthess [1399] * code/trunk/src/orxonox/hud/HUD.cc (modified) * code/trunk/src/orxonox/hud/Navigation.cc (modified) * code/trunk/src/orxonox/hud/Navigation.h (modified) * code/trunk/src/orxonox/hud/RadarOverlayElement.cc (modified) * code/trunk/src/orxonox/objects/Camera.h (modified) * code/trunk/src/orxonox/objects/SpaceShip.cc (modified) * code/trunk/src/orxonox/objects/SpaceShip.h (modified) enhanced navigation with a target designation cursor Fri, 23 May 2008 17:12:05 GMT rgrieder [1398] * code/branches/network/src/core/InputHandler.cc (modified) * code/branches/network/src/core/InputHandler.h (modified) * code/branches/network/src/core/InputManager.cc (modified) * code/branches/network/src/orxonox/objects/SpaceShip.cc (modified) * code/branches/network/src/orxonox/objects/SpaceShip.h (modified) - removed the mouseHandler in SpaceShip Fri, 23 May 2008 17:04:37 GMT scheusso [1397] * code/branches/network/bin/keybindings.ini (modified) fixed keybindings Fri, 23 May 2008 16:55:25 GMT FelixSchulthess [1396] * code/trunk/src/orxonox/hud/Navigation.cc (modified) last 2 commits were accidentally, because i used shel command ... Fri, 23 May 2008 16:52:17 GMT FelixSchulthess [1395] * code/trunk/src/orxonox/hud/Navigation.cc (modified) * code/trunk/src/orxonox/hud/Navigation.h (modified) moved navigation marker to new class: Navigation Fri, 23 May 2008 16:49:46 GMT FelixSchulthess [1394] * code/trunk/src/orxonox/hud/HUD.cc (modified) * code/trunk/src/orxonox/hud/HUD.h (modified) * code/trunk/src/orxonox/hud/Navigation.cc (modified) * code/trunk/src/orxonox/hud/Navigation.h (modified) moved navigation marker to new class: Navigation Fri, 23 May 2008 16:40:19 GMT FelixSchulthess [1393] * code/trunk/bin/keybindings.ini (modified) * code/trunk/src/orxonox/CMakeLists.txt (modified) * code/trunk/src/orxonox/hud/HUD.cc (modified) * code/trunk/src/orxonox/hud/HUD.h (modified) * code/trunk/src/orxonox/hud/Navigation.cc (added) * code/trunk/src/orxonox/hud/Navigation.h (added) * code/trunk/src/orxonox/hud/RadarObject.cc (modified) * code/trunk/src/orxonox/hud/RadarObject.h (modified) * code/trunk/src/orxonox/hud/RadarOverlayElement.cc (modified) * code/trunk/src/orxonox/hud/RadarOverlayElement.h (modified) moved navigation marker to new class: Navigation Fri, 23 May 2008 14:38:02 GMT FelixSchulthess [1392] * code/trunk/src/orxonox/hud/BarOverlayElement.cc (modified) * code/trunk/src/orxonox/hud/BarOverlayElement.h (modified) * code/trunk/src/orxonox/hud/HUD.cc (modified) * code/trunk/src/orxonox/hud/HUD.h (modified) * code/trunk/src/orxonox/hud/RadarObject.cc (modified) * code/trunk/src/orxonox/hud/RadarObject.h (modified) * code/trunk/src/orxonox/hud/RadarOverlayElement.cc (modified) * code/trunk/src/orxonox/hud/RadarOverlayElement.h (modified) moved #includes to .cc from .h where possible Fri, 23 May 2008 14:02:03 GMT rgrieder [1391] * code/branches/network/bin/keybindings.ini (modified) * code/branches/network/src/core/CommandExecutor.cc (modified) * code/branches/network/src/core/InputHandler.cc (modified) * code/branches/network/src/core/InputHandler.h (modified) * code/branches/network/src/core/InputManager.cc (modified) * code/branches/network/src/orxonox/Orxonox.cc (modified) * code/branches/network/src/orxonox/objects/SpaceShip.cc (modified) * code/branches/network/src/orxonox/objects/SpaceShip.h (modified) - fixed some bugs Fri, 23 May 2008 00:10:52 GMT landauf [1390] * code/branches/console/src/core/ArgumentCompletionFunctions.cc (added) * code/branches/console/src/core/ArgumentCompletionFunctions.h (added) * code/branches/console/src/core/CMakeLists.txt (modified) * 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) * code/branches/console/src/core/ConsoleCommand.cc (added) * code/branches/console/src/core/ConsoleCommand.h (modified) * code/branches/console/src/core/Identifier.cc (modified) only girls sleep at this time :P (started new implementation of ... Thu, 22 May 2008 15:53:24 GMT scheusso [1389] * code/branches/network/src/network/ClientInformation.cc (modified) * code/branches/network/src/network/ClientInformation.h (modified) * code/branches/network/src/network/ConnectionManager.cc (modified) * code/branches/network/src/network/Server.cc (modified) some fixes in client disconnect procedure -- mostly because of ... Thu, 22 May 2008 15:39:19 GMT FelixSchulthess [1388] * code/trunk/bin/levels/sample.oxw (modified) * code/trunk/src/orxonox/hud/HUD.cc (modified) * code/trunk/src/orxonox/hud/HUD.h (modified) more static hud functions Thu, 22 May 2008 15:22:33 GMT FelixSchulthess [1387] * 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) * code/trunk/src/orxonox/hud/RadarOverlayElement.cc (modified) * code/trunk/src/orxonox/hud/RadarOverlayElement.h (modified) made HUD singleton Thu, 22 May 2008 15:03:28 GMT scheusso [1386] * code/branches/network/src/orxonox/objects/SpaceShip.cc (modified) we need that enable mousehandler in spaceship .... Thu, 22 May 2008 14:58:58 GMT scheusso [1385] * code/branches/network/src/orxonox/hud/HUD.cc (modified) another fix in hud Thu, 22 May 2008 14:55:24 GMT scheusso [1384] * code/branches/network/src/orxonox/hud/HUD.cc (modified) * code/branches/network/src/orxonox/hud/RadarOverlayElement.cc (modified) changed radar handling (SpaceShip::instance is now ... Thu, 22 May 2008 14:45:32 GMT bknecht [1383] * code/branches/script_trigger/bin/levels/sample.oxw (modified) * code/branches/script_trigger/src/core/CMakeLists.txt (modified) * code/branches/script_trigger/src/orxonox/CMakeLists.txt (modified) * code/branches/script_trigger/src/orxonox/objects/Model.cc (modified) * code/branches/script_trigger/src/orxonox/objects/Script.cc (added) * code/branches/script_trigger/src/orxonox/objects/Script.h (added) * code/branches/script_trigger/src/orxonox/objects/SpaceShip.cc (modified) * code/branches/script_trigger/src/orxonox/objects/Trigger.cc (added) * code/branches/script_trigger/src/orxonox/objects/Trigger.h (added) crazy stuff!! triggers and the best: you can now use the lua function ... Thu, 22 May 2008 14:41:43 GMT FelixSchulthess [1382] * code/branches/hud (deleted) removed another hud branch Thu, 22 May 2008 14:41:19 GMT FelixSchulthess [1381] * code/branches/hud2 (deleted) removed another hud branch Thu, 22 May 2008 14:40:54 GMT FelixSchulthess [1380] * code/branches/hud3 (deleted) removed hud branch 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