# # ChangeLog for code/branches/FICN # # Generated by Trac 1.0.9 # Nov 22, 2024, 1:35:06 PM Sun, 09 Dec 2007 22:24:25 GMT scheusso [448] * code/branches/FICN/src/network/CMakeLists.txt (modified) * code/branches/FICN/src/network/Client.cc (modified) * code/branches/FICN/src/network/ClientConnection.cc (modified) * code/branches/FICN/src/network/dummyclient3.cc (modified) some bugfixes(clientinformation, client), enhancements(client, ... Sun, 09 Dec 2007 19:44:04 GMT scheusso [446] * code/branches/FICN/src/network/ClientInformation.cc (modified) * code/branches/FICN/src/network/ConnectionManager.cc (modified) * code/branches/FICN/src/network/dummyclient2.cc (modified) * code/branches/FICN/src/network/dummyclient3.cc (modified) * code/branches/FICN/src/network/dummyserver3.cc (modified) corrected clientinformation::removeClient(enet event) Sun, 09 Dec 2007 19:14:53 GMT scheusso [445] * code/branches/FICN/src/network/dummyclient.cc (modified) * code/branches/FICN/src/network/dummyserver.cc (modified) minor changes Sun, 09 Dec 2007 18:02:16 GMT scheusso [444] * code/branches/FICN/src/network/ClientInformation.cc (modified) * code/branches/FICN/src/network/ClientInformation.h (modified) * code/branches/FICN/src/network/ConnectionManager.cc (modified) * code/branches/FICN/src/network/Server.cc (modified) * code/branches/FICN/src/network/dummyserver3.cc (modified) chatserver/client ok Sun, 09 Dec 2007 17:01:24 GMT scheusso [442] * code/branches/FICN/src/network/ClientInformation.cc (modified) * code/branches/FICN/src/network/ConnectionManager.cc (modified) * code/branches/FICN/src/network/Server.cc (modified) * code/branches/FICN/src/network/dummyclient2.cc (modified) * code/branches/FICN/src/network/dummyserver.cc (modified) still problems with chatserver/client Sun, 09 Dec 2007 16:45:12 GMT scheusso [441] * code/branches/FICN/src/network/CMakeLists.txt (modified) * code/branches/FICN/src/network/Makefile.test (modified) * code/branches/FICN/src/network/dummyclient2.cc (modified) * code/branches/FICN/src/network/dummyclient3.cc (modified) * code/branches/FICN/src/network/dummyserver.cc (modified) * code/branches/FICN/src/network/dummyserver3.cc (modified) some cmake hacking, some testing Sun, 09 Dec 2007 14:48:16 GMT scheusso [440] * code/branches/FICN/src/network/CMakeLists.txt (modified) * code/branches/FICN/src/network/Makefile.test (modified) * code/branches/FICN/src/network/PacketDecoder.cc (modified) * code/branches/FICN/src/network/PacketManager.h (modified) * code/branches/FICN/src/network/Server.h (modified) * code/branches/FICN/src/network/dummyserver3.cc (added) added dummyserver3.cc (implements a chatserver, including main) Sun, 09 Dec 2007 13:54:26 GMT scheusso [439] * code/branches/FICN/src/network/Client.cc (modified) * code/branches/FICN/src/network/TODO (modified) corrected a minor mistake Sun, 09 Dec 2007 13:45:07 GMT dumenim [438] * code/branches/FICN/src/network/Client.cc (modified) * code/branches/FICN/src/network/Client.h (modified) * code/branches/FICN/src/network/dummyclient3.cc (added) Client got a new function send Chat Sun, 09 Dec 2007 12:46:03 GMT dumenim [437] * code/branches/FICN/src/network/PacketDecoder.cc (modified) * code/branches/FICN/src/network/PacketGenerator.cc (modified) * code/branches/FICN/src/network/PacketManager.h (modified) changed PacketGenerator/Decoder with diffed Sun, 09 Dec 2007 11:42:46 GMT scheusso [436] * code/branches/FICN/src/network/ClientInformation.cc (modified) * code/branches/FICN/src/network/ClientInformation.h (modified) * code/branches/FICN/src/network/ConnectionManager.cc (modified) * code/branches/FICN/src/network/ConnectionManager.h (modified) * code/branches/FICN/src/network/GameStateClient.cc (modified) * code/branches/FICN/src/network/GameStateClient.h (modified) * code/branches/FICN/src/network/GameStateManager.cc (modified) * code/branches/FICN/src/network/GameStateManager.h (modified) * code/branches/FICN/src/network/PacketTypes.h (modified) * code/branches/FICN/src/network/Server.cc (modified) * code/branches/FICN/src/network/Server.h (modified) * code/branches/FICN/src/network/TODO (modified) extended gamestatehandling for diffed and not diffed gamestates ... Fri, 07 Dec 2007 11:51:59 GMT landauf [433] * code/branches/FICN/src/orxonox/objects/Tickable.h (modified) * code/branches/FICN/src/orxonox/objects/Timer.h (modified) less includes Thu, 06 Dec 2007 17:39:50 GMT scheusso [432] * code/branches/FICN/src/network/ClientInformation.cc (added) * code/branches/FICN/src/network/ClientInformation.h (added) and here come the files from r431 ;) Thu, 06 Dec 2007 17:39:14 GMT scheusso [431] * code/branches/FICN/src/network/CMakeLists.txt (modified) Added class ClientInformation - implements a listelement for ... Wed, 05 Dec 2007 22:47:05 GMT nicolape [430] * code/branches/FICN/bin/audio/ambient/a1.ogg (added) * code/branches/FICN/bin/audio/ambient/a2.ogg (added) * code/branches/FICN/bin/audio/ambient/a3.ogg (added) * code/branches/FICN/src/audio/AudioManager.cc (modified) * code/branches/FICN/src/audio/AudioManager.h (modified) * code/branches/FICN/src/audio/AudioStream.cc (modified) * code/branches/FICN/src/audio/AudioStream.h (modified) * code/branches/FICN/src/orxonox/orxonox.cc (modified) We now have a background sound playlist Wed, 05 Dec 2007 22:18:03 GMT scheusso [429] * code/branches/FICN/src/network/TODO (added) added todo-file Wed, 05 Dec 2007 21:21:12 GMT nicolasc [427] * code/branches/FICN/Media/models/razor.mesh (added) * code/branches/FICN/src/orxonox/orxonox.cc (modified) exchanged ogrehead for razor-fighter Wed, 05 Dec 2007 21:06:29 GMT scheusso [425] * code/branches/FICN/src/network/Client.cc (modified) * code/branches/FICN/src/network/Client.h (modified) * code/branches/FICN/src/network/GameStateManager.cc (modified) * code/branches/FICN/src/network/GameStateManager.h (modified) * code/branches/FICN/src/network/Server.cc (modified) some minor changes Wed, 05 Dec 2007 20:25:27 GMT nicolape [424] * code/branches/FICN/src/audio/AudioStream.cc (modified) Audio bla Wed, 05 Dec 2007 20:20:44 GMT nicolape [423] * code/branches/FICN/src/audio/AudioManager.cc (modified) * code/branches/FICN/src/audio/AudioStream.cc (modified) * code/branches/FICN/src/audio/AudioStream.h (modified) * code/branches/FICN/src/orxonox/core/Error.cc (modified) Wed, 05 Dec 2007 20:17:22 GMT scheusso [422] * code/branches/FICN/src/network/GameStateManager.cc (modified) * code/branches/FICN/src/network/GameStateManager.h (modified) * code/branches/FICN/src/network/PacketManager.h (modified) * code/branches/FICN/src/network/Server.cc (modified) * code/branches/FICN/src/network/Server.h (modified) extended GameStateManager Wed, 05 Dec 2007 18:49:53 GMT nicolape [421] * code/branches/FICN/src/orxonox/core/Error.cc (added) * code/branches/FICN/src/orxonox/core/Error.h (added) Added error message class in orxonxo core. One can call it with ... Wed, 05 Dec 2007 18:49:35 GMT nicolape [420] * code/branches/FICN/src/audio/AudioIncludes.h (modified) * code/branches/FICN/src/audio/AudioManager.cc (modified) * code/branches/FICN/src/orxonox/core/CMakeLists.txt (modified) Added error message class in orxonxo core. One can call it with ... Wed, 05 Dec 2007 18:28:46 GMT nicolape [419] * code/branches/FICN/src/audio/AudioManager.cc (modified) * code/branches/FICN/src/audio/AudioManager.h (modified) * code/branches/FICN/src/audio/AudioStream.cc (modified) * code/branches/FICN/src/audio/CMakeLists.txt (modified) * code/branches/FICN/src/orxonox/orxonox.cc (modified) We now have a nice backgroundsound playing Wed, 05 Dec 2007 17:38:47 GMT bknecht [418] * code/branches/FICN/cmake/FindBoost.cmake (modified) cool fix for boost compiling Wed, 05 Dec 2007 17:24:38 GMT scheusso [417] * code/branches/FICN/src/network/PacketTypes.h (added) blabla Wed, 05 Dec 2007 17:24:04 GMT scheusso [416] * code/branches/FICN/src/network/GameStateClient.cc (added) * code/branches/FICN/src/network/GameStateClient.h (added) blabla Wed, 05 Dec 2007 17:23:10 GMT scheusso [415] * code/branches/FICN/src/network/CMakeLists.txt (modified) * code/branches/FICN/src/network/Client.cc (modified) * code/branches/FICN/src/network/ConnectionManager.cc (modified) * code/branches/FICN/src/network/GameStateManager.h (modified) * code/branches/FICN/src/network/PacketDecoder.cc (modified) * code/branches/FICN/src/network/PacketGenerator.cc (modified) * code/branches/FICN/src/network/PacketManager.h (modified) errorless Wed, 05 Dec 2007 16:59:35 GMT nicolape [414] * code/branches/FICN/bin/.dolphinview (deleted) * code/branches/FICN/bin/audio/.dolphinview (deleted) * code/branches/FICN/bin/audio/ambient/.dolphinview (deleted) * code/branches/FICN/run (added) Removed unused files, added run script Wed, 05 Dec 2007 16:59:25 GMT scheusso [413] * code/branches/FICN/src/network/Client.cc (modified) * code/branches/FICN/src/network/Client.h (modified) * code/branches/FICN/src/network/GameStateManager.cc (modified) * code/branches/FICN/src/network/GameStateManager.h (modified) * code/branches/FICN/src/network/PacketManager.h (modified) * code/branches/FICN/src/network/Server.h (modified) still errors Wed, 05 Dec 2007 16:54:03 GMT nicolasc [412] * code/branches/FICN/bin (added) * code/branches/FICN/bin/.dolphinview (added) * code/branches/FICN/bin/CMakeCache.txt (added) * code/branches/FICN/bin/audio (added) * code/branches/FICN/bin/audio/.dolphinview (added) * code/branches/FICN/bin/audio/ambient (added) * code/branches/FICN/bin/audio/ambient/.dolphinview (added) * code/branches/FICN/bin/audio/ambient/ambient1.ogg (added) * code/branches/FICN/bin/audio/ambient/ambient2.ogg (added) * code/branches/FICN/bin/audio/ambient/ambient3.ogg (added) * code/branches/FICN/bin/audio/sounds (added) * code/branches/FICN/bin/audio/sounds/.dolphinview (added) * code/branches/FICN/bin/audio/sounds/laser1.wav (added) * code/branches/FICN/bin/levels (added) * code/branches/FICN/bin/levels/.dolphinview (added) * code/branches/FICN/bin/levels/sp_level_moonstation.oxw (added) * code/branches/FICN/bin/media.cfg (added) * code/branches/FICN/bin/ogre.cfg-init (added) * code/branches/FICN/bin/plugins.cfg-init (added) * code/branches/FICN/bin/quake3settings.cfg (added) * code/branches/FICN/bin/resources.cfg (added) * code/branches/FICN/bin/run-script (added) * code/branches/FICN/bin/run-script.bat (added) readded /bin Wed, 05 Dec 2007 16:29:12 GMT nicolape [411] * code/branches/FICN/src/audio/AudioStream.cc (modified) * code/branches/FICN/src/audio/AudioStream.h (modified) * code/branches/FICN/src/audio/CMakeLists.txt (modified) Some changes on streamer Wed, 05 Dec 2007 16:24:16 GMT nicolape [410] * code/branches/FICN/src/audio/AudioStream.cc (added) * code/branches/FICN/src/audio/AudioStream.h (added) Added ogg streamer class Wed, 05 Dec 2007 16:22:27 GMT nicolape [409] * code/branches/FICN/bin (deleted) * code/branches/FICN/cmake/FindALUT.cmake (modified) * code/branches/FICN/cmake/FindOggVorbis.cmake (modified) * code/branches/FICN/cmake/FindOpenAL.cmake (modified) * code/branches/FICN/src/audio/AudioBuffer.h (modified) * code/branches/FICN/src/audio/AudioManager.h (modified) * code/branches/FICN/src/audio/AudioSource.h (modified) * code/branches/FICN/src/audio/CMakeLists.txt (modified) * code/branches/FICN/src/audio/_Ambient.cc (deleted) * code/branches/FICN/src/audio/_Ambient.h (deleted) * code/branches/FICN/src/audio/_AudioObject.h (deleted) Simplified cmake audio lib messages Wed, 05 Dec 2007 16:19:44 GMT nicolape [408] * code/branches/FICN/bin/audio/sounds/laser1.wav (added) Added laser sound Wed, 05 Dec 2007 15:58:02 GMT dumenim [407] * code/branches/FICN/src/network/GameStateManager.cc (modified) compress/decompress funcions added Wed, 05 Dec 2007 15:45:54 GMT nicolasc [406] * code/branches/FICN/cmake/FindOggVorbis.cmake (modified) fixed ogg/vorbis paths Wed, 05 Dec 2007 15:40:46 GMT scheusso [405] * code/branches/FICN/src/network/Client.cc (modified) * code/branches/FICN/src/network/Client.h (modified) * code/branches/FICN/src/network/GameStateManager.cc (modified) * code/branches/FICN/src/network/GameStateManager.h (modified) * code/branches/FICN/src/network/PacketDecoder.cc (modified) * code/branches/FICN/src/network/PacketGenerator.cc (modified) * code/branches/FICN/src/network/PacketManager.h (modified) * code/branches/FICN/src/network/Synchronisable.cc (modified) corrected errors Wed, 05 Dec 2007 15:33:57 GMT nicolape [404] * code/branches/FICN/src/audio/AudioIncludes.h (added) * code/branches/FICN/src/audio/CMakeLists.txt (modified) Wed, 05 Dec 2007 15:23:52 GMT dumenim [403] * code/branches/FICN/src/network/GameStateManager.cc (modified) * code/branches/FICN/src/network/GameStateManager.h (modified) * code/branches/FICN/src/network/PacketDecoder.cc (modified) * code/branches/FICN/src/network/PacketGenerator.cc (modified) * code/branches/FICN/src/network/PacketManager.h (modified) compressed gamestates Wed, 05 Dec 2007 15:22:20 GMT nicolape [402] * code/branches/FICN/CMakeLists.txt (modified) * code/branches/FICN/cmake/FindOggVorbis.cmake (modified) * code/branches/FICN/src/audio/CMakeLists.txt (modified) Fixed ogg loading Wed, 05 Dec 2007 15:10:19 GMT scheusso [401] * code/branches/FICN/CMakeLists.txt (modified) * code/branches/FICN/src/network/Client.cc (modified) * code/branches/FICN/src/network/ConnectionManager.cc (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) corrected some errors Wed, 05 Dec 2007 14:46:07 GMT scheusso [400] * 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/PacketDecoder.cc (modified) * code/branches/FICN/src/network/PacketGenerator.cc (modified) * code/branches/FICN/src/network/PacketManager.h (modified) * code/branches/FICN/src/network/Server.cc (modified) CLient, Server Wed, 05 Dec 2007 14:18:48 GMT nicolasc [396] * code/branches/FICN/src/CMakeLists.txt (modified) * code/branches/FICN/src/class_hierarchy (deleted) removed unneeded CH Wed, 05 Dec 2007 14:16:02 GMT nicolasc [395] * code/branches/FICN/src/xml/String2Number.h (added) c/p string2number from xml Wed, 05 Dec 2007 13:53:26 GMT mbiber [392] * code/branches/FICN/src/orxonox/spaceship_steering.cc (modified) fixed a bug in spaceship_steering.cc Wed, 05 Dec 2007 13:30:09 GMT nicolasc [389] * code/branches/FICN/CMakeLists.txt (modified) * code/branches/FICN/bin/audio (copied) * code/branches/FICN/bin/audio/ambient (copied) * code/branches/FICN/bin/audio/ambient/ambient1.ogg (copied) * code/branches/FICN/bin/audio/ambient/ambient2.ogg (copied) * code/branches/FICN/bin/audio/ambient/ambient3.ogg (copied) * code/branches/FICN/bin/audio/sounds (copied) * code/branches/FICN/cmake/FindALUT.cmake (copied) * code/branches/FICN/cmake/FindOggVorbis.cmake (copied) * code/branches/FICN/cmake/FindOpenAL.cmake (copied) * code/branches/FICN/cmakeclearcache (copied) * code/branches/FICN/src/CMakeLists.txt (modified) * code/branches/FICN/src/audio (copied) * code/branches/FICN/src/audio/AudioBuffer.cc (copied) * code/branches/FICN/src/audio/AudioBuffer.h (copied) * code/branches/FICN/src/audio/AudioManager.cc (copied) * code/branches/FICN/src/audio/AudioManager.h (copied) * code/branches/FICN/src/audio/AudioSource.cc (copied) * code/branches/FICN/src/audio/AudioSource.h (copied) * code/branches/FICN/src/audio/CMakeLists.txt (copied) * code/branches/FICN/src/audio/_Ambient.cc (copied) * code/branches/FICN/src/audio/_Ambient.h (copied) * code/branches/FICN/src/audio/_AudioObject.cc (copied) * code/branches/FICN/src/audio/_AudioObject.h (copied) * code/branches/FICN/src/class_hierarchy (added) * code/branches/FICN/src/class_hierarchy/BaseObject.cc (added) * code/branches/FICN/src/class_hierarchy/BaseObject.h (added) * code/branches/FICN/src/class_hierarchy/CMakeLists.txt (added) * code/branches/FICN/src/class_hierarchy/ClassHierarchy.cc (added) * code/branches/FICN/src/class_hierarchy/ClassHierarchy.h (added) * code/branches/FICN/src/class_hierarchy/Identifier.cc (added) * code/branches/FICN/src/class_hierarchy/Identifier.h (added) * code/branches/FICN/src/class_hierarchy/IdentifierIncludes.h (added) * code/branches/FICN/src/class_hierarchy/IdentifierList.cc (added) * code/branches/FICN/src/class_hierarchy/IdentifierList.h (added) * code/branches/FICN/src/class_hierarchy/ObjectList.cc (added) * code/branches/FICN/src/class_hierarchy/ObjectList.h (added) * code/branches/FICN/src/class_hierarchy/OrxonoxClass.cc (added) * code/branches/FICN/src/class_hierarchy/OrxonoxClass.h (added) * code/branches/FICN/src/class_hierarchy/Test.h (added) * code/branches/FICN/src/class_hierarchy/orxonox.cc (added) * code/branches/FICN/src/class_hierarchy/test1.cc (added) * code/branches/FICN/src/class_hierarchy/test1.h (added) * code/branches/FICN/src/class_hierarchy/test2.cc (added) * code/branches/FICN/src/class_hierarchy/test2.h (added) * code/branches/FICN/src/class_hierarchy/test3.cc (added) * code/branches/FICN/src/class_hierarchy/test3.h (added) * code/branches/FICN/src/orxonox/CMakeLists.txt (modified) * code/branches/FICN/src/orxonox/orxonox.cc (modified) merged audio into FICN Tue, 04 Dec 2007 23:21:31 GMT nicolasc [386] * code/branches/FICN/CMakeLists.txt (modified) some *FLAGS tweaking Tue, 04 Dec 2007 23:05:46 GMT scheusso [385] * code/branches/FICN/src/network/GameStateManager.cc (modified) * code/branches/FICN/src/network/GameStateManager.h (modified) extended GameStateManager: added functions - encode (takes two ... Tue, 04 Dec 2007 22:48:28 GMT landauf [384] * 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/IdentifierIncludes.h (modified) * code/branches/FICN/src/orxonox/core/IdentifierList.cc (modified) * code/branches/FICN/src/orxonox/core/IdentifierList.h (modified) * code/branches/FICN/src/orxonox/core/Iterator.h (modified) * code/branches/FICN/src/orxonox/core/MetaObjectList.cc (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.cc (modified) * code/branches/FICN/src/orxonox/core/OrxonoxClass.h (modified) * code/branches/FICN/src/orxonox/objects/BaseObject.h (modified) * code/branches/FICN/src/orxonox/objects/Tickable.h (added) * code/branches/FICN/src/orxonox/objects/Timer.h (added) * code/branches/FICN/src/orxonox/objects/test1.cc (modified) * code/branches/FICN/src/orxonox/objects/test1.h (modified) * code/branches/FICN/src/orxonox/objects/test2.cc (modified) * code/branches/FICN/src/orxonox/objects/test2.h (modified) copied changed files from objecthierarchy-branch Tue, 04 Dec 2007 22:29:20 GMT nicolasc [382] * code/branches/FICN/CMakeLists.txt (modified) * code/branches/FICN/src/loader/loader_platform.h (modified) added CXXFLAGS to force warning output! Tue, 04 Dec 2007 21:00:43 GMT scheusso [381] * code/branches/FICN/src/network/ConnectionManager.cc (modified) * code/branches/FICN/src/network/ConnectionManager.h (modified) * code/branches/FICN/src/network/Makefile.test (added) * code/branches/FICN/src/network/Server.cc (modified) using stl-map and stl-vector in ConnectionManaget should now work Tue, 04 Dec 2007 19:22:24 GMT scheusso [380] * code/branches/FICN/src/network/ConnectionManager.cc (modified) * code/branches/FICN/src/network/ConnectionManager.h (modified) * code/branches/FICN/src/network/Server.cc (modified) * code/branches/FICN/src/network/Server.h (modified) problem in connectionmanager Tue, 04 Dec 2007 19:21:47 GMT rgrieder [379] * code/branches/FICN/bin (modified) * code/branches/FICN/src/loader/LevelLoader.h (modified) * code/branches/FICN/src/loader/Light.h (modified) * code/branches/FICN/src/loader/LightManager.h (modified) * code/branches/FICN/src/loader/loader_platform.h (added) * code/branches/FICN/src/loader/loader_prereq.h (added) * code/branches/FICN/src/orxonox/orxonox.cc (modified) * code/branches/FICN/src/orxonox/spaceship_steering.cc (modified) - converted loader library to be compilable as a DLL - added ... Mon, 03 Dec 2007 21:14:04 GMT rgrieder [376] * code/branches/FICN/CMakeLists.txt (modified) * 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/weapon/CMakeLists.txt (modified) - removed the linker flags, since --no-undefined has no influence ... Mon, 03 Dec 2007 15:23:31 GMT rgrieder [374] * code/branches/FICN/src/network/PacketDecoder.cc (modified) * code/branches/FICN/src/network/PacketManager.h (modified) - commented 2 functions to make the network source compile Mon, 03 Dec 2007 15:03:29 GMT nicolasc [373] * 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/weapon/CMakeLists.txt (modified) some minor CML changes Mon, 03 Dec 2007 14:55:31 GMT nicolasc [372] * code/branches/FICN/src/network/CMakeLists.txt (modified) additional fixes Mon, 03 Dec 2007 14:44:30 GMT nicolasc [371] * code/branches/FICN/CMakeLists.txt (modified) * code/branches/FICN/cmake/FindBoost.cmake (modified) * code/branches/FICN/src/network/CMakeLists.txt (modified) fixed FindBoost.cmake Mon, 03 Dec 2007 12:40:31 GMT nicolasc [370] * code/branches/FICN/CMakeLists.txt (modified) with the help of the ISG.EE, boost should work now Sun, 02 Dec 2007 23:28:19 GMT scheusso [369] * code/branches/FICN/src/network/Client.cc (modified) * code/branches/FICN/src/network/Client.h (modified) * code/branches/FICN/src/network/ClientConnection.cc (modified) * code/branches/FICN/src/network/ClientConnection.h (modified) * code/branches/FICN/src/network/ConnectionManager.cc (modified) * code/branches/FICN/src/network/ConnectionManager.h (modified) * code/branches/FICN/src/network/GameStateManager.cc (modified) * code/branches/FICN/src/network/PacketDecoder.cc (modified) * code/branches/FICN/src/network/PacketManager.h (modified) * code/branches/FICN/src/network/Server.cc (modified) * code/branches/FICN/src/network/Server.h (modified) PacketDecoder: Extended Class to make inheriting easier... ... Sun, 02 Dec 2007 23:02:51 GMT nicolasc [368] * code/branches/FICN/src/orxonox/orxonox.cc (modified) changed windows string to "OrxonoxV2" Sun, 02 Dec 2007 17:06:48 GMT rgrieder [367] * code/branches/FICN (modified) * code/branches/FICN/bin (modified) * code/branches/FICN/src/network/PacketBufferTestExt.cc (modified) * code/branches/FICN/src/network/Synchronisable.cc (modified) * code/branches/FICN/src/network/dummyclient.cc (modified) * code/branches/FICN/src/network/dummyserver.cc (modified) * code/branches/FICN/src/orxonox/core/Identifier.h (modified) - made certain files windows compatible - solved conflict with ... Fri, 30 Nov 2007 00:42:04 GMT nicolasc [364] * code/branches/FICN/src/network/CMakeLists.txt (modified) * code/branches/FICN/src/orxonox/CMakeLists.txt (modified) added missing inertial_node target forced network to be static - ... Fri, 30 Nov 2007 00:20:20 GMT landauf [363] * 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/IdentifierIncludes.h (modified) added NetworkID small tutorial for oli and dumeni: every ... Thu, 29 Nov 2007 20:41:50 GMT rgrieder [359] * code/branches/FICN/src/orxonox/CMakeLists.txt (modified) - added inertial_node.cc, orxonox_ship.cc, orxonox_scene.cc and ... Thu, 29 Nov 2007 20:24:58 GMT rgrieder [358] * 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/weapon/CMakeLists.txt (modified) - fixed bug with SET_TARGET_PROPERTIES (works now according to linker ... Thu, 29 Nov 2007 19:41:04 GMT rgrieder [357] * code/branches/FICN/src/orxonox/CMakeLists.txt (modified) - added the -no--undefined flag to the linker command (may not work, ... Thu, 29 Nov 2007 17:22:24 GMT landauf [356] * code/branches/FICN/src/orxonox/objects/test3.cc (modified) * code/branches/FICN/src/orxonox/objects/test3.h (modified) bool -> void Thu, 29 Nov 2007 17:13:47 GMT landauf [355] * code/branches/FICN/src/network/ClientConnection.cc (modified) * code/branches/FICN/src/network/PacketBufferTestExt.cc (modified) * code/branches/FICN/src/network/dummyclient.cc (modified) * code/branches/FICN/src/network/dummyserver.cc (modified) changed retos usleep hack to a more generic solution: #ifdef WIN32 ... Thu, 29 Nov 2007 17:04:53 GMT nicolasc [354] * code/branches/FICN/CMakeLists.txt (modified) * code/branches/FICN/src/CMakeLists.txt (modified) * code/branches/FICN/src/loader/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) removed all STATIC flags -- according to besch it's worth it some ... Thu, 29 Nov 2007 16:54:28 GMT rgrieder [353] * code/branches/FICN/src/loader/CMakeLists.txt (modified) * code/branches/FICN/src/network/CMakeLists.txt (modified) - removed the STATIC keywords in the network and loader folder Thu, 29 Nov 2007 16:32:20 GMT scheusso [352] * code/branches/FICN/src/network/ClientConnection.cc (modified) * code/branches/FICN/src/network/ConnectionManager.cc (modified) * code/branches/FICN/src/network/PacketBufferTest.cc (deleted) * code/branches/FICN/src/network/dummyserver.cc (modified) corrected some compiler-warnings Thu, 29 Nov 2007 16:17:55 GMT scheusso [351] * code/branches/FICN/src/network/PacketBufferTestExt.cc (modified) * code/branches/FICN/src/network/Synchronisable.cc (modified) adjustet PacketBufferTestExt (because of changes in PacketBuffer) and ... Thu, 29 Nov 2007 15:44:50 GMT rgrieder [348] * code/branches/FICN/src/loader/CMakeLists.txt (modified) * code/branches/FICN/src/network/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/weapon/CMakeLists.txt (modified) - made all self written libraries (like loader, network, core, etc.) ... Thu, 29 Nov 2007 15:32:22 GMT rgrieder [347] * code/branches/FICN/src/loader/LevelLoader.cc (modified) * code/branches/FICN/src/loader/Light.cc (modified) * code/branches/FICN/src/loader/LightManager.cc (modified) * code/branches/FICN/src/orxonox/orxonox.cc (modified) * code/branches/FICN/src/xml/xmlParser.h (modified) - fixed a bug: under windows, XML uses wchar_t instead of char, but ... Thu, 29 Nov 2007 15:21:30 GMT rgrieder [346] * code/branches/FICN (modified) * code/branches/FICN/bin (modified) * code/branches/FICN/src/loader/LevelLoader.cc (modified) * code/branches/FICN/src/loader/Light.cc (modified) * code/branches/FICN/src/loader/Light.h (modified) * code/branches/FICN/src/loader/LightManager.cc (modified) * code/branches/FICN/src/loader/LightManager.h (modified) * code/branches/FICN/src/network/ClientConnection.cc (modified) * code/branches/FICN/src/network/GameStateManager.cc (modified) * code/branches/FICN/src/network/GameStateManager.h (modified) * code/branches/FICN/src/network/PacketBufferTest.cc (modified) * code/branches/FICN/src/network/PacketBufferTestExt.cc (modified) * code/branches/FICN/src/network/Synchronisable.cc (modified) * code/branches/FICN/src/network/Synchronisable.h (modified) * code/branches/FICN/src/network/dummyclient.cc (modified) * code/branches/FICN/src/network/dummyserver.cc (modified) * code/branches/FICN/src/orxonox/core/Identifier.h (modified) * code/branches/FICN/src/orxonox/inertial_node.cc (added) * code/branches/FICN/src/orxonox/objects/test3.cc (modified) * code/branches/FICN/src/orxonox/ogre_control.h (added) * code/branches/FICN/src/orxonox/orxonox.cc (modified) * code/branches/FICN/src/orxonox/orxonox_scene.cc (added) * code/branches/FICN/src/orxonox/orxonox_scene.h (added) * code/branches/FICN/src/orxonox/orxonox_ship.cc (added) * code/branches/FICN/src/orxonox/orxonox_ship.h (added) * code/branches/FICN/src/orxonox/run_manager.cc (added) - adjusted the entire source to compile under windows visual studio ... Wed, 28 Nov 2007 20:58:30 GMT rgrieder [342] * code/branches/FICN/src/orxonox/Flocking.h (added) * code/branches/FICN/src/orxonox/inertial_node.h (added) * code/branches/FICN/src/orxonox/orxonox_prerequisites.h (added) * code/branches/FICN/src/orxonox/run_manager.h (added) - added 4 files that got lost in the hurry Wed, 28 Nov 2007 20:54:59 GMT rgrieder [341] * code/branches/FICN/CMakeLists.txt (modified) * code/branches/FICN/src/CMakeLists.txt (modified) * code/branches/FICN/src/class_hierarchy (deleted) * 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/loader/Light.cc (modified) * code/branches/FICN/src/loader/Light.h (modified) * code/branches/FICN/src/loader/LightManager.cc (modified) * code/branches/FICN/src/loader/LightManager.h (modified) * code/branches/FICN/src/network/CMakeLists.txt (modified) * code/branches/FICN/src/network/PacketDecoder.cc (modified) * code/branches/FICN/src/network/PacketGenerator.cc (modified) * code/branches/FICN/src/network/PacketManager.h (modified) * code/branches/FICN/src/network/dummyserver.cc (modified) * code/branches/FICN/src/orxonox/CMakeLists.txt (modified) * code/branches/FICN/src/orxonox/Flocking.h (deleted) * code/branches/FICN/src/orxonox/core/CMakeLists.txt (modified) * code/branches/FICN/src/orxonox/hud/CMakeLists.txt (modified) * code/branches/FICN/src/orxonox/hud/hud_overlay.h (modified) * code/branches/FICN/src/orxonox/hud/test_overlay.h (modified) * code/branches/FICN/src/orxonox/inertial_node.h (deleted) * code/branches/FICN/src/orxonox/objects/BaseObject.h (modified) * code/branches/FICN/src/orxonox/objects/CMakeFiles (deleted) * code/branches/FICN/src/orxonox/objects/CMakeLists.txt (modified) * code/branches/FICN/src/orxonox/ogre_control.h (deleted) * code/branches/FICN/src/orxonox/orxonox.cc (modified) * code/branches/FICN/src/orxonox/orxonox.h (deleted) * code/branches/FICN/src/orxonox/orxonox_prerequisites.h (deleted) * code/branches/FICN/src/orxonox/orxonox_scene.h (deleted) * code/branches/FICN/src/orxonox/orxonox_ship.h (deleted) * code/branches/FICN/src/orxonox/run_manager.h (deleted) * code/branches/FICN/src/orxonox/weapon/CMakeLists.txt (modified) * code/branches/FICN/src/orxonox/weapon/ammunition_dump.cc (modified) * code/branches/FICN/src/orxonox/weapon/ammunition_dump.h (modified) * code/branches/FICN/src/orxonox/weapon/barrel_gun.cc (modified) * code/branches/FICN/src/orxonox/weapon/barrel_gun.h (modified) * code/branches/FICN/src/orxonox/weapon/base_weapon.cc (modified) * code/branches/FICN/src/orxonox/weapon/base_weapon.h (modified) * code/branches/FICN/src/orxonox/weapon/bullet.h (modified) * code/branches/FICN/src/orxonox/weapon/bullet_manager.h (modified) * code/branches/FICN/src/orxonox/weapon/weapon_station.h (modified) - removed folder src/class_hierarchy - removed a few unnec. files in ... Wed, 28 Nov 2007 20:36:07 GMT nicolasc [340] * code/branches/FICN/src/inertial_node.cc (deleted) * code/branches/FICN/src/ogre_control.cc (deleted) * code/branches/FICN/src/orxonox/Flocking.h (moved) * code/branches/FICN/src/orxonox/hud/hud_overlay.h (modified) * code/branches/FICN/src/orxonox/hud/test_overlay.h (modified) * code/branches/FICN/src/orxonox/inertial_node.h (moved) * code/branches/FICN/src/orxonox/ogre_control.h (moved) * code/branches/FICN/src/orxonox/orxonox.cc (modified) * code/branches/FICN/src/orxonox/orxonox.h (moved) * code/branches/FICN/src/orxonox/orxonox_prerequisites.h (moved) * code/branches/FICN/src/orxonox/orxonox_scene.h (moved) * code/branches/FICN/src/orxonox/orxonox_ship.h (moved) * code/branches/FICN/src/orxonox/run_manager.h (moved) * code/branches/FICN/src/orxonox_scene.cc (deleted) * code/branches/FICN/src/orxonox_ship.cc (deleted) * code/branches/FICN/src/run_manager.cc (deleted) applied retos proposals Wed, 28 Nov 2007 17:13:04 GMT bknecht [337] * code/branches/FICN/CMakeLists.txt (modified) * code/branches/FICN/INSTALL (modified) * code/branches/FICN/Media/materials (copied) * code/branches/FICN/Media/materials/scripts (copied) * code/branches/FICN/Media/materials/scripts/Example.material (copied) * code/branches/FICN/Media/materials/scripts/Examples.compositor (copied) * code/branches/FICN/Media/materials/scripts/Examples.program (copied) * code/branches/FICN/Media/materials/scripts/Ogre.material (copied) * code/branches/FICN/Media/materials/textures (copied) * code/branches/FICN/Media/materials/textures/Dirt.jpg (copied) * code/branches/FICN/Media/materials/textures/GreenSkin.jpg (copied) * code/branches/FICN/Media/materials/textures/RustyBarrel.png (copied) * code/branches/FICN/Media/materials/textures/RustySteel.jpg (copied) * code/branches/FICN/Media/materials/textures/WeirdEye.png (copied) * code/branches/FICN/Media/materials/textures/cursor.png (copied) * code/branches/FICN/Media/materials/textures/dirt01.jpg (copied) * code/branches/FICN/Media/materials/textures/flare.png (copied) * code/branches/FICN/Media/materials/textures/nskingr.jpg (copied) * code/branches/FICN/Media/materials/textures/ogreborder.png (copied) * code/branches/FICN/Media/materials/textures/ogreborderUp.png (copied) * code/branches/FICN/Media/materials/textures/ogrebordercenter.png (copied) * code/branches/FICN/Media/materials/textures/ogrelogo-small.jpg (copied) * code/branches/FICN/Media/materials/textures/ogrelogo.png (copied) * code/branches/FICN/Media/materials/textures/smoke.png (copied) * code/branches/FICN/Media/materials/textures/smokecolors.png (copied) * code/branches/FICN/Media/materials/textures/spheremap.png (copied) * code/branches/FICN/Media/materials/textures/steelhead.png (copied) * code/branches/FICN/Media/models (copied) * code/branches/FICN/Media/models/Barrel.mesh (copied) * code/branches/FICN/Media/models/cube.mesh (copied) * code/branches/FICN/Media/models/fish.mesh (copied) * code/branches/FICN/Media/models/fish.skeleton (copied) * code/branches/FICN/Media/models/ogrehead.mesh (copied) * code/branches/FICN/Media/overlay (copied) * code/branches/FICN/Media/overlay/EnergyBackground.png (copied) * code/branches/FICN/Media/overlay/EnergyDistrBackground.png (copied) * code/branches/FICN/Media/overlay/MapBackGround.png (copied) * code/branches/FICN/Media/overlay/MyShip.png (copied) * code/branches/FICN/Media/overlay/OrxonoxBlack.png (copied) * code/branches/FICN/Media/overlay/OrxonoxHUD.overlay (copied) * code/branches/FICN/Media/overlay/OrxonoxHUD1.1.overlay (copied) * code/branches/FICN/Media/overlay/OrxonoxHUD1.2.overlay (copied) * code/branches/FICN/Media/overlay/OrxonoxORANGE.png (copied) * code/branches/FICN/Media/overlay/OrxonoxRED.png (copied) * code/branches/FICN/Media/overlay/PrimalWeaponBackground.png (copied) * code/branches/FICN/Media/overlay/PrimarBackground.png (copied) * code/branches/FICN/Media/overlay/PrimarChoice.png (copied) * code/branches/FICN/Media/overlay/PrimarSample.png (copied) * code/branches/FICN/Media/overlay/Racket.png (copied) * code/branches/FICN/Media/overlay/RacketBackground.png (copied) * code/branches/FICN/Media/overlay/RacketBackground.pxi (copied) * code/branches/FICN/Media/overlay/RacketGrid.png (copied) * code/branches/FICN/Media/overlay/RedPoint.png (copied) * code/branches/FICN/Media/overlay/ShildLeftBottom.png (copied) * code/branches/FICN/Media/overlay/ShildLeftTop.png (copied) * code/branches/FICN/Media/overlay/ShildRightBottom.png (copied) * code/branches/FICN/Media/overlay/ShildRightTop.png (copied) * code/branches/FICN/Media/overlay/TargetBackground.png (copied) * code/branches/FICN/Media/overlay/TimeBackground.png (copied) * code/branches/FICN/Media/overlay/backGround.png (copied) * code/branches/FICN/Media/overlay/clock.png (copied) * code/branches/FICN/Media/overlay/gun.png (copied) * code/branches/FICN/Media/overlay/man.png (copied) * code/branches/FICN/Media/overlay/shot.png (copied) * code/branches/FICN/Media/overlay/superegg.png (copied) * code/branches/FICN/Media/packs/cubemap.zip (copied) * code/branches/FICN/Media/particle (copied) * code/branches/FICN/Media/particle/Example-Water.particle (copied) * code/branches/FICN/Media/particle/Example.particle (copied) * code/branches/FICN/Media/particle/emitted_emitter.particle (copied) * code/branches/FICN/Media/particle/smoke.particle (copied) * code/branches/FICN/bin/CMakeCache.txt (copied) * code/branches/FICN/bin/resources.cfg (modified) * code/branches/FICN/cmake/FindBoost.cmake (copied) * code/branches/FICN/cmake/FindENet.cmake (copied) * code/branches/FICN/cmake/FindODE.cmake (copied) * code/branches/FICN/src/CMakeLists.txt (modified) * code/branches/FICN/src/Flocking.h (copied) * code/branches/FICN/src/class_hierarchy (copied) * code/branches/FICN/src/class_hierarchy/BaseObject.cc (copied) * code/branches/FICN/src/class_hierarchy/BaseObject.h (copied) * code/branches/FICN/src/class_hierarchy/CMakeLists.txt (copied) * code/branches/FICN/src/class_hierarchy/ClassHierarchy.cc (copied) * code/branches/FICN/src/class_hierarchy/ClassHierarchy.h (copied) * code/branches/FICN/src/class_hierarchy/Identifier.cc (copied) * code/branches/FICN/src/class_hierarchy/Identifier.h (copied) * code/branches/FICN/src/class_hierarchy/IdentifierIncludes.h (copied) * code/branches/FICN/src/class_hierarchy/IdentifierList.cc (copied) * code/branches/FICN/src/class_hierarchy/IdentifierList.h (copied) * code/branches/FICN/src/class_hierarchy/ObjectList.cc (copied) * code/branches/FICN/src/class_hierarchy/ObjectList.h (copied) * code/branches/FICN/src/class_hierarchy/OrxonoxClass.cc (copied) * code/branches/FICN/src/class_hierarchy/OrxonoxClass.h (copied) * code/branches/FICN/src/class_hierarchy/Test.h (copied) * code/branches/FICN/src/class_hierarchy/orxonox.cc (copied) * code/branches/FICN/src/class_hierarchy/test1.cc (copied) * code/branches/FICN/src/class_hierarchy/test1.h (copied) * code/branches/FICN/src/class_hierarchy/test2.cc (copied) * code/branches/FICN/src/class_hierarchy/test2.h (copied) * code/branches/FICN/src/class_hierarchy/test3.cc (copied) * code/branches/FICN/src/class_hierarchy/test3.h (copied) * code/branches/FICN/src/inertial_node.cc (copied) * code/branches/FICN/src/inertial_node.h (copied) * code/branches/FICN/src/loader/CMakeLists.txt (copied) * code/branches/FICN/src/network/CMakeLists.txt (copied) * code/branches/FICN/src/network/Client.cc (copied) * code/branches/FICN/src/network/Client.h (copied) * code/branches/FICN/src/network/ClientConnection.cc (copied) * code/branches/FICN/src/network/ClientConnection.h (copied) * code/branches/FICN/src/network/ConnectionManager.cc (copied) * code/branches/FICN/src/network/ConnectionManager.h (copied) * code/branches/FICN/src/network/GameStateManager.cc (copied) * code/branches/FICN/src/network/GameStateManager.h (copied) * code/branches/FICN/src/network/Makefile.norm (copied) * code/branches/FICN/src/network/Makefile.tardis (copied) * code/branches/FICN/src/network/PacketBuffer.cc (copied) * code/branches/FICN/src/network/PacketBuffer.h (copied) * code/branches/FICN/src/network/PacketBufferTest.cc (copied) * code/branches/FICN/src/network/PacketBufferTestExt.cc (copied) * code/branches/FICN/src/network/PacketDecoder.cc (copied) * code/branches/FICN/src/network/PacketGenerator.cc (copied) * code/branches/FICN/src/network/PacketManager.h (copied) * code/branches/FICN/src/network/Server.cc (copied) * code/branches/FICN/src/network/Server.h (copied) * code/branches/FICN/src/network/Synchronisable.cc (copied) * code/branches/FICN/src/network/Synchronisable.h (copied) * code/branches/FICN/src/network/dummyclient.cc (copied) * code/branches/FICN/src/network/dummyclient2.cc (copied) * code/branches/FICN/src/network/dummyserver.cc (copied) * code/branches/FICN/src/ogre_control.cc (copied) * code/branches/FICN/src/ogre_control.h (copied) * code/branches/FICN/src/orxonox.h (copied) * code/branches/FICN/src/orxonox/CMakeLists.txt (copied) * code/branches/FICN/src/orxonox/core/CMakeLists.txt (copied) * code/branches/FICN/src/orxonox/core/Iterator.h (modified) * code/branches/FICN/src/orxonox/hud (copied) * code/branches/FICN/src/orxonox/hud/CMakeLists.txt (copied) * code/branches/FICN/src/orxonox/hud/hud_overlay.cc (copied) * code/branches/FICN/src/orxonox/hud/hud_overlay.h (copied) * code/branches/FICN/src/orxonox/hud/test_overlay.cc (copied) * code/branches/FICN/src/orxonox/hud/test_overlay.h (copied) * code/branches/FICN/src/orxonox/objects/CMakeFiles (copied) * code/branches/FICN/src/orxonox/objects/CMakeLists.txt (copied) * code/branches/FICN/src/orxonox/orxonox.cc (modified) * code/branches/FICN/src/orxonox/spaceship_steering.cc (copied) * code/branches/FICN/src/orxonox/spaceship_steering.h (copied) * code/branches/FICN/src/orxonox/weapon (copied) * code/branches/FICN/src/orxonox/weapon/CMakeLists.txt (copied) * code/branches/FICN/src/orxonox/weapon/ammunition_dump.cc (copied) * code/branches/FICN/src/orxonox/weapon/ammunition_dump.h (copied) * code/branches/FICN/src/orxonox/weapon/barrel_gun.cc (copied) * code/branches/FICN/src/orxonox/weapon/barrel_gun.h (copied) * code/branches/FICN/src/orxonox/weapon/base_weapon.cc (copied) * code/branches/FICN/src/orxonox/weapon/base_weapon.h (copied) * code/branches/FICN/src/orxonox/weapon/bullet.cc (copied) * code/branches/FICN/src/orxonox/weapon/bullet.h (copied) * code/branches/FICN/src/orxonox/weapon/bullet_manager.cc (copied) * code/branches/FICN/src/orxonox/weapon/bullet_manager.h (copied) * code/branches/FICN/src/orxonox/weapon/weapon_station.cc (copied) * code/branches/FICN/src/orxonox/weapon/weapon_station.h (copied) * code/branches/FICN/src/orxonox_prerequisites.h (copied) * code/branches/FICN/src/orxonox_scene.cc (copied) * code/branches/FICN/src/orxonox_scene.h (copied) * code/branches/FICN/src/orxonox_ship.cc (copied) * code/branches/FICN/src/orxonox_ship.h (copied) * code/branches/FICN/src/run_manager.cc (copied) * code/branches/FICN/src/run_manager.h (copied) merged merger to FICN branch Wed, 28 Nov 2007 16:31:00 GMT landauf [333] * code/branches/FICN (copied) new branch for factory, input, core, network Mon, 26 Nov 2007 16:24:39 GMT landauf [265] * code/trunk/src/orxonox/orxonox.cc (modified) corrected spacing