# # ChangeLog for code/branches # # Generated by Trac 1.0.9 # Nov 18, 2024, 4:59:40 PM Mon, 17 Dec 2007 01:09:32 GMT landauf [558] * code/branches/FICN/bin/main.bat (added) for windows only: added another bat-file to see the console output ... Mon, 17 Dec 2007 01:08:05 GMT landauf [557] * code/branches/FICN/bin/run-script.bat (modified) for windows only: modified run-script.bat, but you shouldn't use ... Mon, 17 Dec 2007 01:06:02 GMT landauf [556] * code/branches/FICN/src/orxonox/objects/Model.cc (added) * code/branches/FICN/src/orxonox/objects/Model.h (added) added missing files Mon, 17 Dec 2007 01:05:20 GMT landauf [555] * code/branches/FICN/src/loader/CMakeLists.txt (modified) * code/branches/FICN/src/network/CMakeLists.txt (modified) * code/branches/FICN/src/orxonox/CMakeLists.txt (modified) * code/branches/FICN/src/orxonox/core/CMakeLists.txt (modified) * code/branches/FICN/src/orxonox/hud/CMakeLists.txt (modified) * code/branches/FICN/src/orxonox/objects/CMakeLists.txt (modified) * code/branches/FICN/src/orxonox/particle/CMakeLists.txt (modified) * code/branches/FICN/src/orxonox/weapon/CMakeLists.txt (modified) * code/branches/FICN/src/tinyxml/CMakeLists.txt (modified) WIN32 hack in CLs Mon, 17 Dec 2007 00:58:26 GMT landauf [554] * code/branches/FICN/src/orxonox/objects/WorldEntity.cc (modified) * code/branches/FICN/src/orxonox/objects/WorldEntity.h (modified) removed scenemanager hack and used orxonox.h Mon, 17 Dec 2007 00:19:13 GMT rgrieder [553] * code/branches/FICN/src/loader/loader_platform.h (modified) * code/branches/FICN/src/orxonox/core/Factory.cc (modified) * code/branches/FICN/src/orxonox/core/Factory.h (modified) - some minor change in static initialisation of factory (this ... Mon, 17 Dec 2007 00:11:28 GMT landauf [552] * code/branches/FICN/src/orxonox/core/Factory.cc (modified) * code/branches/FICN/src/orxonox/core/Factory.h (modified) removed stupid hack Mon, 17 Dec 2007 00:02:01 GMT landauf [551] * code/branches/FICN/src/orxonox/core/Factory.cc (modified) * code/branches/FICN/src/orxonox/core/Factory.h (modified) funny hack, i hope this works for reto Sun, 16 Dec 2007 23:58:07 GMT nicolasc [550] * code/branches/FICN/Media/material (deleted) * code/branches/FICN/Media/materials/scripts/ast.material (added) * code/branches/FICN/Media/materials/textures/rock.png (added) * code/branches/FICN/Media/models/ast1.mesh (added) * code/branches/FICN/Media/models/ast2.mesh (added) * code/branches/FICN/Media/models/ast3.mesh (added) * code/branches/FICN/Media/models/ast4.mesh (added) * code/branches/FICN/Media/models/ast5.mesh (added) * code/branches/FICN/Media/models/ast6.mesh (added) - added asteroids - thanks to felix schulthess - replaced ogreheads ... Sun, 16 Dec 2007 23:18:53 GMT landauf [549] * code/branches/FICN/cmake/FindENet.cmake (modified) spaaaaaaaaaaaaartaaaaaaaaaaaa!!!!! Sun, 16 Dec 2007 23:16:51 GMT landauf [548] * code/branches/FICN/src/orxonox/CMakeLists.txt (modified) shared for nonwindows Sun, 16 Dec 2007 23:16:02 GMT landauf [547] * code/branches/FICN/CMakeLists.txt (modified) * code/branches/FICN/cmake/FindENet.cmake (modified) * code/branches/FICN/cmake/FindZLIB.cmake (modified) * code/branches/FICN/src/orxonox/CMakeLists.txt (modified) * code/branches/FICN/src/orxonox/objects/CMakeLists.txt (modified) compiles with mingw Sun, 16 Dec 2007 21:19:03 GMT bknecht [546] * code/branches/FICN/src/orxonox/graphicsEngine.cc (modified) * code/branches/FICN/src/orxonox/main.cc (modified) * code/branches/FICN/src/orxonox/orxonox.cc (modified) suggestion for solution of WinMain problem Sun, 16 Dec 2007 17:37:31 GMT nicolasc [545] * code/branches/FICN/src/orxonox/orxonox.cc (modified) tmp workaround: uncomment the search for path Sun, 16 Dec 2007 17:00:13 GMT rgrieder [544] * code/branches/FICN/src/orxonox/main.cc (modified) * code/branches/FICN/src/orxonox/particle/ParticleInterface.cc (modified) - added WinMain (no argument parser yet) - made a few more ... Sun, 16 Dec 2007 16:54:49 GMT bknecht [543] * code/branches/FICN/src/orxonox/core/ArgReader.cc (added) * code/branches/FICN/src/orxonox/core/ArgReader.h (added) files added Sun, 16 Dec 2007 16:54:06 GMT bknecht [542] * code/branches/FICN/bin/resources.cfg (modified) * code/branches/FICN/src/orxonox/core/CMakeLists.txt (modified) * code/branches/FICN/src/orxonox/orxonox.cc (modified) added an argument reader Sun, 16 Dec 2007 16:40:34 GMT nicolasc [541] * code/branches/FICN/bin/levels/sample.oxw (modified) * code/branches/FICN/src/orxonox/orxonox.cc (modified) - fixed the sample.oxw - cannot place comments withing -tag ... Sun, 16 Dec 2007 02:29:10 GMT landauf [540] * code/branches/FICN/src/orxonox/core/ClassFactory.h (modified) debug output Sun, 16 Dec 2007 01:04:21 GMT nicolasc [539] * code/branches/FICN/CMakeLists.txt (modified) * code/branches/FICN/Media/materials/textures/bigflame.png (added) * code/branches/FICN/Media/materials/textures/black.png (added) * code/branches/FICN/Media/materials/textures/explosion.png (added) * code/branches/FICN/Media/materials/textures/flaretrail.png (added) * code/branches/FICN/Media/materials/textures/human_assf.png (modified) * code/branches/FICN/Media/materials/textures/ring_flare.png (added) * code/branches/FICN/Media/materials/textures/ring_flare2.png (added) * code/branches/FICN/Media/materials/textures/streak.png (added) * code/branches/FICN/Media/textures (deleted) * code/branches/FICN/bin/resources.cfg (modified) * code/branches/FICN/cmake/FindZLIB.cmake (moved) * code/branches/FICN/src/network/CMakeLists.txt (modified) * code/branches/FICN/src/orxonox/orxonox.cc (modified) - standardized FindZLIB.cmake - minor cleanup in Media Sun, 16 Dec 2007 00:34:51 GMT landauf [538] * code/branches/FICN/CMakeLists.txt (modified) * code/branches/FICN/src/network/CMakeLists.txt (modified) * code/branches/FICN/src/network/dummyclient2.cc (modified) * code/branches/FICN/src/orxonox/objects/CMakeLists.txt (modified) windows library include (for enet) Sun, 16 Dec 2007 00:07:59 GMT nicolasc [537] * code/branches/FICN/Media/materials/scripts/assf2.material (modified) * code/branches/FICN/Media/particle/schuss.particle (modified) * code/branches/FICN/bin/levels/sample.oxw (modified) * code/branches/FICN/src/orxonox/orxonox.cc (modified) got particle system wroking Sat, 15 Dec 2007 23:57:38 GMT landauf [536] * code/branches/FICN/cmake/FindALUT.cmake (modified) * code/branches/FICN/cmake/FindBoost.cmake (modified) * code/branches/FICN/cmake/FindCEGUI.cmake (modified) * code/branches/FICN/cmake/FindCEGUI_OGRE.cmake (modified) * code/branches/FICN/cmake/FindENet.cmake (modified) * code/branches/FICN/cmake/FindOGRE.cmake (modified) * code/branches/FICN/cmake/FindOIS.cmake (modified) * code/branches/FICN/cmake/FindOggVorbis.cmake (modified) * code/branches/FICN/cmake/FindOpenAL.cmake (modified) * code/branches/FICN/cmake/FindZlib.cmake (added) * code/branches/FICN/src/audio/CMakeLists.txt (modified) * code/branches/FICN/src/network/dummyclient3.cc (modified) adjustments for windows Sat, 15 Dec 2007 23:44:44 GMT nicolasc [535] * code/branches/FICN/Media/materials/scripts/PE_materials.material (copied) * code/branches/FICN/bin/resources.cfg (modified) * code/branches/FICN/src/orxonox/CMakeLists.txt (modified) * code/branches/FICN/src/orxonox/orxonox.cc (modified) * code/branches/FICN/src/orxonox/particle (added) * code/branches/FICN/src/orxonox/particle/CMakeLists.txt (added) * code/branches/FICN/src/orxonox/particle/ParticleInterface.cc (added) * code/branches/FICN/src/orxonox/particle/ParticleInterface.h (added) * code/branches/FICN/src/particle (deleted) * code/branches/particle-old/ParticleREADME.txt (modified) - moved particle(-system) to a better place - included ... Sat, 15 Dec 2007 21:48:50 GMT bknecht [534] * code/branches/FICN/src/orxonox/main.cc (modified) * code/branches/FICN/src/orxonox/orxonox.cc (modified) some updates Sat, 15 Dec 2007 18:32:23 GMT rgrieder [533] * code/branches/FICN/src/network/dummyserver3.cc (modified) * code/branches/FICN/src/orxonox/InputManager.h (modified) * code/branches/FICN/src/orxonox/objects/WorldEntity.h (modified) - some minor changes in order to make the project compile with VC08 ... Sat, 15 Dec 2007 09:45:45 GMT sweber [532] * code/branches/particle-old/ParticleREADME.txt (added) added a readme-file with a example how to use the particles Sat, 15 Dec 2007 05:37:35 GMT scheusso [531] * code/branches/FICN/bin/run-script (modified) * code/branches/FICN/run (modified) * code/branches/FICN/src/network/PacketDecoder.cc (modified) * code/branches/FICN/src/network/PacketManager.h (modified) * code/branches/FICN/src/network/Synchronisable.cc (modified) * code/branches/FICN/src/orxonox/core/CoreIncludes.h (modified) * code/branches/FICN/src/orxonox/objects/Entity.cc (modified) * code/branches/FICN/src/orxonox/objects/Entity.h (modified) * code/branches/FICN/src/orxonox/orxonox.cc (modified) * code/branches/FICN/src/orxonox/orxonox.h (modified) * code/branches/FICN/src/orxonox/spaceship_steering.cc (modified) started implementing presentation ;) Fri, 14 Dec 2007 12:32:17 GMT nicolasc [530] * code/branches/FICN/src/orxonox/orxonox.cc (modified) test upload Thu, 13 Dec 2007 23:27:21 GMT nicolasc [529] * code/branches/FICN/bin/CMakeCache.txt (deleted) * code/branches/FICN/bin/levels/.dolphinview (deleted) unneeded files removed Thu, 13 Dec 2007 23:14:48 GMT nicolasc [528] * code/branches/FICN/Media/materials/scripts/assf2.material (modified) * code/branches/FICN/Media/materials/textures/human_assf.jpg (added) uploaded missing jpg texture chaged texture back to jpg Thu, 13 Dec 2007 23:08:20 GMT nicolape [527] * code/branches/FICN/bin/levels/sample.oxw (modified) changed some stuff on level file Thu, 13 Dec 2007 23:06:31 GMT nicolape [526] * code/branches/FICN/bin/levels/sample.oxw (modified) changed some stuff on level file Thu, 13 Dec 2007 22:54:00 GMT nicolape [525] * code/branches/FICN/bin/levels/sample.oxw (modified) * code/branches/FICN/src/loader/LevelLoader.cc (modified) * code/branches/FICN/src/loader/LevelLoader.h (modified) * code/branches/FICN/src/orxonox/orxonox.cc (modified) Running again, but only with hack, don't know why the loader can't ... Thu, 13 Dec 2007 22:28:55 GMT nicolasc [524] * code/branches/FICN/cmakeclearcache (modified) - made cmakeclearcache safe, that it only deletes files that it should Thu, 13 Dec 2007 22:27:55 GMT nicolasc [523] * code/branches/FICN/src/orxonox/CMakeLists.txt (modified) * code/branches/FICN/src/orxonox/inertial_node.h (modified) * code/branches/FICN/src/orxonox/orxonox.cc (modified) - removed an not needed header - made cmakeclearcache safe, that it ... Thu, 13 Dec 2007 22:07:00 GMT nicolape [522] * code/branches/FICN/Media/materials/textures/sample_loading.jpg (moved) Moved loading image to a better location Thu, 13 Dec 2007 22:05:27 GMT nicolape [521] * code/branches/FICN/Media/materials/scripts/Orxonox.material (modified) * code/branches/FICN/Media/materials/scripts/assf2.material (modified) * code/branches/FICN/Media/overlay/OrxonoxLoading.overlay (added) * code/branches/FICN/src/loader/LevelLoader.cc (modified) Fixed bug for assf texture, added loading overlay (its now working, ... Thu, 13 Dec 2007 19:39:18 GMT nicolape [520] * code/branches/FICN/Media/textures/sample_loading.jpg (added) Added loading screen for sample level Thu, 13 Dec 2007 17:45:17 GMT nicolape [519] * code/branches/FICN/bin/levels/sample.oxw (modified) * code/branches/FICN/src/orxonox/objects/SpaceshipSteeringObject.cc (modified) * code/branches/FICN/src/orxonox/orxonox.cc (modified) Loading the steering works, but there is something odd with the ... Thu, 13 Dec 2007 17:31:06 GMT nicolasc [518] * code/branches/FICN/src/orxonox/objects/libobjects.so (deleted) rmeoved unnescessary libojects Thu, 13 Dec 2007 17:30:32 GMT nicolasc [517] * code/branches/FICN/src/orxonox/objects/Makefile (deleted) * code/branches/FICN/src/orxonox/objects/libobjects.so (modified) rmeoved unnescessary Makefile Thu, 13 Dec 2007 17:28:15 GMT nicolape [516] * code/branches/FICN/src/orxonox/objects/CMakeFiles (deleted) * code/branches/FICN/src/orxonox/objects/cmake_install.cmake (deleted) Ups.. these cmake files should not be comitted Thu, 13 Dec 2007 17:21:22 GMT nicolape [515] * code/branches/FICN/bin/levels/sample.oxw (modified) * code/branches/FICN/src/orxonox/objects/CMakeFiles (added) * code/branches/FICN/src/orxonox/objects/CMakeFiles/CMakeDirectoryInformation.cmake (added) * code/branches/FICN/src/orxonox/objects/CMakeFiles/objects.dir (added) * code/branches/FICN/src/orxonox/objects/CMakeFiles/objects.dir/CXX.includecache (added) * code/branches/FICN/src/orxonox/objects/CMakeFiles/objects.dir/DependInfo.cmake (added) * code/branches/FICN/src/orxonox/objects/CMakeFiles/objects.dir/build.make (added) * code/branches/FICN/src/orxonox/objects/CMakeFiles/objects.dir/cmake_clean.cmake (added) * code/branches/FICN/src/orxonox/objects/CMakeFiles/objects.dir/cmake_clean_target.cmake (added) * code/branches/FICN/src/orxonox/objects/CMakeFiles/objects.dir/depend.internal (added) * code/branches/FICN/src/orxonox/objects/CMakeFiles/objects.dir/depend.make (added) * code/branches/FICN/src/orxonox/objects/CMakeFiles/objects.dir/depend.make.mark (added) * code/branches/FICN/src/orxonox/objects/CMakeFiles/objects.dir/flags.make (added) * code/branches/FICN/src/orxonox/objects/CMakeFiles/objects.dir/link.txt (added) * code/branches/FICN/src/orxonox/objects/CMakeFiles/objects.dir/progress.make (added) * code/branches/FICN/src/orxonox/objects/CMakeFiles/progress.make (added) * code/branches/FICN/src/orxonox/objects/CMakeLists.txt (modified) * code/branches/FICN/src/orxonox/objects/Camera.cc (added) * code/branches/FICN/src/orxonox/objects/Camera.h (added) * code/branches/FICN/src/orxonox/objects/Entity.cc (added) * code/branches/FICN/src/orxonox/objects/Entity.h (added) * code/branches/FICN/src/orxonox/objects/Makefile (added) * code/branches/FICN/src/orxonox/objects/SceneNode.cc (added) * code/branches/FICN/src/orxonox/objects/SceneNode.h (added) * code/branches/FICN/src/orxonox/objects/SpaceshipSteeringObject.cc (added) * code/branches/FICN/src/orxonox/objects/SpaceshipSteeringObject.h (added) * code/branches/FICN/src/orxonox/objects/cmake_install.cmake (added) * code/branches/FICN/src/orxonox/objects/libobjects.so (added) * code/branches/FICN/src/orxonox/orxonox.cc (modified) * code/branches/FICN/src/orxonox/orxonox.h (modified) * code/branches/FICN/src/orxonox/spaceship_steering.cc (modified) * code/branches/FICN/src/orxonox/spaceship_steering.h (modified) Added some objects for the level loader Thu, 13 Dec 2007 17:02:07 GMT nicolasc [514] * code/branches/FICN/src/network/Client.cc (modified) * code/branches/FICN/src/network/ClientConnection.cc (modified) * code/branches/FICN/src/network/ClientInformation.cc (modified) * code/branches/FICN/src/network/ConnectionManager.cc (modified) * code/branches/FICN/src/network/GameStateClient.cc (modified) * code/branches/FICN/src/network/GameStateManager.cc (modified) * code/branches/FICN/src/network/PacketBuffer.cc (modified) * code/branches/FICN/src/network/PacketBufferTestExt.cc (modified) * code/branches/FICN/src/network/PacketDecoder.cc (modified) * code/branches/FICN/src/network/PacketGenerator.cc (modified) * code/branches/FICN/src/network/dummyclient.cc (modified) * code/branches/FICN/src/network/dummyclient2.cc (modified) * code/branches/FICN/src/network/dummyserver.cc (modified) added copyright notice Thu, 13 Dec 2007 16:58:14 GMT nicolasc [513] * code/branches/FICN/src/audio/AudioBuffer.cc (modified) * code/branches/FICN/src/audio/AudioManager.cc (modified) * code/branches/FICN/src/audio/AudioSource.cc (modified) * code/branches/FICN/src/audio/AudioStream.cc (modified) * code/branches/FICN/src/audio/_AudioObject.cc (modified) * code/branches/FICN/src/hud/hud_overlay.cc (modified) * code/branches/FICN/src/loader/LevelLoader.cc (modified) * code/branches/FICN/src/orxonox/core/ConfigValueContainer.cc (modified) * code/branches/FICN/src/orxonox/core/Error.cc (modified) * code/branches/FICN/src/orxonox/core/Factory.cc (modified) * code/branches/FICN/src/orxonox/core/Identifier.cc (modified) * code/branches/FICN/src/orxonox/core/IdentifierList.cc (modified) * code/branches/FICN/src/orxonox/core/MetaObjectList.cc (modified) * code/branches/FICN/src/orxonox/core/OrxonoxClass.cc (modified) * code/branches/FICN/src/orxonox/hud/hud_overlay.cc (modified) * code/branches/FICN/src/orxonox/hud/test_overlay.cc (modified) * code/branches/FICN/src/orxonox/inertial_node.cc (modified) * code/branches/FICN/src/orxonox/objects/Ambient.cc (modified) * code/branches/FICN/src/orxonox/objects/BaseObject.cc (modified) * code/branches/FICN/src/orxonox/objects/Skybox.cc (modified) * code/branches/FICN/src/orxonox/objects/WorldEntity.cc (modified) * code/branches/FICN/src/orxonox/orxonox_scene.cc (modified) * code/branches/FICN/src/orxonox/orxonox_ship.cc (modified) * code/branches/FICN/src/orxonox/run_manager.cc (modified) * code/branches/FICN/src/orxonox/spaceship_steering.cc (modified) * code/branches/FICN/src/orxonox/weapon/ammunition_dump.cc (modified) * code/branches/FICN/src/orxonox/weapon/barrel_gun.cc (modified) * code/branches/FICN/src/orxonox/weapon/base_weapon.cc (modified) * code/branches/FICN/src/orxonox/weapon/bullet.cc (modified) * code/branches/FICN/src/orxonox/weapon/bullet_manager.cc (modified) * code/branches/FICN/src/orxonox/weapon/weapon_station.cc (modified) * code/branches/FICN/src/particle/ParticleInterface.cc (modified) added copyright notice network still need to be done Thu, 13 Dec 2007 14:56:28 GMT nicolasc [512] * code/branches/FICN/src/orxonox/CMakeLists.txt (modified) * code/branches/FICN/src/orxonox/InputManager.cc (added) * code/branches/FICN/src/orxonox/InputManager.h (added) * code/branches/FICN/src/orxonox/orxonox.cc (modified) - some minor check fix in steering - added template inputmanager ... Thu, 13 Dec 2007 13:49:26 GMT nicolape [511] * code/branches/FICN/bin/levels/sample.oxw (modified) * code/branches/FICN/src/orxonox/orxonox.cc (modified) Reto added steering bug fix Thu, 13 Dec 2007 12:52:36 GMT nicolape [510] * code/branches/FICN/Media/materials/scripts/Orxonox.material (modified) * code/branches/FICN/Media/packs/skybox.zip (modified) * code/branches/FICN/bin/levels/sample.oxw (modified) * code/branches/FICN/src/orxonox/orxonox.cc (modified) Added one more skybox Thu, 13 Dec 2007 12:22:56 GMT nicolape [509] * code/branches/FICN/Media/materials/scripts/Orxonox.material (modified) * code/branches/FICN/Media/packs/skybox.zip (modified) Added sample skybox Thu, 13 Dec 2007 11:53:36 GMT nicolape [508] * code/branches/FICN/Media/materials/scripts/Orxonox.material (added) * code/branches/FICN/bin/levels/sample.oxw (modified) Added orxonox material file Wed, 12 Dec 2007 22:34:58 GMT nicolape [507] * code/branches/FICN/src/loader/LevelLoader.cc (modified) * code/branches/FICN/src/loader/LevelLoader.h (modified) * code/branches/FICN/src/loader/Light.cc (deleted) * code/branches/FICN/src/loader/Light.h (deleted) * code/branches/FICN/src/loader/LightManager.cc (deleted) * code/branches/FICN/src/loader/LightManager.h (deleted) * code/branches/FICN/src/misc (added) * code/branches/FICN/src/misc/String2Number.h (copied) * code/branches/FICN/src/misc/Tokenizer.h (added) * code/branches/FICN/src/orxonox/objects/Ambient.cc (added) * code/branches/FICN/src/orxonox/objects/Ambient.h (added) * code/branches/FICN/src/orxonox/objects/CMakeLists.txt (modified) * code/branches/FICN/src/orxonox/objects/Skybox.cc (added) * code/branches/FICN/src/orxonox/objects/Skybox.h (added) * code/branches/FICN/src/orxonox/objects/test1.cc (modified) * code/branches/FICN/src/orxonox/orxonox.cc (modified) * code/branches/FICN/src/xml (deleted) - Skybox and ambient light load now from level file sample.oxw. Added ... Wed, 12 Dec 2007 22:32:18 GMT nicolape [506] * code/branches/FICN/bin/levels/sample.oxw (modified) Skybox and ambient light added Wed, 12 Dec 2007 22:28:38 GMT scheusso [505] * code/branches/FICN/src/network/ConnectionManager.cc (modified) * code/branches/FICN/src/network/GameStateClient.cc (modified) * code/branches/FICN/src/network/GameStateClient.h (modified) * code/branches/FICN/src/network/TODO (modified) * code/branches/FICN/src/orxonox/orxonox.cc (modified) gamestateclient completet Wed, 12 Dec 2007 21:48:23 GMT nicolasc [504] * code/branches/mainloop (deleted) * code/branches/network (deleted) more cleanup Wed, 12 Dec 2007 21:46:06 GMT nicolasc [503] * code/branches/merger (deleted) cleanup Wed, 12 Dec 2007 21:45:41 GMT nicolasc [502] * code/branches/FICN/Media/material (copied) * code/branches/FICN/Media/material/PE_materials.material (copied) * code/branches/FICN/Media/particle/rauch.particle (copied) * code/branches/FICN/Media/particle/schuss.particle (copied) * code/branches/FICN/Media/particle/strahl.particle (copied) * code/branches/FICN/Media/particle/strahl2.particle (copied) * code/branches/FICN/Media/particle/treibwerk.particle (copied) * code/branches/FICN/Media/textures (copied) * code/branches/FICN/Media/textures/Thumbs.db (copied) * code/branches/FICN/Media/textures/bigflame.png (copied) * code/branches/FICN/Media/textures/black.png (copied) * code/branches/FICN/Media/textures/explosion.png (copied) * code/branches/FICN/Media/textures/flare.png (copied) * code/branches/FICN/Media/textures/flaretrail.png (copied) * code/branches/FICN/Media/textures/ring_flare.png (copied) * code/branches/FICN/Media/textures/ring_flare2.png (copied) * code/branches/FICN/Media/textures/smoke.png (copied) * code/branches/FICN/Media/textures/streak.png (copied) * code/branches/FICN/bin/resources.cfg (modified) * code/branches/FICN/src/hud (copied) * code/branches/FICN/src/hud/CMakeLists.txt (copied) * code/branches/FICN/src/hud/hud_overlay.cc (copied) * code/branches/FICN/src/hud/hud_overlay.h (copied) * code/branches/FICN/src/particle (copied) * code/branches/FICN/src/particle/ParticleInterface.cc (copied) * code/branches/FICN/src/particle/ParticleInterface.h (copied) merged merger branch back in FICN Wed, 12 Dec 2007 21:44:00 GMT nicolasc [501] * code/branches/hud-old (moved) moved hud to hud-old for archive Wed, 12 Dec 2007 21:43:44 GMT nicolasc [500] * code/branches/hud0old (moved) moved hud to hud-old for archive Wed, 12 Dec 2007 21:41:23 GMT landauf [499] * code/branches/FICN/src/orxonox/core/Debug.h (added) added Debug.h from objecthierarchy Wed, 12 Dec 2007 21:40:20 GMT nicolasc [498] * code/branches/merger/src/hud (copied) c/p hud-overlay from hud Wed, 12 Dec 2007 21:39:49 GMT landauf [497] * code/branches/FICN/src/orxonox/core/ConfigValueContainer.cc (added) * code/branches/FICN/src/orxonox/core/ConfigValueContainer.h (added) * code/branches/FICN/src/orxonox/core/CoreIncludes.h (added) * code/branches/FICN/src/orxonox/core/IdentifierIncludes.h (deleted) * code/branches/FICN/src/orxonox/core/SignalHandler.cc (added) * code/branches/FICN/src/orxonox/core/SignalHandler.h (added) * code/branches/FICN/src/orxonox/objects/WorldEntity.cc (added) * code/branches/FICN/src/orxonox/objects/WorldEntity.h (added) added the new files from objecthierarchy Wed, 12 Dec 2007 21:37:30 GMT landauf [496] * code/branches/FICN/src/loader/LevelLoader.cc (modified) * code/branches/FICN/src/network/Client.cc (modified) * code/branches/FICN/src/network/Client.h (modified) * code/branches/FICN/src/network/ConnectionManager.cc (modified) * code/branches/FICN/src/network/ConnectionManager.h (modified) * code/branches/FICN/src/network/GameStateClient.h (modified) * code/branches/FICN/src/network/GameStateManager.h (modified) * code/branches/FICN/src/network/Synchronisable.h (modified) * code/branches/FICN/src/orxonox/core/CMakeLists.txt (modified) * code/branches/FICN/src/orxonox/core/ClassFactory.h (modified) * code/branches/FICN/src/orxonox/core/Factory.cc (modified) * code/branches/FICN/src/orxonox/core/Factory.h (modified) * code/branches/FICN/src/orxonox/core/Identifier.cc (modified) * code/branches/FICN/src/orxonox/core/Identifier.h (modified) * code/branches/FICN/src/orxonox/core/IdentifierList.cc (modified) * code/branches/FICN/src/orxonox/core/Iterator.h (modified) * code/branches/FICN/src/orxonox/core/MetaObjectList.h (modified) * code/branches/FICN/src/orxonox/core/ObjectList.h (modified) * code/branches/FICN/src/orxonox/core/OrxonoxClass.h (modified) * code/branches/FICN/src/orxonox/main.cc (modified) * code/branches/FICN/src/orxonox/objects/BaseObject.cc (modified) * code/branches/FICN/src/orxonox/objects/BaseObject.h (modified) * code/branches/FICN/src/orxonox/objects/CMakeLists.txt (modified) * code/branches/FICN/src/orxonox/objects/Test.h (modified) * code/branches/FICN/src/orxonox/objects/Tickable.h (modified) * code/branches/FICN/src/orxonox/objects/Timer.h (modified) * code/branches/FICN/src/orxonox/objects/test3.cc (modified) * code/branches/FICN/src/orxonox/objects/test3.h (modified) * code/branches/FICN/src/orxonox/orxonox.cc (modified) added files from objecthierarchy, changed includes Wed, 12 Dec 2007 21:37:06 GMT motth [495] * code/branches/AI/src/AIClass.h (modified) * code/branches/AI/src/Arrival.h (modified) * code/branches/AI/src/Flocking.h (modified) * code/branches/AI/src/orxonox.cc (modified) fixed a memory leak, added documentation Wed, 12 Dec 2007 21:37:02 GMT nicolasc [494] * code/branches/audio (deleted) removed old audio branch Wed, 12 Dec 2007 21:36:21 GMT nicolasc [493] * code/branches/xml (deleted) * code/branches/xml-old (deleted) removed old xml branches Wed, 12 Dec 2007 21:35:13 GMT nicolasc [492] * code/branches/particle (deleted) Wed, 12 Dec 2007 21:34:41 GMT nicolasc [491] * code/branches/particle-old (copied) moved particle to particle old Wed, 12 Dec 2007 21:33:38 GMT nicolasc [490] * code/branches/merger/Media/material (copied) * code/branches/merger/Media/material/PE_materials.material (copied) * code/branches/merger/Media/particle/rauch.particle (copied) * code/branches/merger/Media/particle/schuss.particle (copied) * code/branches/merger/Media/particle/strahl.particle (copied) * code/branches/merger/Media/particle/strahl2.particle (copied) * code/branches/merger/Media/particle/treibwerk.particle (copied) * code/branches/merger/Media/textures (copied) * code/branches/merger/Media/textures/Thumbs.db (copied) * code/branches/merger/Media/textures/bigflame.png (copied) * code/branches/merger/Media/textures/black.png (copied) * code/branches/merger/Media/textures/explosion.png (copied) * code/branches/merger/Media/textures/flare.png (copied) * code/branches/merger/Media/textures/flaretrail.png (copied) * code/branches/merger/Media/textures/ring_flare.png (copied) * code/branches/merger/Media/textures/ring_flare2.png (copied) * code/branches/merger/Media/textures/smoke.png (copied) * code/branches/merger/Media/textures/streak.png (copied) * code/branches/merger/bin/resources.cfg (modified) * code/branches/merger/src/particle (copied) * code/branches/merger/src/particle/ParticleInterface.cc (copied) * code/branches/merger/src/particle/ParticleInterface.h (copied) merged particle branch Wed, 12 Dec 2007 21:29:08 GMT nicolasc [489] * code/branches/merger (copied) created new merger branch to merge particle hud an some other ... Wed, 12 Dec 2007 21:27:56 GMT nicolasc [488] * code/branches/merger (deleted) removed old merger branch Wed, 12 Dec 2007 20:56:56 GMT nicolasc [487] * code/branches/FICN/src/orxonox/orxonox.cc (modified) fix Wed, 12 Dec 2007 20:49:44 GMT nicolasc [486] * code/branches/FICN/src/audio/CMakeLists.txt (modified) * code/branches/FICN/src/orxonox/orxonox.cc (modified) * code/branches/FICN/src/tinyxml/CMakeLists.txt (added) - added missing CML in tinyxml - minor cleanup in audio CML - ... Wed, 12 Dec 2007 19:29:01 GMT gabrieho [485] * code/branches/skybox/src/Universe.cpp~ (deleted) * code/branches/skybox/src/Universe.h~ (deleted) skybox working but poor Wed, 12 Dec 2007 19:28:14 GMT gabrieho [484] * code/branches/skybox/src/Universe.cpp (added) * code/branches/skybox/src/Universe.cpp~ (added) * code/branches/skybox/src/Universe.h (added) * code/branches/skybox/src/Universe.h~ (added) lala Wed, 12 Dec 2007 19:25:40 GMT gabrieho [483] * code/branches/skybox/bin/resources.cfg (modified) * code/branches/skybox/src/CMakeLists.txt (modified) * code/branches/skybox/src/orxonox.cc (modified) working but still poor skybox :) Wed, 12 Dec 2007 19:19:40 GMT nicolape [482] * code/branches/FICN/src/network/CMakeLists.txt (modified) * code/branches/FICN/src/orxonox/CMakeLists.txt (modified) * code/branches/FICN/src/orxonox/objects/CMakeLists.txt (modified) * code/branches/FICN/src/orxonox/objects/test1.cc (modified) * code/branches/FICN/src/orxonox/orxonox.cc (modified) Added example implementation of world entity Wed, 12 Dec 2007 18:58:09 GMT nicolasc [481] * code/branches/FICN/Media/materials/scripts/assf2.material (added) * code/branches/FICN/Media/materials/textures/human_assf.png (added) * code/branches/FICN/Media/models/assf2.mesh (added) added first own model get display a little small, and in the wrong ... Wed, 12 Dec 2007 18:54:44 GMT nicolape [480] * code/branches/FICN/bin/levels/sample.oxw (modified) * code/branches/FICN/bin/levels/sp_level_moonstation.oxw (deleted) * code/branches/FICN/src/CMakeLists.txt (modified) * code/branches/FICN/src/loader/CMakeLists.txt (modified) * code/branches/FICN/src/loader/LevelLoader.cc (modified) * code/branches/FICN/src/loader/LevelLoader.h (modified) * code/branches/FICN/src/orxonox/CMakeLists.txt (modified) * code/branches/FICN/src/orxonox/core/OrxonoxClass.h (modified) * code/branches/FICN/src/orxonox/objects/BaseObject.cc (modified) * code/branches/FICN/src/orxonox/objects/BaseObject.h (modified) * code/branches/FICN/src/orxonox/objects/CMakeLists.txt (modified) * code/branches/FICN/src/orxonox/objects/test1.cc (modified) * code/branches/FICN/src/orxonox/objects/test1.h (modified) * code/branches/FICN/src/orxonox/orxonox.cc (modified) Level loader working, see test1 class Wed, 12 Dec 2007 18:40:50 GMT scheusso [479] * code/branches/FICN/src/network/Server.cc (modified) huhu Wed, 12 Dec 2007 18:34:30 GMT scheusso [478] * code/branches/FICN/src/network/PacketManager.h (modified) spagat Wed, 12 Dec 2007 18:28:33 GMT scheusso [477] * code/branches/FICN/src/network/PacketManager.h (modified) * code/branches/FICN/src/network/Server.h (modified) * code/branches/FICN/src/network/dummyserver3.cc (modified) blub Wed, 12 Dec 2007 17:42:36 GMT scheusso [476] * code/branches/FICN/src/network/dummyserver3.cc (modified) bla Wed, 12 Dec 2007 17:36:18 GMT scheusso [475] * code/branches/FICN/src/network/CMakeLists.txt (modified) * code/branches/FICN/src/network/ConnectionManager.h (modified) * code/branches/FICN/src/network/PacketManager.h (modified) * code/branches/FICN/src/network/Server.h (modified) * code/branches/FICN/src/network/dummyserver3.cc (modified) some improvements in chatserver/client Wed, 12 Dec 2007 17:26:56 GMT nicolape [474] * code/branches/FICN/src/loader/LevelLoader.cc (modified) * code/branches/FICN/src/loader/LevelLoader.h (modified) * code/branches/FICN/src/orxonox/core/OrxonoxClass.h (modified) Wed, 12 Dec 2007 17:11:30 GMT bknecht [473] * code/branches/FICN/src/orxonox/graphicsEngine.cc (modified) * code/branches/FICN/src/orxonox/main.cc (modified) * code/branches/FICN/src/orxonox/orxonox.cc (modified) * code/branches/FICN/src/orxonox/orxonox.h (modified) should work again, sorry Wed, 12 Dec 2007 14:11:44 GMT landauf [472] * code/branches/objecthierarchy/bin/resources.cfg (modified) * code/branches/objecthierarchy/src/orxonox/core/CoreIncludes.h (modified) * code/branches/objecthierarchy/src/orxonox/objects/WorldEntity.cc (modified) * code/branches/objecthierarchy/src/orxonox/objects/WorldEntity.h (modified) added acceleration, rotationRate and momentum Wed, 12 Dec 2007 13:45:01 GMT nicolape [471] * code/branches/FICN/src/loader/CMakeLists.txt (modified) * code/branches/FICN/src/loader/LevelLoader.cc (modified) * code/branches/FICN/src/loader/LevelLoader.h (modified) * code/branches/FICN/src/tinyxml (added) * code/branches/FICN/src/tinyxml/tinystr.cc (added) * code/branches/FICN/src/tinyxml/tinystr.h (added) * code/branches/FICN/src/tinyxml/tinyxml.cc (added) * code/branches/FICN/src/tinyxml/tinyxml.h (added) * code/branches/FICN/src/tinyxml/tinyxmlerror.cc (added) * code/branches/FICN/src/tinyxml/tinyxmlparser.cc (added) Added tinyxml library Wed, 12 Dec 2007 13:30:29 GMT nicolape [470] * code/branches/FICN/bin/levels/sample.oxw (modified) * code/branches/FICN/src/loader/LevelLoader.cc (modified) * code/branches/FICN/src/loader/LevelLoader.h (modified) Did some changes to levelloader Wed, 12 Dec 2007 13:15:24 GMT nicolape [469] * code/branches/FICN/bin/levels/sample.oxw (moved) * code/branches/FICN/src/loader/LevelLoader.cc (modified) * code/branches/FICN/src/loader/LevelLoader.h (modified) * code/branches/FICN/src/orxonox/orxonox.cc (modified) Disabled some stuff on loader Wed, 12 Dec 2007 12:50:59 GMT landauf [468] * code/branches/AI/bin/resources.cfg (modified) * code/branches/AI/src/orxonox.cc (modified) changed resources.cfg Wed, 12 Dec 2007 12:46:14 GMT nicolape [467] * code/branches/FICN/sample.oxw (copied) added sample level Wed, 12 Dec 2007 12:25:03 GMT scheusso [466] * code/branches/FICN/CMakeLists.txt (modified) fixed CML Wed, 12 Dec 2007 12:24:22 GMT landauf [465] * code/branches/AI/src/orxonox.cc (modified) include Wed, 12 Dec 2007 12:23:10 GMT landauf [464] * code/branches/AI/src/CMakeLists.txt (modified) * code/branches/AI/src/SignalHandler.cc (added) * code/branches/AI/src/SignalHandler.h (added) * code/branches/AI/src/orxonox.cc (modified) added signal handler to AI branch Wed, 12 Dec 2007 12:19:31 GMT scheusso [463] * code/branches/FICN/src/network/NetworkFrameListener.h (added) missing file, sorry Wed, 12 Dec 2007 11:42:30 GMT bknecht [462] * code/branches/FICN/CMakeLists.txt (modified) * code/branches/FICN/src/orxonox/CMakeLists.txt (modified) * code/branches/FICN/src/orxonox/graphicsEngine.cc (added) * code/branches/FICN/src/orxonox/graphicsEngine.h (added) * code/branches/FICN/src/orxonox/main.cc (added) * code/branches/FICN/src/orxonox/orxonox.cc (modified) * code/branches/FICN/src/orxonox/orxonox.h (added) * code/branches/FICN/src/orxonox/orxonoxOLD.cc (added) got my work to compile (it's all hacked together and I dunno if it ... Wed, 12 Dec 2007 00:22:06 GMT landauf [461] * code/branches/objecthierarchy/src/orxonox/objects/WorldEntity.cc (modified) dt Wed, 12 Dec 2007 00:18:46 GMT landauf [460] * code/branches/objecthierarchy/src/CMakeLists.txt (modified) * code/branches/objecthierarchy/src/orxonox/core/CoreIncludes.h (modified) * code/branches/objecthierarchy/src/orxonox/core/OrxonoxClass.h (modified) * code/branches/objecthierarchy/src/orxonox/objects/WorldEntity.cc (added) * code/branches/objecthierarchy/src/orxonox/objects/WorldEntity.h (added) * code/branches/objecthierarchy/src/orxonox/orxonox.cc (modified) first try to add a WorldEntity. at the moment it's just a class with ... Tue, 11 Dec 2007 23:35:52 GMT scheusso [459] * code/branches/FICN/src/network/Client.cc (modified) * code/branches/FICN/src/network/Client.h (modified) * code/branches/FICN/src/network/Server.cc (modified) * code/branches/FICN/src/network/Server.h (modified) * code/branches/FICN/src/network/Synchronisable.h (modified) * code/branches/FICN/src/network/dummyclient3.cc (modified) * code/branches/FICN/src/orxonox/orxonox.cc (modified) preparing clone mode for game (one server steers, all clients view ;) )