# # ChangeLog for code/branches/FICN/src/loader # # Generated by Trac 1.0.9 # Nov 25, 2024, 3:09:48 PM Tue, 01 Jan 2008 13:00:08 GMT rgrieder [782] * code/branches/FICN/src/audio/_AudioObject.cc (modified) * code/branches/FICN/src/loader/LoaderPrereqs.h (modified) * code/branches/FICN/src/network/GameStateClient.cc (modified) * code/branches/FICN/src/network/GameStateManager.cc (modified) * code/branches/FICN/src/orxonox/Orxonox.cc (modified) * code/branches/FICN/src/orxonox/OrxonoxPlatform.h (modified) * code/branches/FICN/src/orxonox/core/Language.cc (modified) * code/branches/FICN/src/orxonox/objects/Model.cc (modified) * code/branches/FICN/visual_studio/FICN.sln (modified) * code/branches/FICN/visual_studio/base_properties.vsprops (modified) * code/branches/FICN/visual_studio/benixonox.vcproj (modified) * code/branches/FICN/visual_studio/loader.vcproj (modified) - removed warnings on msvc compiler - on msvc: loader is now built ... Mon, 31 Dec 2007 15:56:53 GMT rgrieder [774] * code/branches/FICN/bin/main.bat (deleted) * code/branches/FICN/bin/orxonox.bat (added) * code/branches/FICN/bin/run-script (modified) * code/branches/FICN/src/CMakeLists.txt (modified) * code/branches/FICN/src/audio/AudioIncludes.h (modified) * code/branches/FICN/src/audio/AudioManager.cc (modified) * code/branches/FICN/src/loader/LevelLoader.cc (modified) * code/branches/FICN/src/network/Client.h (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.cc (modified) * code/branches/FICN/src/network/Synchronisable.h (modified) * code/branches/FICN/src/orxonox/CMakeLists.txt (modified) * code/branches/FICN/src/orxonox/objects/Ambient.h (modified) * code/branches/FICN/src/orxonox/objects/Camera.h (modified) * code/branches/FICN/src/orxonox/objects/Skybox.h (modified) * code/branches/FICN/src/orxonox/objects/Test.h (modified) * code/branches/FICN/src/orxonox/objects/WorldEntity.h (modified) * code/branches/FICN/src/orxonox/objects/test1.h (modified) * code/branches/FICN/src/orxonox/objects/test2.h (modified) * code/branches/FICN/src/orxonox/objects/test3.h (modified) * code/branches/FICN/src/orxonox/objects/weapon/AmmunitionDump.h (modified) * code/branches/FICN/src/orxonox/objects/weapon/BulletManager.h (modified) * code/branches/FICN/src/util/String2Number.h (modified) - changed executable from main to orxonox - added src/orxonox to the ... Mon, 31 Dec 2007 15:35:56 GMT landauf [771] * code/branches/FICN/src/audio/CMakeLists.txt (modified) * code/branches/FICN/src/loader/CMakeLists.txt (modified) removed whitespace and AudioIncludes.h from CML Mon, 31 Dec 2007 15:25:06 GMT nicolasc [768] * code/branches/FICN/CMakeLists.txt (modified) * code/branches/FICN/bin/levels/sample.oxw (modified) * code/branches/FICN/bin/main.bat (modified) * code/branches/FICN/src/CMakeLists.txt (modified) * code/branches/FICN/src/audio/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/Orxonox.cc (modified) * code/branches/FICN/src/orxonox/OrxonoxPlatform.h (modified) * code/branches/FICN/src/orxonox/SpaceshipSteering.cc (modified) * code/branches/FICN/src/orxonox/core/CMakeLists.txt (modified) * code/branches/FICN/src/orxonox/hud/CMakeLists.txt (deleted) * code/branches/FICN/src/orxonox/objects/CMakeLists.txt (deleted) * code/branches/FICN/src/orxonox/objects/Explosion.h (modified) * code/branches/FICN/src/orxonox/objects/Fighter.cc (modified) * code/branches/FICN/src/orxonox/objects/Model.h (modified) * code/branches/FICN/src/orxonox/objects/Projectile.h (modified) * code/branches/FICN/src/orxonox/objects/SpaceShip.h (modified) * code/branches/FICN/src/orxonox/objects/WorldEntity.h (modified) * code/branches/FICN/src/orxonox/objects/test2.h (modified) * code/branches/FICN/src/orxonox/objects/weapon (copied) * code/branches/FICN/src/orxonox/objects/weapon/AmmunitionDump.cc (copied) * code/branches/FICN/src/orxonox/objects/weapon/AmmunitionDump.h (copied) * code/branches/FICN/src/orxonox/objects/weapon/BarrelGun.cc (copied) * code/branches/FICN/src/orxonox/objects/weapon/BarrelGun.h (copied) * code/branches/FICN/src/orxonox/objects/weapon/BaseWeapon.cc (copied) * code/branches/FICN/src/orxonox/objects/weapon/BaseWeapon.h (copied) * code/branches/FICN/src/orxonox/objects/weapon/Bullet.cc (copied) * code/branches/FICN/src/orxonox/objects/weapon/Bullet.h (copied) * code/branches/FICN/src/orxonox/objects/weapon/BulletManager.cc (copied) * code/branches/FICN/src/orxonox/objects/weapon/BulletManager.h (copied) * code/branches/FICN/src/orxonox/objects/weapon/WeaponStation.cc (copied) * code/branches/FICN/src/orxonox/objects/weapon/WeaponStation.h (copied) * code/branches/FICN/src/orxonox/objects/weapon_system (deleted) * code/branches/FICN/src/orxonox/particle/CMakeLists.txt (deleted) * code/branches/FICN/src/orxonox/tools/CMakeLists.txt (deleted) * code/branches/FICN/src/util/CMakeLists.txt (modified) * code/branches/FICN/visual_studio/FICN.sln (deleted) * code/branches/FICN/visual_studio/FICN_test.sln (copied) * code/branches/FICN/visual_studio/benixonox.vcproj (modified) * code/branches/FICN/visual_studio/loader.vcproj (modified) * code/branches/FICN/visual_studio/tinyxml.vcproj (deleted) * code/branches/FICN/visual_studio/tinyxml_properties.vsprops (deleted) * code/branches/FICN/visual_studio/util.vcproj (copied) * code/branches/FICN/visual_studio/util_properties.vsprops (copied) merged FICN_test back to FICN Mon, 31 Dec 2007 03:36:19 GMT landauf [744] * code/branches/FICN/src/loader/CMakeLists.txt (modified) * code/branches/FICN/src/orxonox/CMakeLists.txt (modified) * code/branches/FICN/src/orxonox/objects/CMakeLists.txt (modified) * code/branches/FICN/src/util/CMakeLists.txt (modified) * code/branches/FICN/src/util/substring.cc (added) * code/branches/FICN/src/util/substring.h (added) - changed CML files: xml library is now util library and is open for ... Mon, 31 Dec 2007 03:23:39 GMT landauf [742] * code/branches/FICN/src/CMakeLists.txt (modified) * code/branches/FICN/src/loader/LevelLoader.h (modified) * code/branches/FICN/src/network/ClientConnection.cc (modified) * code/branches/FICN/src/orxonox/AIClass.h (modified) * code/branches/FICN/src/orxonox/Arrival.h (modified) * code/branches/FICN/src/orxonox/Flocking.h (modified) * code/branches/FICN/src/orxonox/Orxonox.cc (modified) * code/branches/FICN/src/orxonox/SpaceshipSteering.cc (modified) * code/branches/FICN/src/orxonox/core/BaseObject.cc (modified) * code/branches/FICN/src/orxonox/core/BaseObject.h (modified) * code/branches/FICN/src/orxonox/core/ConfigValueContainer.cc (modified) * code/branches/FICN/src/orxonox/core/ConfigValueContainer.h (modified) * code/branches/FICN/src/orxonox/objects/Ambient.cc (modified) * code/branches/FICN/src/orxonox/objects/BillboardSet.cc (modified) * code/branches/FICN/src/orxonox/objects/BillboardSet.h (modified) * code/branches/FICN/src/orxonox/objects/Camera.cc (modified) * code/branches/FICN/src/orxonox/objects/Explosion.cc (modified) * code/branches/FICN/src/orxonox/objects/Fighter.cc (modified) * code/branches/FICN/src/orxonox/objects/Light.h (modified) * code/branches/FICN/src/orxonox/objects/Model.cc (modified) * code/branches/FICN/src/orxonox/objects/Skybox.cc (modified) * code/branches/FICN/src/orxonox/objects/SpaceShip.cc (modified) * code/branches/FICN/src/orxonox/objects/SpaceshipSteeringObject.cc (modified) * code/branches/FICN/src/orxonox/objects/SpaceshipSteeringObject.h (modified) * code/branches/FICN/src/orxonox/objects/WorldEntity.cc (modified) * code/branches/FICN/src/orxonox/objects/WorldEntity.h (modified) * code/branches/FICN/src/orxonox/objects/test1.cc (modified) * code/branches/FICN/src/orxonox/objects/test1.h (modified) * code/branches/FICN/src/orxonox/objects/weapon_system/AmmunitionDump.cc (modified) * code/branches/FICN/src/orxonox/objects/weapon_system/BarrelGun.cc (modified) * code/branches/FICN/src/orxonox/objects/weapon_system/BaseWeapon.cc (modified) * code/branches/FICN/src/orxonox/objects/weapon_system/BulletManager.h (modified) * code/branches/FICN/src/orxonox/particle/ParticleInterface.h (modified) * code/branches/FICN/src/util/CMakeLists.txt (moved) * code/branches/FICN/src/util/Convert.h (moved) * code/branches/FICN/src/util/Math.h (moved) * code/branches/FICN/src/util/Sleep.h (moved) * code/branches/FICN/src/util/String2Number.h (moved) * code/branches/FICN/src/util/Tokenizer.h (moved) * code/branches/FICN/src/util/testing (moved) * code/branches/FICN/src/util/testing/CMakeLists.txt (copied) * code/branches/FICN/src/util/testing/TestConverter.cpp (copied) * code/branches/FICN/src/util/tinyxml (moved) * code/branches/FICN/src/util/tinyxml/CMakeLists.txt (copied) * code/branches/FICN/src/util/tinyxml/TinyXMLPrereqs.h (copied) * code/branches/FICN/src/util/tinyxml/ticpp.cc (copied) * code/branches/FICN/src/util/tinyxml/ticpp.h (copied) * code/branches/FICN/src/util/tinyxml/ticpprc.h (copied) * code/branches/FICN/src/util/tinyxml/tinystr.cc (copied) * code/branches/FICN/src/util/tinyxml/tinystr.h (copied) * code/branches/FICN/src/util/tinyxml/tinyxml.cc (copied) * code/branches/FICN/src/util/tinyxml/tinyxml.h (copied) * code/branches/FICN/src/util/tinyxml/tinyxmlerror.cc (copied) * code/branches/FICN/src/util/tinyxml/tinyxmlparser.cc (copied) moved all files from misc and the tinyxml folder into the new util folder Sun, 30 Dec 2007 23:06:33 GMT landauf [738] * code/branches/FICN/src/loader/LevelLoader.cc (modified) * code/branches/FICN/src/tinyxml/tinystr.cc (modified) * code/branches/FICN/src/tinyxml/tinystr.h (modified) * code/branches/FICN/src/tinyxml/tinyxml.cc (modified) * code/branches/FICN/src/tinyxml/tinyxml.h (modified) * code/branches/FICN/src/tinyxml/tinyxmlerror.cc (modified) * code/branches/FICN/src/tinyxml/tinyxmlparser.cc (modified) updated to the newest tinyXML library and changed one line in the ... Sun, 30 Dec 2007 21:17:38 GMT rgrieder [733] * code/branches/FICN/src/loader/LevelLoader.cc (modified) * code/branches/FICN/src/network/GameStateClient.h (modified) * code/branches/FICN/src/orxonox/CMakeLists.txt (modified) * code/branches/FICN/src/orxonox/OrxonoxPrereqs.h (modified) * code/branches/FICN/src/orxonox/core/BaseObject.cc (added) * code/branches/FICN/src/orxonox/core/BaseObject.h (added) * code/branches/FICN/src/orxonox/core/CMakeLists.txt (modified) * code/branches/FICN/src/orxonox/core/Factory.cc (modified) * code/branches/FICN/src/orxonox/objects/Ambient.h (modified) * code/branches/FICN/src/orxonox/objects/BaseObject.cc (deleted) * code/branches/FICN/src/orxonox/objects/BaseObject.h (deleted) * code/branches/FICN/src/orxonox/objects/CMakeLists.txt (modified) * code/branches/FICN/src/orxonox/objects/Camera.h (modified) * code/branches/FICN/src/orxonox/objects/Skybox.h (modified) * code/branches/FICN/src/orxonox/objects/WorldEntity.h (modified) * code/branches/FICN/src/orxonox/objects/weapon_system/AmmunitionDump.h (modified) * code/branches/FICN/src/orxonox/objects/weapon_system/BulletManager.h (modified) * code/branches/FICN/src/tinyxml/TinyXMLPrereqs.h (added) * code/branches/FICN/visual_studio/FICN.sln (modified) * code/branches/FICN/visual_studio/benixonox.vcproj (modified) * code/branches/FICN/visual_studio/core.vcproj (modified) * code/branches/FICN/visual_studio/tinyxml.vcproj (modified) - moved BaseObject to core Fri, 28 Dec 2007 22:33:10 GMT rgrieder [715] * code/branches/FICN/src/audio/AudioBuffer.cc (modified) * code/branches/FICN/src/audio/AudioBuffer.h (modified) * code/branches/FICN/src/audio/AudioIncludes.h (modified) * 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/loader/LevelLoader.cc (modified) * code/branches/FICN/src/loader/LevelLoader.h (modified) * code/branches/FICN/src/misc/String.h (deleted) * code/branches/FICN/src/orxonox/GraphicsEngine.cc (modified) * code/branches/FICN/src/orxonox/GraphicsEngine.h (modified) * code/branches/FICN/src/orxonox/Orxonox.cc (modified) * code/branches/FICN/src/orxonox/Orxonox.h (modified) * code/branches/FICN/src/orxonox/core/ArgReader.cc (modified) * code/branches/FICN/src/orxonox/core/ArgReader.h (modified) * code/branches/FICN/src/orxonox/core/ClassFactory.h (modified) * code/branches/FICN/src/orxonox/core/ConfigValueContainer.cc (modified) * code/branches/FICN/src/orxonox/core/ConfigValueContainer.h (modified) * code/branches/FICN/src/orxonox/core/Error.cc (modified) * code/branches/FICN/src/orxonox/core/Error.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/IdentifierList.h (modified) * code/branches/FICN/src/orxonox/core/Language.cc (modified) * code/branches/FICN/src/orxonox/core/Language.h (modified) * code/branches/FICN/src/orxonox/core/OrxonoxClass.h (modified) * code/branches/FICN/src/orxonox/core/OutputHandler.cc (modified) * code/branches/FICN/src/orxonox/core/OutputHandler.h (modified) * code/branches/FICN/src/orxonox/hud/HUD.cc (modified) * code/branches/FICN/src/orxonox/hud/HUD.h (modified) * code/branches/FICN/src/orxonox/objects/Ambient.cc (modified) * code/branches/FICN/src/orxonox/objects/BillboardSet.cc (modified) * code/branches/FICN/src/orxonox/objects/BillboardSet.h (modified) * code/branches/FICN/src/orxonox/objects/Camera.cc (modified) * code/branches/FICN/src/orxonox/objects/Fighter.cc (modified) * code/branches/FICN/src/orxonox/objects/Light.h (modified) * code/branches/FICN/src/orxonox/objects/Mesh.cc (modified) * code/branches/FICN/src/orxonox/objects/Mesh.h (modified) * code/branches/FICN/src/orxonox/objects/Model.h (modified) * code/branches/FICN/src/orxonox/objects/Skybox.cc (modified) * code/branches/FICN/src/orxonox/objects/SpaceShip.cc (modified) * code/branches/FICN/src/orxonox/objects/WorldEntity.cc (modified) * code/branches/FICN/src/orxonox/objects/weapon_system/AmmunitionDump.cc (modified) * code/branches/FICN/src/orxonox/objects/weapon_system/AmmunitionDump.h (modified) * code/branches/FICN/src/orxonox/objects/weapon_system/BulletManager.cc (modified) * code/branches/FICN/src/orxonox/objects/weapon_system/BulletManager.h (modified) * code/branches/FICN/src/orxonox/particle/ParticleInterface.cc (modified) * code/branches/FICN/src/orxonox/particle/ParticleInterface.h (modified) * code/branches/FICN/visual_studio/benixonox.vcproj (modified) - the master has spoken... - misc/String.h is not anymore.. Fri, 28 Dec 2007 21:30:29 GMT rgrieder [708] * code/branches/FICN/src/audio/AudioBuffer.cc (modified) * code/branches/FICN/src/audio/AudioBuffer.h (modified) * code/branches/FICN/src/audio/AudioIncludes.h (modified) * 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/loader/LevelLoader.cc (modified) * code/branches/FICN/src/loader/LevelLoader.h (modified) * code/branches/FICN/src/misc/ColourValue.h (added) * code/branches/FICN/src/misc/Math.h (added) * code/branches/FICN/src/misc/Matrix3.h (added) * code/branches/FICN/src/misc/Quaternion.h (added) * code/branches/FICN/src/misc/Sleep.h (added) * code/branches/FICN/src/misc/String.h (added) * code/branches/FICN/src/misc/String2Number.h (modified) * code/branches/FICN/src/misc/Vector2.h (added) * code/branches/FICN/src/misc/Vector3.h (added) * code/branches/FICN/src/misc/Vector4.h (added) * code/branches/FICN/src/network/ClientConnection.cc (modified) * code/branches/FICN/src/network/NetworkFrameListener.h (modified) * code/branches/FICN/src/orxonox/AIClass.h (modified) * code/branches/FICN/src/orxonox/Arrival.h (modified) * code/branches/FICN/src/orxonox/Flocking.h (modified) * code/branches/FICN/src/orxonox/GraphicsEngine.cc (modified) * code/branches/FICN/src/orxonox/GraphicsEngine.h (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) * code/branches/FICN/src/orxonox/OrxonoxPlatform.h (modified) * code/branches/FICN/src/orxonox/OrxonoxPrereqs.h (modified) * code/branches/FICN/src/orxonox/SpaceshipSteering.cc (modified) * code/branches/FICN/src/orxonox/SpaceshipSteering.h (modified) * code/branches/FICN/src/orxonox/core/ArgReader.cc (modified) * code/branches/FICN/src/orxonox/core/ArgReader.h (modified) * code/branches/FICN/src/orxonox/core/ClassFactory.h (modified) * code/branches/FICN/src/orxonox/core/ConfigValueContainer.cc (modified) * code/branches/FICN/src/orxonox/core/ConfigValueContainer.h (modified) * code/branches/FICN/src/orxonox/core/CoreIncludes.h (modified) * code/branches/FICN/src/orxonox/core/CorePrereqs.h (modified) * code/branches/FICN/src/orxonox/core/Debug.h (modified) * code/branches/FICN/src/orxonox/core/DebugLevel.h (modified) * code/branches/FICN/src/orxonox/core/Error.cc (modified) * code/branches/FICN/src/orxonox/core/Error.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/IdentifierList.h (modified) * code/branches/FICN/src/orxonox/core/Language.cc (modified) * code/branches/FICN/src/orxonox/core/Language.h (modified) * code/branches/FICN/src/orxonox/core/OrxonoxClass.h (modified) * code/branches/FICN/src/orxonox/core/OutputHandler.cc (modified) * code/branches/FICN/src/orxonox/core/OutputHandler.h (modified) * code/branches/FICN/src/orxonox/hud/HUD.cc (modified) * code/branches/FICN/src/orxonox/hud/HUD.h (modified) * code/branches/FICN/src/orxonox/objects/Ambient.cc (modified) * code/branches/FICN/src/orxonox/objects/Ambient.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/BillboardSet.cc (modified) * code/branches/FICN/src/orxonox/objects/BillboardSet.h (modified) * code/branches/FICN/src/orxonox/objects/Camera.cc (modified) * code/branches/FICN/src/orxonox/objects/Camera.h (modified) * code/branches/FICN/src/orxonox/objects/Explosion.cc (modified) * code/branches/FICN/src/orxonox/objects/Explosion.h (modified) * code/branches/FICN/src/orxonox/objects/Fighter.cc (modified) * code/branches/FICN/src/orxonox/objects/Fighter.h (modified) * code/branches/FICN/src/orxonox/objects/Light.cc (modified) * code/branches/FICN/src/orxonox/objects/Light.h (modified) * code/branches/FICN/src/orxonox/objects/Mesh.cc (modified) * code/branches/FICN/src/orxonox/objects/Mesh.h (modified) * code/branches/FICN/src/orxonox/objects/Model.cc (modified) * code/branches/FICN/src/orxonox/objects/Model.h (modified) * code/branches/FICN/src/orxonox/objects/NPC.cc (modified) * code/branches/FICN/src/orxonox/objects/NPC.h (modified) * code/branches/FICN/src/orxonox/objects/Projectile.cc (modified) * code/branches/FICN/src/orxonox/objects/Projectile.h (modified) * code/branches/FICN/src/orxonox/objects/Skybox.cc (modified) * code/branches/FICN/src/orxonox/objects/Skybox.h (modified) * code/branches/FICN/src/orxonox/objects/SpaceShip.cc (modified) * code/branches/FICN/src/orxonox/objects/SpaceShip.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/WorldEntity.cc (modified) * code/branches/FICN/src/orxonox/objects/WorldEntity.h (modified) * code/branches/FICN/src/orxonox/objects/weapon_system/AmmunitionDump.cc (modified) * code/branches/FICN/src/orxonox/objects/weapon_system/AmmunitionDump.h (modified) * code/branches/FICN/src/orxonox/objects/weapon_system/BarrelGun.cc (modified) * code/branches/FICN/src/orxonox/objects/weapon_system/BarrelGun.h (modified) * code/branches/FICN/src/orxonox/objects/weapon_system/BaseWeapon.cc (modified) * code/branches/FICN/src/orxonox/objects/weapon_system/BaseWeapon.h (modified) * code/branches/FICN/src/orxonox/objects/weapon_system/Bullet.cc (modified) * code/branches/FICN/src/orxonox/objects/weapon_system/Bullet.h (modified) * code/branches/FICN/src/orxonox/objects/weapon_system/BulletManager.cc (modified) * code/branches/FICN/src/orxonox/objects/weapon_system/BulletManager.h (modified) * code/branches/FICN/src/orxonox/objects/weapon_system/WeaponStation.cc (modified) * code/branches/FICN/src/orxonox/objects/weapon_system/WeaponStation.h (modified) * code/branches/FICN/src/orxonox/particle/ParticleInterface.cc (modified) * code/branches/FICN/src/orxonox/particle/ParticleInterface.h (modified) * code/branches/FICN/visual_studio/FICN.sln (modified) * code/branches/FICN/visual_studio/audio.vcproj (modified) * code/branches/FICN/visual_studio/base_properties.vsprops (modified) * code/branches/FICN/visual_studio/base_properties_release.vsprops (modified) * code/branches/FICN/visual_studio/benixonox.vcproj (modified) * code/branches/FICN/visual_studio/core.vcproj (modified) * code/branches/FICN/visual_studio/loader.vcproj (modified) * code/branches/FICN/visual_studio/network.vcproj (modified) * code/branches/FICN/visual_studio/tinyxml.vcproj (modified) - added Vector2, Vector3, Matrix3, ColourValue, Quaternion and String ... Thu, 27 Dec 2007 17:00:34 GMT nicolasc [702] * code/branches/FICN/src/CMakeLists.txt (modified) * code/branches/FICN/src/audio/AudioBuffer.cc (modified) * code/branches/FICN/src/loader/LevelLoader.cc (modified) removed some deprecated alut stuff - plz test on windows Tue, 25 Dec 2007 21:37:29 GMT rgrieder [682] * code/branches/FICN/src/loader/LevelLoader.cc (modified) * code/branches/FICN/src/loader/LevelLoader.h (modified) * code/branches/FICN/src/loader/LoaderPlatform.h (deleted) * code/branches/FICN/src/loader/LoaderPrereqs.h (added) * code/branches/FICN/src/misc/Tokenizer.h (modified) * code/branches/FICN/src/orxonox/Orxonox.h (modified) * code/branches/FICN/src/orxonox/OrxonoxPlatform.h (added) * code/branches/FICN/src/orxonox/OrxonoxPrereqs.h (modified) * code/branches/FICN/src/orxonox/core/ArgReader.h (modified) * code/branches/FICN/src/orxonox/core/ClassFactory.h (modified) * code/branches/FICN/src/orxonox/core/ConfigValueContainer.cc (modified) * code/branches/FICN/src/orxonox/core/ConfigValueContainer.h (modified) * code/branches/FICN/src/orxonox/core/CoreIncludes.h (modified) * code/branches/FICN/src/orxonox/core/CorePrereqs.h (added) * code/branches/FICN/src/orxonox/core/Debug.h (modified) * code/branches/FICN/src/orxonox/core/DebugLevel.cc (modified) * code/branches/FICN/src/orxonox/core/DebugLevel.h (modified) * code/branches/FICN/src/orxonox/core/Error.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.h (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.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/core/SignalHandler.cc (modified) * code/branches/FICN/src/orxonox/core/SignalHandler.h (modified) * code/branches/FICN/visual_studio/FICN.sln (modified) * code/branches/FICN/visual_studio/benixonox.vcproj (modified) * code/branches/FICN/visual_studio/core.vcproj (modified) * code/branches/FICN/visual_studio/loader.vcproj (modified) - adapted the core to be an actual windows dll (only tested with ... Sun, 23 Dec 2007 23:19:43 GMT rgrieder [681] * code/branches/FICN/src/loader/LevelLoader.cc (modified) * code/branches/FICN/src/network/ConnectionManager.cc (modified) - removed a warning and added on FIXME Sun, 23 Dec 2007 22:26:17 GMT rgrieder [679] * code/branches/FICN/src/loader/LoaderPlatform.h (added) * code/branches/FICN/src/orxonox/GraphicsEngine.cc (modified) * code/branches/FICN/visual_studio (modified) * code/branches/FICN/visual_studio/benixonox.vcproj (modified) - added missing LoaderPlatform.h (filename change from last commit) ... Sun, 23 Dec 2007 22:17:01 GMT rgrieder [678] * code/branches/FICN/FICN.sln (deleted) * code/branches/FICN/audio.vcproj (deleted) * code/branches/FICN/benixonox.vcproj (deleted) * code/branches/FICN/core.vcproj (deleted) * code/branches/FICN/loader.vcproj (deleted) * code/branches/FICN/network.vcproj (deleted) * code/branches/FICN/src/loader/LevelLoader.h (modified) * code/branches/FICN/src/loader/loader_platform.h (deleted) * code/branches/FICN/tiny_xml.vcproj (deleted) * code/branches/FICN/visual_studio (added) * code/branches/FICN/visual_studio/FICN.sln (added) * code/branches/FICN/visual_studio/audio.vcproj (added) * code/branches/FICN/visual_studio/audio_properties.vsprops (added) * code/branches/FICN/visual_studio/base_properties.vsprops (added) * code/branches/FICN/visual_studio/base_properties_debug.vsprops (added) * code/branches/FICN/visual_studio/base_properties_release.vsprops (added) * code/branches/FICN/visual_studio/benixonox.vcproj (added) * code/branches/FICN/visual_studio/core.vcproj (added) * code/branches/FICN/visual_studio/core.vcproj.RGRIEDERT60.rgrieder.user (added) * code/branches/FICN/visual_studio/core_properties.vsprops (added) * code/branches/FICN/visual_studio/loader.vcproj (added) * code/branches/FICN/visual_studio/loader_properties.vsprops (added) * code/branches/FICN/visual_studio/network.vcproj (added) * code/branches/FICN/visual_studio/network_properties.vsprops (added) * code/branches/FICN/visual_studio/orxonox_properties.vsprops (added) * code/branches/FICN/visual_studio/tinyxml.vcproj (added) * code/branches/FICN/visual_studio/tinyxml_properties.vsprops (added) - put visual studio files in a separate folder - added vs property ... Sun, 23 Dec 2007 18:19:07 GMT landauf [677] * code/branches/FICN/src/audio/AudioIncludes.h (modified) * code/branches/FICN/src/audio/AudioStream.cc (modified) * code/branches/FICN/src/audio/AudioStream.h (modified) * code/branches/FICN/src/loader/LevelLoader.cc (modified) * code/branches/FICN/src/orxonox/core/ClassFactory.h (modified) * code/branches/FICN/src/orxonox/core/ConfigValueContainer.cc (modified) * code/branches/FICN/src/orxonox/core/CoreIncludes.h (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/Identifier.h (modified) * code/branches/FICN/src/orxonox/core/Iterator.h (modified) * code/branches/FICN/src/orxonox/core/MetaObjectList.h (modified) * code/branches/FICN/src/orxonox/objects/test1.cc (modified) * code/branches/FICN/src/orxonox/objects/test2.cc (modified) * code/branches/FICN/src/orxonox/objects/test3.cc (modified) changed \n to std::endl Sat, 22 Dec 2007 21:15:06 GMT rgrieder [673] * code/branches/FICN/FICN.sln (modified) * code/branches/FICN/benixonox.vcproj (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/AudioStream.h (modified) * code/branches/FICN/src/loader/LevelLoader.h (modified) * code/branches/FICN/src/loader/loader_platform.h (modified) * code/branches/FICN/src/network/Client.h (modified) * code/branches/FICN/src/network/ClientConnection.h (modified) * code/branches/FICN/src/network/ClientInformation.h (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/NetworkFrameListener.h (modified) * code/branches/FICN/src/network/PacketBuffer.h (modified) * code/branches/FICN/src/network/PacketManager.h (modified) * code/branches/FICN/src/network/PacketTypes.h (modified) * code/branches/FICN/src/network/Server.h (modified) * code/branches/FICN/src/network/Synchronisable.h (modified) * code/branches/FICN/src/orxonox/AIClass.h (modified) * code/branches/FICN/src/orxonox/Arrival.h (modified) * code/branches/FICN/src/orxonox/CMakeLists.txt (modified) * code/branches/FICN/src/orxonox/Flocking.h (modified) * code/branches/FICN/src/orxonox/GraphicsEngine.h (modified) * code/branches/FICN/src/orxonox/InputManager.h (modified) * code/branches/FICN/src/orxonox/Orxonox.cc (modified) * code/branches/FICN/src/orxonox/Orxonox.h (modified) * code/branches/FICN/src/orxonox/OrxonoxPrereqs.h (modified) * code/branches/FICN/src/orxonox/SpaceshipSteering.h (modified) * code/branches/FICN/src/orxonox/core/ArgReader.h (modified) * code/branches/FICN/src/orxonox/core/ClassFactory.h (modified) * code/branches/FICN/src/orxonox/core/ConfigValueContainer.h (modified) * code/branches/FICN/src/orxonox/core/DebugLevel.h (modified) * code/branches/FICN/src/orxonox/core/Error.h (modified) * code/branches/FICN/src/orxonox/core/Factory.h (modified) * code/branches/FICN/src/orxonox/core/Identifier.h (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.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/core/SignalHandler.h (modified) * code/branches/FICN/src/orxonox/hud/HUD.h (modified) * code/branches/FICN/src/orxonox/objects/Ambient.h (modified) * code/branches/FICN/src/orxonox/objects/BaseEntity.cc (deleted) * code/branches/FICN/src/orxonox/objects/BaseEntity.h (deleted) * code/branches/FICN/src/orxonox/objects/BaseObject.cc (modified) * code/branches/FICN/src/orxonox/objects/BaseObject.h (modified) * code/branches/FICN/src/orxonox/objects/BillboardSet.h (modified) * code/branches/FICN/src/orxonox/objects/CMakeLists.txt (modified) * code/branches/FICN/src/orxonox/objects/Camera.h (modified) * code/branches/FICN/src/orxonox/objects/Entity.cc (deleted) * code/branches/FICN/src/orxonox/objects/Entity.h (deleted) * code/branches/FICN/src/orxonox/objects/Explosion.h (modified) * code/branches/FICN/src/orxonox/objects/Fighter.h (modified) * code/branches/FICN/src/orxonox/objects/Light.cc (deleted) * code/branches/FICN/src/orxonox/objects/Light.h (deleted) * code/branches/FICN/src/orxonox/objects/Mesh.h (modified) * code/branches/FICN/src/orxonox/objects/Model.h (modified) * code/branches/FICN/src/orxonox/objects/NPC.h (modified) * code/branches/FICN/src/orxonox/objects/Projectile.h (modified) * code/branches/FICN/src/orxonox/objects/SceneNode.cc (deleted) * code/branches/FICN/src/orxonox/objects/SceneNode.h (deleted) * code/branches/FICN/src/orxonox/objects/Skybox.h (modified) * code/branches/FICN/src/orxonox/objects/SpaceShip.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/WorldEntity.h (modified) * code/branches/FICN/src/orxonox/objects/weapon_system/AmmunitionDump.h (modified) * code/branches/FICN/src/orxonox/objects/weapon_system/BarrelGun.h (modified) * code/branches/FICN/src/orxonox/objects/weapon_system/BaseWeapon.h (modified) * code/branches/FICN/src/orxonox/objects/weapon_system/Bullet.h (modified) * code/branches/FICN/src/orxonox/objects/weapon_system/BulletManager.h (modified) * code/branches/FICN/src/orxonox/objects/weapon_system/WeaponStation.h (modified) * code/branches/FICN/src/orxonox/particle/ParticleInterface.h (modified) - deleted obsolete classes: BaseEntity, Entity, Light and SceneNode ... Thu, 20 Dec 2007 19:01:43 GMT nicolasc [663] * code/branches/FICN/src/loader/LevelLoader.cc (modified) * code/branches/FICN/src/orxonox/Orxonox.cc (modified) * code/branches/FICN/src/orxonox/core/ConfigValueContainer.cc (modified) * code/branches/FICN/src/orxonox/core/ConfigValueContainer.h (modified) * code/branches/FICN/src/orxonox/objects/SpaceshipSteeringObject.cc (modified) fixed auto repeat problem Thu, 20 Dec 2007 17:55:17 GMT nicolasc [661] * code/branches/FICN/Media/materials/scripts/Orxonox.material (modified) * code/branches/FICN/Media/materials/textures/crosshair.png (added) * code/branches/FICN/src/loader/LevelLoader.cc (modified) * code/branches/FICN/src/orxonox/objects/SpaceShip.cc (modified) * code/branches/FICN/src/orxonox/objects/SpaceShip.h (modified) added a test crosshair -- same hack as blinky Thu, 20 Dec 2007 15:26:02 GMT nicolasc [660] * code/branches/FICN/src/audio/AudioBuffer.cc (modified) * code/branches/FICN/src/loader/LevelLoader.cc (modified) * code/branches/FICN/src/loader/LevelLoader.h (modified) * code/branches/FICN/src/network/Server.cc (modified) * code/branches/FICN/src/network/dummyclient2.cc (modified) * code/branches/FICN/src/orxonox/hud/HUD.cc (modified) * code/branches/FICN/src/orxonox/objects/Camera.cc (modified) * code/branches/FICN/src/orxonox/objects/Projectile.cc (modified) * code/branches/FICN/src/orxonox/objects/SpaceShip.cc (modified) * code/branches/FICN/src/orxonox/objects/weapon_system/ammunition_dump.cc (modified) * code/branches/FICN/src/tinyxml/tinystr.cc (modified) - added FIXME-tags - should be selfexplanatory Thu, 20 Dec 2007 15:10:08 GMT nicolasc [659] * code/branches/FICN/src/audio/CMakeLists.txt (modified) * code/branches/FICN/src/loader/LevelLoader.cc (modified) * code/branches/FICN/src/loader/LevelLoader.h (modified) * code/branches/FICN/src/misc/String2Number.h (modified) * code/branches/FICN/src/misc/Tokenizer.h (modified) * code/branches/FICN/src/network/CMakeLists.txt (modified) * code/branches/FICN/src/orxonox/hud/HUD.cc (modified) * code/branches/FICN/src/orxonox/hud/HUD.h (modified) * code/branches/FICN/src/orxonox/particle/ParticleInterface.cc (modified) * code/branches/FICN/src/orxonox/particle/ParticleInterface.h (modified) - a lot of inlining of getfunctions - set libaudio to shared (not ... Wed, 19 Dec 2007 12:10:23 GMT nicolape [655] * code/branches/FICN/bin/levels/sample.oxw (modified) * code/branches/FICN/src/loader/LevelLoader.cc (modified) Fixed ambient sound and changed skybox Tue, 18 Dec 2007 19:28:13 GMT rgrieder [625] * code/branches/FICN/src/loader/LevelLoader.cc (modified) - fixed comment problem in XML parser in LevelLoader.cc (only in ... Tue, 18 Dec 2007 13:50:50 GMT nicolasc [616] * code/branches/FICN/src/loader/LevelLoader.cc (modified) * code/branches/FICN/src/orxonox/GraphicsEngine.cc (modified) * code/branches/FICN/src/orxonox/Orxonox.cc (modified) * code/branches/FICN/src/orxonox/OrxonoxPrereqs.h (modified) * code/branches/FICN/src/orxonox/objects/BaseEntity.cc (modified) * code/branches/FICN/src/orxonox/objects/SceneNode.cc (modified) * code/branches/FICN/src/orxonox/objects/test1.cc (modified) changed include names to new file names...< Tue, 18 Dec 2007 13:42:53 GMT rgrieder [614] * code/branches/FICN/src/loader/LevelLoader.cc (modified) * code/branches/FICN/src/network/NetworkFrameListener.h (modified) * code/branches/FICN/src/orxonox/GraphicsEngine.h (modified) * code/branches/FICN/src/orxonox/Main.cc (modified) * code/branches/FICN/src/orxonox/Orxonox.cc (modified) * code/branches/FICN/src/orxonox/objects/Ambient.cc (modified) * code/branches/FICN/src/orxonox/objects/BaseEntity.cc (modified) * code/branches/FICN/src/orxonox/objects/Camera.cc (modified) * code/branches/FICN/src/orxonox/objects/Entity.cc (modified) * code/branches/FICN/src/orxonox/objects/Mesh.cc (modified) * code/branches/FICN/src/orxonox/objects/Model.cc (modified) * code/branches/FICN/src/orxonox/objects/SceneNode.cc (modified) * code/branches/FICN/src/orxonox/objects/Skybox.cc (modified) * code/branches/FICN/src/orxonox/objects/SpaceShip.cc (modified) * code/branches/FICN/src/orxonox/objects/SpaceshipSteeringObject.cc (modified) * code/branches/FICN/src/orxonox/objects/WorldEntity.cc (modified) * code/branches/FICN/src/orxonox/objects/test1.cc (modified) - curiously (...) under windows there is no difference between ... Tue, 18 Dec 2007 12:16:24 GMT rgrieder [610] * code/branches/FICN/src/loader/loader_prereq.h (deleted) * code/branches/FICN/src/orxonox/OrxonoxPrereq.h (added) * code/branches/FICN/src/orxonox/orxonox.cc (modified) * code/branches/FICN/src/orxonox/orxonox.h (modified) - added OrxonoxPrereq.h, containing all forward declarations ... Mon, 17 Dec 2007 16:59:53 GMT nicolape [585] * code/branches/FICN/bin/levels/sample.oxw (modified) * code/branches/FICN/src/audio/AudioBuffer.cc (modified) * code/branches/FICN/src/audio/AudioManager.cc (modified) * code/branches/FICN/src/loader/LevelLoader.cc (modified) Added some stuff to level Mon, 17 Dec 2007 16:44:18 GMT nicolape [584] * code/branches/FICN/bin/levels/sample.oxw (modified) * code/branches/FICN/src/loader/LevelLoader.cc (modified) * code/branches/FICN/src/orxonox/orxonox.cc (modified) * code/branches/FICN/src/orxonox/orxonox.h (modified) Music loads now from level file Mon, 17 Dec 2007 02:20:46 GMT landauf [560] * code/branches/FICN/src/audio/AudioManager.cc (modified) * code/branches/FICN/src/audio/AudioStream.cc (modified) * code/branches/FICN/src/audio/_AudioObject.cc (modified) * code/branches/FICN/src/loader/LevelLoader.cc (modified) * code/branches/FICN/src/misc/String2Number.h (modified) * code/branches/FICN/src/orxonox/core/CMakeLists.txt (modified) * code/branches/FICN/src/orxonox/core/Debug.h (modified) * code/branches/FICN/src/orxonox/core/Error.cc (modified) * code/branches/FICN/src/orxonox/core/SignalHandler.cc (modified) * code/branches/FICN/src/orxonox/graphicsEngine.cc (modified) * code/branches/FICN/src/orxonox/objects/Ambient.cc (modified) * code/branches/FICN/src/orxonox/objects/Camera.cc (modified) * code/branches/FICN/src/orxonox/objects/Entity.cc (modified) * code/branches/FICN/src/orxonox/objects/SceneNode.cc (modified) * code/branches/FICN/src/orxonox/objects/Skybox.cc (modified) * code/branches/FICN/src/orxonox/objects/SpaceshipSteeringObject.cc (modified) * code/branches/FICN/src/orxonox/orxonox.cc (modified) * code/branches/FICN/src/orxonox/spaceship_steering.cc (modified) - changed output from std::cout to COUT(level) - added ... Mon, 17 Dec 2007 01:19:29 GMT landauf [559] * code/branches/FICN/src/loader/LevelLoader.cc (modified) added check, but orxonox still crashes when an unknown classname is ... 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: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 ... 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: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 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 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 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 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 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 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 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 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 ... 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 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 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: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 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, 05 Nov 2007 12:16:39 GMT nicolasc [164] * code/trunk/bin/levels (added) * code/trunk/bin/levels/sp_level_moonstation.oxw (added) * code/trunk/src/CMakeLists.txt (modified) * code/trunk/src/loader (added) * code/trunk/src/loader/LevelLoader.cc (added) * code/trunk/src/loader/LevelLoader.h (added) * code/trunk/src/loader/Light.cc (added) * code/trunk/src/loader/Light.h (added) * code/trunk/src/loader/LightManager.cc (added) * code/trunk/src/loader/LightManager.h (added) * code/trunk/src/orxonox.cc (modified) * code/trunk/src/xml (added) * code/trunk/src/xml/xmlParser.cc (added) * code/trunk/src/xml/xmlParser.h (added) Brute force megre of xml branch