# # ChangeLog for code/branches/merge # # Generated by Trac 1.0.9 # Apr 2, 2025, 4:59:14 AM Thu, 22 May 2008 09:53:19 GMT scheusso [1355] * code/branches/merge/src/network/ClientInformation.cc (modified) * code/branches/merge/src/network/ClientInformation.h (modified) * code/branches/merge/src/network/ConnectionManager.cc (modified) * code/branches/merge/src/network/GameStateClient.cc (modified) * code/branches/merge/src/network/GameStateClient.h (modified) * code/branches/merge/src/network/GameStateManager.cc (modified) * code/branches/merge/src/network/PacketManager.h (modified) * code/branches/merge/src/network/Synchronisable.cc (modified) * code/branches/merge/src/orxonox/objects/WorldEntity.cc (modified) some enhanced enet usage (gamestates are not reliable anymore - we ... Tue, 20 May 2008 15:58:37 GMT scheusso [1336] * code/branches/merge/src/network/PacketDecoder.cc (modified) * code/branches/merge/src/network/PacketGenerator.cc (modified) * code/branches/merge/src/network/PacketManager.h (modified) added crc checksum testing for submitted gamestates (can also be used ... Mon, 19 May 2008 22:09:08 GMT scheusso [1333] * code/branches/merge/src/network/GameStateClient.cc (modified) added some null-return-pointer handling in GameStateClient Sun, 18 May 2008 20:00:17 GMT scheusso [1318] * code/branches/merge/src/network/ClientInformation.cc (modified) * code/branches/merge/src/network/ClientInformation.h (modified) * code/branches/merge/src/network/ConnectionManager.cc (modified) * code/branches/merge/src/network/PacketBuffer.cc (modified) * code/branches/merge/src/network/PacketBuffer.h (modified) * code/branches/merge/src/network/Server.cc (modified) * code/branches/merge/src/orxonox/objects/SpaceShip.cc (modified) * code/branches/merge/src/orxonox/objects/SpaceShip.h (modified) made clientinformation threadsafe and improved packetbuffer; wrote a ... Thu, 15 May 2008 21:33:46 GMT scheusso [1306] * code/branches/merge/src/network/Server.cc (modified) * code/branches/merge/src/network/Synchronisable.cc (modified) * code/branches/merge/src/orxonox/objects/Projectile.cc (modified) * code/branches/merge/src/orxonox/objects/SpaceShip.cc (modified) found a 'bug' in projectile - we set the networkid now everytime in ... Thu, 15 May 2008 21:00:06 GMT scheusso [1305] * code/branches/merge/src/network/ConnectionManager.cc (modified) * code/branches/merge/src/network/Synchronisable.cc (modified) * code/branches/merge/src/orxonox/objects/WorldEntity.cc (modified) bugfix in createship in connectionmanager/register more variables in ... Thu, 15 May 2008 20:30:16 GMT scheusso [1303] * code/branches/merge/src/network/GameStateClient.cc (modified) enhanced gamestate loading (abort if data corrupted ;) ) Thu, 15 May 2008 20:08:41 GMT scheusso [1299] * code/branches/merge/src/network/Client.cc (modified) * code/branches/merge/src/network/ClientInformation.cc (modified) * code/branches/merge/src/network/ClientInformation.h (modified) * code/branches/merge/src/network/ConnectionManager.cc (modified) * code/branches/merge/src/network/GameStateManager.cc (modified) * code/branches/merge/src/network/PacketBuffer.cc (modified) * code/branches/merge/src/network/PacketDecoder.cc (modified) * code/branches/merge/src/network/Server.cc (modified) * code/branches/merge/src/network/diffTest.cc (modified) * code/branches/merge/src/orxonox/objects/SpaceShip.cc (modified) a huge fix in packetbuffer Thu, 15 May 2008 15:47:22 GMT scheusso [1294] * code/branches/merge/src/network/GameStateManager.cc (modified) * code/branches/merge/src/network/PacketGenerator.cc (modified) some minor bugfix in something we don't use yet ... Thu, 15 May 2008 15:18:08 GMT scheusso [1291] * code/branches/merge/TODO (modified) * code/branches/merge/src/network/Synchronisable.cc (modified) * code/branches/merge/src/orxonox/objects/Camera.cc (modified) * code/branches/merge/src/orxonox/objects/SpaceShip.cc (modified) some changes got lost(camera) Thu, 15 May 2008 14:43:20 GMT scheusso [1289] * code/branches/merge/src/orxonox/objects/Camera.cc (modified) * code/branches/merge/src/orxonox/objects/Camera.h (modified) * code/branches/merge/src/orxonox/objects/CameraHandler.cc (modified) * code/branches/merge/src/orxonox/objects/SpaceShip.cc (modified) merged camera change into merger branch Thu, 15 May 2008 14:16:45 GMT rgrieder [1288] * code/branches/merge/src/core/InputManager.cc (modified) - hackfix for the SpaceShip Thu, 15 May 2008 13:06:52 GMT rgrieder [1285] * code/branches/merge/src/core/InputManager.cc (modified) - bugfix in InputManager Thu, 15 May 2008 12:55:13 GMT scheusso [1284] * code/branches/merge/src/network/Client.cc (modified) * code/branches/merge/src/orxonox/objects/SpaceShip.cc (modified) spaceship fix Thu, 15 May 2008 12:14:44 GMT scheusso [1282] * code/branches/merge/bin/levels/sample.oxw (modified) * code/branches/merge/bin/run-script (modified) * code/branches/merge/src/network/ConnectionManager.cc (modified) * code/branches/merge/src/network/GameStateManager.cc (modified) made gamestatemanager::cleanup a bit safer ;) Thu, 15 May 2008 09:42:50 GMT scheusso [1279] * code/branches/merge/bin/levels/sample.oxw (modified) * code/branches/merge/bin/run-script (modified) * code/branches/merge/src/network/ClientConnection.cc (modified) * code/branches/merge/src/network/ClientConnection.h (modified) adapted boost threads in clientconnection added trap to runscript ... Thu, 15 May 2008 08:09:02 GMT scheusso [1278] * code/branches/merge/CMakeLists.txt (modified) * code/branches/merge/src/network/CMakeLists.txt (modified) * code/branches/merge/src/network/ConnectionManager.cc (modified) * code/branches/merge/src/network/ConnectionManager.h (modified) * code/branches/merge/src/network/dummyclient4.cc (added) * code/branches/merge/src/network/dummyserver4.cc (added) * code/branches/merge/src/orxonox/CMakeLists.txt (modified) * code/branches/merge/src/orxonox/GraphicsEngine.cc (modified) new dummy[server,client]4; adapted connectionmanager to new ... Wed, 14 May 2008 20:18:08 GMT FelixSchulthess [1275] * code/branches/merge/src/orxonox/objects/SpaceShip.cc (modified) repositioned position of position lights Wed, 14 May 2008 18:19:49 GMT FelixSchulthess [1274] * code/branches/merge/bin/levels/sample.oxw (modified) created exception handler for Felix::FridgeUnderrunException() Wed, 14 May 2008 11:01:11 GMT rgrieder [1273] * code/branches/merge/bin/keybindings.ini (modified) * code/branches/merge/bin/ogre.cfg-init (modified) * code/branches/merge/src/core/InputManager.cc (modified) * code/branches/merge/src/orxonox/objects/Explosion.cc (modified) * code/branches/merge/src/orxonox/objects/SpaceShip.cc (modified) - fixed the visual problem with overlays: They're now correctly ... Wed, 14 May 2008 09:44:17 GMT rgrieder [1272] * code/branches/merge/bin/keybindings.ini (modified) * code/branches/merge/src/core/CommandExecutor.h (modified) * code/branches/merge/src/core/CorePrereqs.h (modified) * code/branches/merge/src/core/InputBuffer.cc (modified) * code/branches/merge/src/core/InputBuffer.h (modified) * code/branches/merge/src/core/InputHandler.cc (modified) * code/branches/merge/src/core/InputHandler.h (modified) * code/branches/merge/src/core/InputInterfaces.h (copied) * code/branches/merge/src/core/InputManager.cc (modified) * code/branches/merge/src/core/InputManager.h (modified) * code/branches/merge/src/core/SignalHandler.cc (modified) * code/branches/merge/src/core/SignalHandler.h (modified) * code/branches/merge/src/core/Tickable.cc (modified) * code/branches/merge/src/core/Tickable.h (modified) * code/branches/merge/src/orxonox/Orxonox.cc (modified) * code/branches/merge/src/orxonox/objects/SpaceShip.cc (modified) * code/branches/merge/src/orxonox/objects/SpaceShip.h (modified) * code/branches/merge/visual_studio/base_properties_debug.vsprops (modified) * code/branches/merge/visual_studio/vc8/core.vcproj (modified) * code/branches/merge/visual_studio/vc8/ois.vcproj (modified) merged input branch into merge branch Wed, 14 May 2008 09:24:31 GMT rgrieder [1270] * code/branches/merge/src/orxonox/GraphicsEngine.cc (modified) * code/branches/merge/visual_studio/network_properties.vsprops (modified) * code/branches/merge/visual_studio/orxonox_properties.vsprops (modified) - little change with ogre logManager. Maybe that works now on Oli's box. Tue, 13 May 2008 20:13:17 GMT rgrieder [1268] * code/branches/merge/src/core/InputHandler.cc (modified) * code/branches/merge/src/core/InputManager.cc (modified) * code/branches/merge/src/orxonox/GraphicsEngine.cc (modified) * code/branches/merge/src/orxonox/Orxonox.cc (modified) - removed some debug output Tue, 13 May 2008 15:42:37 GMT rgrieder [1266] * code/branches/merge/src/orxonox/Orxonox.cc (modified) - another fix Tue, 13 May 2008 15:40:42 GMT rgrieder [1265] * code/branches/merge/src/network/GameStateManager.cc (modified) * code/branches/merge/src/orxonox/objects/SpaceShip.cc (modified) * code/branches/merge/visual_studio/network_properties.vsprops (modified) * code/branches/merge/visual_studio/orxonox_properties.vsprops (modified) * code/branches/merge/visual_studio/vc8/network.vcproj (modified) * code/branches/merge/visual_studio/vc8/orxonox.vcproj (modified) - filled initialiser list of SpaceShip - adapted VS files in order ... Tue, 13 May 2008 15:01:10 GMT scheusso [1264] * code/branches/merge/CMakeLists.txt (modified) * code/branches/merge/TODO (copied) * code/branches/merge/bin/levels/sample.oxw (modified) * code/branches/merge/cmake/FindBoost.cmake (modified) * code/branches/merge/src/network (copied) * code/branches/merge/src/network/CMakeLists.txt (copied) * code/branches/merge/src/network/Client.cc (copied) * code/branches/merge/src/network/Client.h (copied) * code/branches/merge/src/network/ClientConnection.cc (copied) * code/branches/merge/src/network/ClientConnection.h (copied) * code/branches/merge/src/network/ClientInformation.cc (copied) * code/branches/merge/src/network/ClientInformation.h (copied) * code/branches/merge/src/network/ConnectionManager.cc (copied) * code/branches/merge/src/network/ConnectionManager.h (copied) * code/branches/merge/src/network/GameStateClient.cc (copied) * code/branches/merge/src/network/GameStateClient.h (copied) * code/branches/merge/src/network/GameStateManager.cc (copied) * code/branches/merge/src/network/GameStateManager.h (copied) * code/branches/merge/src/network/Makefile.norm (copied) * code/branches/merge/src/network/Makefile.tardis (copied) * code/branches/merge/src/network/Makefile.test (copied) * code/branches/merge/src/network/NetworkPrereqs.h (copied) * code/branches/merge/src/network/PacketBuffer.cc (copied) * code/branches/merge/src/network/PacketBuffer.h (copied) * code/branches/merge/src/network/PacketDecoder.cc (copied) * code/branches/merge/src/network/PacketGenerator.cc (copied) * code/branches/merge/src/network/PacketManager.h (copied) * code/branches/merge/src/network/PacketTypes.h (copied) * code/branches/merge/src/network/Server.cc (copied) * code/branches/merge/src/network/Server.h (copied) * code/branches/merge/src/network/Synchronisable.cc (copied) * code/branches/merge/src/network/Synchronisable.h (copied) * code/branches/merge/src/network/TODO (copied) * code/branches/merge/src/network/diffTest.cc (copied) * code/branches/merge/src/network/dummyclient.cc (copied) * code/branches/merge/src/network/dummyclient2.cc (copied) * code/branches/merge/src/network/dummyclient3.cc (copied) * code/branches/merge/src/network/dummyserver.cc (copied) * code/branches/merge/src/network/dummyserver3.cc (copied) * code/branches/merge/src/orxonox/CMakeLists.txt (modified) * code/branches/merge/src/orxonox/Main.cc (modified) * code/branches/merge/src/orxonox/Orxonox.cc (modified) * code/branches/merge/src/orxonox/Orxonox.h (modified) * code/branches/merge/src/orxonox/objects/Ambient.cc (modified) * code/branches/merge/src/orxonox/objects/Ambient.h (modified) * code/branches/merge/src/orxonox/objects/Camera.cc (modified) * code/branches/merge/src/orxonox/objects/Camera.h (modified) * code/branches/merge/src/orxonox/objects/CameraHandler.cc (copied) * code/branches/merge/src/orxonox/objects/CameraHandler.h (copied) * code/branches/merge/src/orxonox/objects/Model.cc (modified) * code/branches/merge/src/orxonox/objects/NPC.cc (modified) * code/branches/merge/src/orxonox/objects/NPC.h (modified) * code/branches/merge/src/orxonox/objects/Skybox.cc (modified) * code/branches/merge/src/orxonox/objects/Skybox.h (modified) * code/branches/merge/src/orxonox/objects/SpaceShip.cc (modified) * code/branches/merge/src/orxonox/objects/SpaceShip.h (modified) * code/branches/merge/src/orxonox/objects/WorldEntity.cc (modified) * code/branches/merge/src/orxonox/particle/ParticleInterface.cc (modified) merge network3 and camera branch into merge branch Tue, 13 May 2008 13:45:19 GMT rgrieder [1263] * code/branches/merge/src/core/BaseObject.cc (modified) * code/branches/merge/src/core/CoreIncludes.h (modified) * code/branches/merge/src/core/Debug.h (modified) * code/branches/merge/src/core/Error.cc (modified) * code/branches/merge/src/core/Error.h (modified) * code/branches/merge/src/core/Namespace.cc (modified) * code/branches/merge/src/core/OrxonoxClass.cc (modified) * code/branches/merge/src/orxonox/GraphicsEngine.cc (modified) * code/branches/merge/src/orxonox/GraphicsEngine.h (modified) * code/branches/merge/src/orxonox/Main.cc (modified) * code/branches/merge/src/orxonox/Orxonox.cc (modified) * code/branches/merge/src/orxonox/Orxonox.h (modified) * code/branches/merge/src/orxonox/OrxonoxPlatform.h (modified) * code/branches/merge/src/orxonox/console/InGameConsole.cc (modified) * code/branches/merge/src/orxonox/objects/Explosion.cc (modified) * code/branches/merge/src/orxonox/objects/Model.cc (modified) * code/branches/merge/src/orxonox/objects/Model.h (modified) * code/branches/merge/src/orxonox/objects/NPC.cc (modified) * code/branches/merge/src/orxonox/objects/Projectile.cc (modified) * code/branches/merge/src/orxonox/objects/SpaceShip.cc (modified) * code/branches/merge/src/orxonox/objects/WorldEntity.cc (modified) * code/branches/merge/src/orxonox/tools/Timer.cc (modified) - merged ogre branch into merge branch Tue, 13 May 2008 13:22:56 GMT scheusso [1262] * code/branches/merge (copied) creating merge branch Tue, 06 May 2008 19:10:46 GMT landauf [1242] * code/trunk/cmakeclearcache (modified) corrected spelling mistake