# # ChangeLog for code/branches/FICN/src/orxonox/objects # # Generated by Trac 1.0.9 # Jun 4, 2024, 9:50:05 AM Fri, 28 Dec 2007 02:00:01 GMT landauf [706] * code/branches/FICN/src/orxonox/core/DebugLevel.cc (modified) * code/branches/FICN/src/orxonox/objects/Fighter.cc (modified) * code/branches/FICN/src/orxonox/objects/Projectile.cc (modified) * code/branches/FICN/src/orxonox/objects/SpaceShip.cc (modified) added descriptions to the existing config-values Thu, 27 Dec 2007 04:06:55 GMT landauf [697] * code/branches/FICN/src/orxonox/core/OrxonoxClass.cc (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/Projectile.cc (modified) * code/branches/FICN/src/orxonox/objects/Projectile.h (modified) * code/branches/FICN/src/orxonox/objects/SpaceShip.cc (modified) * code/branches/FICN/src/orxonox/objects/SpaceShip.h (modified) put all SetConfigValue macro calls into the setConfigValues function ... Sun, 23 Dec 2007 23:10:18 GMT rgrieder [680] * 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/BulletManager.cc (modified) * code/branches/FICN/src/orxonox/objects/weapon_system/WeaponStation.cc (modified) - removed some gcc warnings in weapon system 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 Sun, 23 Dec 2007 02:36:30 GMT landauf [676] * code/branches/FICN/src/misc/String2Number.h (modified) * code/branches/FICN/src/misc/Tokenizer.h (modified) * code/branches/FICN/src/orxonox/CMakeLists.txt (modified) * code/branches/FICN/src/orxonox/core/CoreIncludes.h (modified) * code/branches/FICN/src/orxonox/objects/CMakeLists.txt (modified) * code/branches/FICN/src/orxonox/objects/Light.cc (added) * code/branches/FICN/src/orxonox/objects/Light.h (added) - include guards - readded Light (maybe i'll remove it again, but ... Sat, 22 Dec 2007 21:26:52 GMT rgrieder [674] * code/branches/FICN/src/orxonox/CMakeLists.txt (modified) * code/branches/FICN/src/orxonox/objects/CMakeLists.txt (modified) - fixed CMLs in src/orxonox 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 ... Sat, 22 Dec 2007 15:57:55 GMT landauf [671] * code/branches/FICN/src/orxonox/CMakeLists.txt (modified) * code/branches/FICN/src/orxonox/objects/CMakeLists.txt (modified) fixed typo and CML for non-windows systems Sat, 22 Dec 2007 15:52:39 GMT landauf [670] * 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/Debug.h (modified) * code/branches/FICN/src/orxonox/core/DebugLevel.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/Iterator.h (modified) * code/branches/FICN/src/orxonox/core/MetaObjectList.cc (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/SignalHandler.cc (modified) * code/branches/FICN/src/orxonox/objects/BillboardSet.cc (modified) * code/branches/FICN/src/orxonox/objects/Explosion.cc (modified) * code/branches/FICN/src/orxonox/objects/Light.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/Projectile.cc (modified) * code/branches/FICN/src/orxonox/objects/SpaceShip.cc (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/WorldEntity.cc (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) copyright notes Sat, 22 Dec 2007 15:45:34 GMT rgrieder [669] * code/branches/FICN (modified) * code/branches/FICN/FICN.sln (added) * code/branches/FICN/audio.vcproj (added) * code/branches/FICN/benixonox.vcproj (added) * code/branches/FICN/core.vcproj (added) * code/branches/FICN/loader.vcproj (added) * code/branches/FICN/network.vcproj (added) * code/branches/FICN/src/audio (modified) * code/branches/FICN/src/orxonox/CMakeLists.txt (modified) * code/branches/FICN/src/orxonox/objects/weapon_system/Bullet.cc (added) * code/branches/FICN/src/orxonox/objects/weapon_system/Bullet.h (added) * code/branches/FICN/tiny_xml.vcproj (added) - completed last svn update (delete and add to rename first letter) ... Sat, 22 Dec 2007 15:35:17 GMT rgrieder [668] * code/branches/FICN/src/orxonox/Main.cc (modified) * code/branches/FICN/src/orxonox/core/ArgReader.cc (modified) * code/branches/FICN/src/orxonox/core/Identifier.cc (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/Fighter.cc (modified) * code/branches/FICN/src/orxonox/objects/weapon_system/AmmunitionDump.cc (added) * code/branches/FICN/src/orxonox/objects/weapon_system/AmmunitionDump.h (added) * code/branches/FICN/src/orxonox/objects/weapon_system/BarrelGun.cc (added) * code/branches/FICN/src/orxonox/objects/weapon_system/BarrelGun.h (added) * code/branches/FICN/src/orxonox/objects/weapon_system/BaseWeapon.cc (added) * code/branches/FICN/src/orxonox/objects/weapon_system/BaseWeapon.h (added) * code/branches/FICN/src/orxonox/objects/weapon_system/BulletManager.cc (added) * code/branches/FICN/src/orxonox/objects/weapon_system/BulletManager.h (added) * code/branches/FICN/src/orxonox/objects/weapon_system/WeaponStation.cc (added) * code/branches/FICN/src/orxonox/objects/weapon_system/WeaponStation.h (added) * code/branches/FICN/src/orxonox/objects/weapon_system/ammunition_dump.cc (deleted) * code/branches/FICN/src/orxonox/objects/weapon_system/ammunition_dump.h (deleted) * code/branches/FICN/src/orxonox/objects/weapon_system/barrel_gun.cc (deleted) * code/branches/FICN/src/orxonox/objects/weapon_system/barrel_gun.h (deleted) * code/branches/FICN/src/orxonox/objects/weapon_system/base_weapon.cc (deleted) * code/branches/FICN/src/orxonox/objects/weapon_system/base_weapon.h (deleted) * code/branches/FICN/src/orxonox/objects/weapon_system/bullet.cc (deleted) * code/branches/FICN/src/orxonox/objects/weapon_system/bullet.h (deleted) * code/branches/FICN/src/orxonox/objects/weapon_system/bullet_manager.cc (deleted) * code/branches/FICN/src/orxonox/objects/weapon_system/bullet_manager.h (deleted) * code/branches/FICN/src/orxonox/objects/weapon_system/weapon_platform.h (deleted) * code/branches/FICN/src/orxonox/objects/weapon_system/weapon_prereq.h (deleted) * code/branches/FICN/src/orxonox/objects/weapon_system/weapon_station.cc (deleted) * code/branches/FICN/src/orxonox/objects/weapon_system/weapon_station.h (deleted) - updated weapon system file names - some code style modifications ... Sat, 22 Dec 2007 01:13:18 GMT landauf [667] * code/branches/FICN/src/misc/String2Number.h (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/core/CoreIncludes.h (modified) * code/branches/FICN/src/orxonox/core/Factory.cc (modified) * code/branches/FICN/src/orxonox/objects/test3.cc (modified) * code/branches/FICN/src/orxonox/objects/test3.h (modified) - expanded the String2Number.h file - changed the SetConfigValue ... Fri, 21 Dec 2007 00:47:26 GMT landauf [664] * code/branches/FICN/src/audio/CMakeLists.txt (modified) * code/branches/FICN/src/orxonox/objects/Explosion.cc (modified) * code/branches/FICN/src/orxonox/objects/SpaceShip.cc (modified) - bigger explosions - changed camera orientation 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 Wed, 19 Dec 2007 11:41:31 GMT rgrieder [654] * code/branches/FICN/src/orxonox/objects/weapon_system/barrel_gun.cc (modified) * code/branches/FICN/src/orxonox/objects/weapon_system/bullet_manager.cc (modified) - removed barrel rotation Wed, 19 Dec 2007 09:11:45 GMT rgrieder [651] * code/branches/FICN/src/orxonox/objects/CMakeLists.txt (modified) - added Fighter.cc to the CML Wed, 19 Dec 2007 09:05:34 GMT rgrieder [650] * code/branches/FICN/bin/levels/sample.oxw (modified) * code/branches/FICN/src/orxonox/objects/Fighter.cc (modified) - little changes, added Fighter (commented) Wed, 19 Dec 2007 07:12:01 GMT landauf [647] * code/branches/FICN/src/orxonox/objects/SpaceShip.cc (modified) * code/branches/FICN/src/orxonox/objects/SpaceShip.h (modified) * code/branches/FICN/src/orxonox/objects/WorldEntity.h (modified) * code/branches/FICN/src/orxonox/particle/ParticleInterface.cc (modified) good morning everybody! did some changes in the steering of SpaceShip Wed, 19 Dec 2007 04:04:07 GMT landauf [646] * code/branches/FICN/src/orxonox/CMakeLists.txt (modified) * code/branches/FICN/src/orxonox/core/Iterator.h (modified) * code/branches/FICN/src/orxonox/objects/CMakeLists.txt (modified) * code/branches/FICN/src/orxonox/objects/Explosion.cc (added) * code/branches/FICN/src/orxonox/objects/Explosion.h (added) * code/branches/FICN/src/orxonox/objects/Model.cc (modified) * code/branches/FICN/src/orxonox/objects/Model.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/SpaceShip.cc (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/particle/ParticleInterface.cc (modified) * code/branches/FICN/src/orxonox/particle/ParticleInterface.h (modified) - added very bad collision detection (presentation hack :D) - added ... Wed, 19 Dec 2007 02:05:56 GMT rgrieder [645] * code/branches/FICN/src/orxonox/objects/Fighter.cc (modified) * code/branches/FICN/src/orxonox/objects/Fighter.h (modified) * code/branches/FICN/src/orxonox/objects/weapon_system/barrel_gun.cc (modified) * code/branches/FICN/src/orxonox/objects/weapon_system/barrel_gun.h (modified) * code/branches/FICN/src/orxonox/objects/weapon_system/base_weapon.cc (modified) * code/branches/FICN/src/orxonox/objects/weapon_system/base_weapon.h (modified) - weapon system up and running Wed, 19 Dec 2007 02:03:30 GMT landauf [644] * code/branches/FICN/src/orxonox/objects/Projectile.cc (modified) * code/branches/FICN/src/orxonox/objects/SpaceShip.cc (modified) * code/branches/FICN/src/orxonox/objects/SpaceShip.h (modified) added free-view-mode (hold right mouse button pressed) Wed, 19 Dec 2007 01:41:01 GMT landauf [643] * code/branches/FICN/src/orxonox/CMakeLists.txt (modified) * code/branches/FICN/src/orxonox/objects/CMakeLists.txt (modified) * code/branches/FICN/src/orxonox/objects/Projectile.cc (added) * code/branches/FICN/src/orxonox/objects/Projectile.h (added) * code/branches/FICN/src/orxonox/objects/SpaceShip.cc (modified) * code/branches/FICN/src/orxonox/objects/SpaceShip.h (modified) * code/branches/FICN/src/orxonox/objects/WorldEntity.cc (modified) * code/branches/FICN/src/orxonox/objects/WorldEntity.h (modified) added a simple firing mode to SpaceShip Wed, 19 Dec 2007 01:14:47 GMT landauf [640] * code/branches/FICN/src/orxonox/objects/Tickable.h (modified) * code/branches/FICN/src/orxonox/objects/Timer.h (modified) improved documentation :D Wed, 19 Dec 2007 00:51:18 GMT rgrieder [638] * code/branches/FICN/src/orxonox/objects/CMakeLists.txt (modified) * code/branches/FICN/src/orxonox/objects/weapon_system/CMakeLists.txt (deleted) - added weapon system (probably not working yet) Wed, 19 Dec 2007 00:49:24 GMT rgrieder [637] * 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/objects/BaseEntity.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/Fighter.cc (added) * code/branches/FICN/src/orxonox/objects/Fighter.h (added) * 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 (added) * code/branches/FICN/src/orxonox/objects/weapon_system/CMakeLists.txt (added) * code/branches/FICN/src/orxonox/objects/weapon_system/ammunition_dump.cc (added) * code/branches/FICN/src/orxonox/objects/weapon_system/ammunition_dump.h (added) * code/branches/FICN/src/orxonox/objects/weapon_system/barrel_gun.cc (added) * code/branches/FICN/src/orxonox/objects/weapon_system/barrel_gun.h (added) * code/branches/FICN/src/orxonox/objects/weapon_system/base_weapon.cc (added) * code/branches/FICN/src/orxonox/objects/weapon_system/base_weapon.h (added) * code/branches/FICN/src/orxonox/objects/weapon_system/bullet.cc (added) * code/branches/FICN/src/orxonox/objects/weapon_system/bullet.h (added) * code/branches/FICN/src/orxonox/objects/weapon_system/bullet_manager.cc (added) * code/branches/FICN/src/orxonox/objects/weapon_system/bullet_manager.h (added) * code/branches/FICN/src/orxonox/objects/weapon_system/weapon_platform.h (added) * code/branches/FICN/src/orxonox/objects/weapon_system/weapon_prereq.h (added) * code/branches/FICN/src/orxonox/objects/weapon_system/weapon_station.cc (added) * code/branches/FICN/src/orxonox/objects/weapon_system/weapon_station.h (added) Wed, 19 Dec 2007 00:31:49 GMT landauf [634] * code/branches/FICN/src/orxonox/objects/BillboardSet.cc (modified) removed debug output Wed, 19 Dec 2007 00:30:47 GMT landauf [633] * code/branches/FICN/src/orxonox/CMakeLists.txt (modified) * code/branches/FICN/src/orxonox/objects/BillboardSet.cc (added) * code/branches/FICN/src/orxonox/objects/BillboardSet.h (added) * code/branches/FICN/src/orxonox/objects/CMakeLists.txt (modified) * code/branches/FICN/src/orxonox/objects/Light.cc (added) * code/branches/FICN/src/orxonox/objects/Light.h (added) * code/branches/FICN/src/orxonox/objects/Mesh.cc (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/WorldEntity.cc (modified) added blinkies :D Tue, 18 Dec 2007 23:25:13 GMT scheusso [631] * code/branches/FICN/src/orxonox/objects/Model.cc (modified) * code/branches/FICN/src/orxonox/objects/WorldEntity.cc (modified) removed segfault Tue, 18 Dec 2007 23:04:49 GMT scheusso [630] * code/branches/FICN/src/network/GameStateManager.cc (modified) * code/branches/FICN/src/network/Synchronisable.cc (modified) * code/branches/FICN/src/network/Synchronisable.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/WorldEntity.cc (modified) * code/branches/FICN/src/orxonox/objects/WorldEntity.h (modified) made Model and WorldEntity synchronisable Tue, 18 Dec 2007 21:11:27 GMT bknecht [627] * code/branches/FICN/bin/levels/sample.oxw (modified) * code/branches/FICN/src/orxonox/Orxonox.cc (modified) * code/branches/FICN/src/orxonox/objects/NPC.cc (modified) * code/branches/FICN/src/orxonox/objects/NPC.h (modified) working AI added (put them aside if you want) Tue, 18 Dec 2007 19:58:22 GMT rgrieder [626] * code/branches/FICN/src/orxonox/objects/SpaceShip.cc (modified) * code/branches/FICN/src/orxonox/objects/SpaceShip.h (modified) - thruster effects are now only shown when the ship accelerates Tue, 18 Dec 2007 18:01:41 GMT rgrieder [623] * code/branches/FICN/src/hud (deleted) * code/branches/FICN/src/orxonox/hud/hud_overlay.cc (deleted) * code/branches/FICN/src/orxonox/hud/hud_overlay.h (deleted) * code/branches/FICN/src/orxonox/hud/test_overlay.cc (deleted) * code/branches/FICN/src/orxonox/hud/test_overlay.h (deleted) * code/branches/FICN/src/orxonox/objects/SpaceShip.cc (modified) * code/branches/FICN/src/orxonox/weapon (deleted) - removed old hud stuff - Intialise pointers with NULL! (curiously ... Tue, 18 Dec 2007 17:03:54 GMT landauf [622] * code/branches/FICN/bin/levels/sample.oxw (modified) * code/branches/FICN/src/orxonox/Main.cc (modified) * code/branches/FICN/src/orxonox/objects/Model.cc (modified) * code/branches/FICN/src/orxonox/objects/WorldEntity.cc (modified) * code/branches/FICN/src/orxonox/objects/WorldEntity.h (modified) added some randomly generated (rotating) asteroids Tue, 18 Dec 2007 17:00:40 GMT nicolasc [621] * code/branches/FICN/src/orxonox/objects/SpaceShip.cc (modified) * code/branches/FICN/src/orxonox/particle/ParticleInterface.h (modified) don't access variables directly!! Tue, 18 Dec 2007 16:30:25 GMT bknecht [619] * code/branches/FICN/src/orxonox/objects/NPC.cc (modified) * code/branches/FICN/src/orxonox/objects/NPC.h (modified) maybe this helps... Tue, 18 Dec 2007 15:47:58 GMT nicolasc [618] * code/branches/FICN/src/orxonox/Arrival.h (modified) * code/branches/FICN/src/orxonox/Flocking.h (modified) * code/branches/FICN/src/orxonox/Main.cc (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/Camera.cc (modified) * code/branches/FICN/src/orxonox/objects/SceneNode.cc (modified) * code/branches/FICN/src/orxonox/particle/ParticleInterface.cc (modified) * code/branches/FICN/src/orxonox/particle/ParticleInterface.h (modified) - changed comments to doxygen tags in flocking - reduced ogre ... Tue, 18 Dec 2007 15:41:20 GMT bknecht [617] * code/branches/FICN/src/orxonox/objects/NPC.cc (modified) * code/branches/FICN/src/orxonox/objects/NPC.h (modified) implemented content of Flocking.h 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 13:32:49 GMT rgrieder [612] * code/branches/FICN/src/misc/Tokenizer.h (modified) * code/branches/FICN/src/orxonox/CMakeLists.txt (modified) * code/branches/FICN/src/orxonox/GraphicsEngine.cc (added) * code/branches/FICN/src/orxonox/GraphicsEngine.h (added) * code/branches/FICN/src/orxonox/Main.cc (added) * code/branches/FICN/src/orxonox/Orxonox.cc (added) * code/branches/FICN/src/orxonox/Orxonox.h (added) * code/branches/FICN/src/orxonox/OrxonoxPrereqs.h (added) * code/branches/FICN/src/orxonox/SpaceshipSteering.cc (added) * code/branches/FICN/src/orxonox/SpaceshipSteering.h (added) * code/branches/FICN/src/orxonox/objects/SpaceshipSteeringObject.cc (modified) - restored filename consistency for src/orxonox Tue, 18 Dec 2007 01:23:12 GMT landauf [608] * code/branches/FICN/bin/levels/sample.oxw (modified) * code/branches/FICN/src/orxonox/CMakeLists.txt (modified) * code/branches/FICN/src/orxonox/objects/CMakeLists.txt (modified) * code/branches/FICN/src/orxonox/objects/Camera.cc (modified) * code/branches/FICN/src/orxonox/objects/SpaceShip.cc (added) * code/branches/FICN/src/orxonox/objects/SpaceShip.h (added) * code/branches/FICN/src/orxonox/orxonox.cc (modified) * code/branches/FICN/src/orxonox/orxonox.h (modified) added SpaceShip class Mon, 17 Dec 2007 21:37:02 GMT bknecht [603] * code/branches/FICN/src/orxonox/objects/NPC.cc (added) * code/branches/FICN/src/orxonox/objects/NPC.h (added) now really npc class added Mon, 17 Dec 2007 21:35:57 GMT bknecht [602] * code/branches/FICN/src/orxonox/objects/CMakeLists.txt (modified) npc class added using AI stuff Mon, 17 Dec 2007 20:56:47 GMT scheusso [599] * code/branches/FICN/bin/run-script (modified) * code/branches/FICN/run (modified) * code/branches/FICN/src/network/GameStateManager.cc (modified) * code/branches/FICN/src/network/Synchronisable.cc (modified) * code/branches/FICN/src/orxonox/objects/SceneNode.cc (modified) * code/branches/FICN/src/orxonox/objects/SceneNode.h (modified) * code/branches/FICN/src/orxonox/orxonox.cc (modified) * code/branches/FICN/src/orxonox/orxonox.h (modified) ip address with --ip=address Mon, 17 Dec 2007 20:23:52 GMT landauf [595] * code/branches/FICN/bin/levels/sample.oxw (modified) * code/branches/FICN/src/orxonox/objects/WorldEntity.cc (modified) spaceships are now models too (except the steered one) Mon, 17 Dec 2007 19:23:26 GMT scheusso [590] * code/branches/FICN/bin/levels/sample.oxw (modified) * code/branches/FICN/src/network/GameStateManager.cc (modified) * code/branches/FICN/src/orxonox/objects/BaseEntity.cc (modified) * code/branches/FICN/src/orxonox/objects/BaseEntity.h (modified) * code/branches/FICN/src/orxonox/objects/SceneNode.cc (modified) * code/branches/FICN/src/orxonox/objects/SceneNode.h (modified) enhanced memory handling Mon, 17 Dec 2007 18:14:41 GMT landauf [589] * 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/WorldEntity.cc (modified) * code/branches/FICN/src/orxonox/objects/WorldEntity.h (modified) finally found the damn fkng bug. Mon, 17 Dec 2007 17:16:28 GMT landauf [586] * code/branches/FICN/src/orxonox/objects/Mesh.cc (modified) * code/branches/FICN/src/orxonox/objects/Model.cc (modified) * code/branches/FICN/src/orxonox/objects/WorldEntity.cc (modified) * code/branches/FICN/src/orxonox/objects/WorldEntity.h (modified) bump Mon, 17 Dec 2007 15:54:42 GMT landauf [583] * code/branches/FICN/src/orxonox/objects/Model.cc (modified) * code/branches/FICN/src/orxonox/objects/WorldEntity.cc (modified) * code/branches/FICN/src/orxonox/objects/WorldEntity.h (modified) loadParams Mon, 17 Dec 2007 15:27:41 GMT rgrieder [580] * code/branches/FICN/bin/levels/sample.oxw (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/WorldEntity.cc (modified) * code/branches/FICN/src/orxonox/objects/WorldEntity.h (modified) - fixed the problem about the ship being static. - added SceneNode ... Mon, 17 Dec 2007 14:39:17 GMT landauf [576] * code/branches/FICN/bin/levels/sample.oxw (modified) * code/branches/FICN/src/orxonox/CMakeLists.txt (modified) * code/branches/FICN/src/orxonox/objects/CMakeLists.txt (modified) * code/branches/FICN/src/orxonox/objects/Mesh.cc (added) * code/branches/FICN/src/orxonox/objects/Mesh.h (added) * code/branches/FICN/src/orxonox/objects/Model.cc (modified) * code/branches/FICN/src/orxonox/objects/Model.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/orxonox.cc (modified) added Mesh and Model (doesn't work yet, but i don't want to have ... Mon, 17 Dec 2007 11:09:13 GMT scheusso [568] * code/branches/FICN/src/network/GameStateManager.cc (modified) * code/branches/FICN/src/orxonox/objects/BaseEntity.h (modified) * code/branches/FICN/src/orxonox/orxonox.cc (modified) * code/branches/FICN/src/orxonox/orxonox.h (modified) added capability for presentation mode Mon, 17 Dec 2007 10:16:50 GMT scheusso [567] * code/branches/FICN/src/network/GameStateClient.cc (modified) * code/branches/FICN/src/orxonox/objects/BaseEntity.cc (modified) * code/branches/FICN/src/orxonox/objects/WorldEntity.cc (modified) * code/branches/FICN/src/orxonox/objects/WorldEntity.h (modified) some minor changes/enhancements in GameStateClient Mon, 17 Dec 2007 10:03:24 GMT scheusso [566] * code/branches/FICN/src/orxonox/objects/BaseEntity.cc (added) * code/branches/FICN/src/orxonox/objects/BaseEntity.h (added) adding missing files ... Mon, 17 Dec 2007 09:39:12 GMT scheusso [565] * code/branches/FICN/CMakeLists.txt (modified) * code/branches/FICN/bin/levels/sample.oxw (modified) * code/branches/FICN/src/network/Client.cc (modified) * code/branches/FICN/src/network/Synchronisable.cc (modified) * code/branches/FICN/src/network/Synchronisable.h (modified) * code/branches/FICN/src/orxonox/objects/CMakeLists.txt (modified) * code/branches/FICN/src/orxonox/objects/WorldEntity.cc (modified) * code/branches/FICN/src/orxonox/objects/WorldEntity.h (modified) * code/branches/FICN/src/orxonox/orxonox.cc (modified) added class BaseEntity: - !!! please inherit from this class in ... 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:06:02 GMT landauf [556] * code/branches/FICN/src/orxonox/objects/Model.cc (added) * code/branches/FICN/src/orxonox/objects/Model.h (added) added missing files Mon, 17 Dec 2007 01:05:20 GMT landauf [555] * code/branches/FICN/src/loader/CMakeLists.txt (modified) * code/branches/FICN/src/network/CMakeLists.txt (modified) * code/branches/FICN/src/orxonox/CMakeLists.txt (modified) * code/branches/FICN/src/orxonox/core/CMakeLists.txt (modified) * code/branches/FICN/src/orxonox/hud/CMakeLists.txt (modified) * code/branches/FICN/src/orxonox/objects/CMakeLists.txt (modified) * code/branches/FICN/src/orxonox/particle/CMakeLists.txt (modified) * code/branches/FICN/src/orxonox/weapon/CMakeLists.txt (modified) * code/branches/FICN/src/tinyxml/CMakeLists.txt (modified) WIN32 hack in CLs Mon, 17 Dec 2007 00:58:26 GMT landauf [554] * code/branches/FICN/src/orxonox/objects/WorldEntity.cc (modified) * code/branches/FICN/src/orxonox/objects/WorldEntity.h (modified) removed scenemanager hack and used orxonox.h Sun, 16 Dec 2007 23:16:02 GMT landauf [547] * code/branches/FICN/CMakeLists.txt (modified) * code/branches/FICN/cmake/FindENet.cmake (modified) * code/branches/FICN/cmake/FindZLIB.cmake (modified) * code/branches/FICN/src/orxonox/CMakeLists.txt (modified) * code/branches/FICN/src/orxonox/objects/CMakeLists.txt (modified) compiles with mingw Sun, 16 Dec 2007 00:34:51 GMT landauf [538] * code/branches/FICN/CMakeLists.txt (modified) * code/branches/FICN/src/network/CMakeLists.txt (modified) * code/branches/FICN/src/network/dummyclient2.cc (modified) * code/branches/FICN/src/orxonox/objects/CMakeLists.txt (modified) windows library include (for enet) Sat, 15 Dec 2007 18:32:23 GMT rgrieder [533] * code/branches/FICN/src/network/dummyserver3.cc (modified) * code/branches/FICN/src/orxonox/InputManager.h (modified) * code/branches/FICN/src/orxonox/objects/WorldEntity.h (modified) - some minor changes in order to make the project compile with VC08 ... Sat, 15 Dec 2007 05:37:35 GMT scheusso [531] * code/branches/FICN/bin/run-script (modified) * code/branches/FICN/run (modified) * code/branches/FICN/src/network/PacketDecoder.cc (modified) * code/branches/FICN/src/network/PacketManager.h (modified) * code/branches/FICN/src/network/Synchronisable.cc (modified) * code/branches/FICN/src/orxonox/core/CoreIncludes.h (modified) * code/branches/FICN/src/orxonox/objects/Entity.cc (modified) * code/branches/FICN/src/orxonox/objects/Entity.h (modified) * code/branches/FICN/src/orxonox/orxonox.cc (modified) * code/branches/FICN/src/orxonox/orxonox.h (modified) * code/branches/FICN/src/orxonox/spaceship_steering.cc (modified) started implementing presentation ;) Thu, 13 Dec 2007 17:45:17 GMT nicolape [519] * code/branches/FICN/bin/levels/sample.oxw (modified) * code/branches/FICN/src/orxonox/objects/SpaceshipSteeringObject.cc (modified) * code/branches/FICN/src/orxonox/orxonox.cc (modified) Loading the steering works, but there is something odd with the ... Thu, 13 Dec 2007 17:31:06 GMT nicolasc [518] * code/branches/FICN/src/orxonox/objects/libobjects.so (deleted) rmeoved unnescessary libojects Thu, 13 Dec 2007 17:30:32 GMT nicolasc [517] * code/branches/FICN/src/orxonox/objects/Makefile (deleted) * code/branches/FICN/src/orxonox/objects/libobjects.so (modified) rmeoved unnescessary Makefile Thu, 13 Dec 2007 17:28:15 GMT nicolape [516] * code/branches/FICN/src/orxonox/objects/CMakeFiles (deleted) * code/branches/FICN/src/orxonox/objects/cmake_install.cmake (deleted) Ups.. these cmake files should not be comitted Thu, 13 Dec 2007 17:21:22 GMT nicolape [515] * code/branches/FICN/bin/levels/sample.oxw (modified) * code/branches/FICN/src/orxonox/objects/CMakeFiles (added) * code/branches/FICN/src/orxonox/objects/CMakeFiles/CMakeDirectoryInformation.cmake (added) * code/branches/FICN/src/orxonox/objects/CMakeFiles/objects.dir (added) * code/branches/FICN/src/orxonox/objects/CMakeFiles/objects.dir/CXX.includecache (added) * code/branches/FICN/src/orxonox/objects/CMakeFiles/objects.dir/DependInfo.cmake (added) * code/branches/FICN/src/orxonox/objects/CMakeFiles/objects.dir/build.make (added) * code/branches/FICN/src/orxonox/objects/CMakeFiles/objects.dir/cmake_clean.cmake (added) * code/branches/FICN/src/orxonox/objects/CMakeFiles/objects.dir/cmake_clean_target.cmake (added) * code/branches/FICN/src/orxonox/objects/CMakeFiles/objects.dir/depend.internal (added) * code/branches/FICN/src/orxonox/objects/CMakeFiles/objects.dir/depend.make (added) * code/branches/FICN/src/orxonox/objects/CMakeFiles/objects.dir/depend.make.mark (added) * code/branches/FICN/src/orxonox/objects/CMakeFiles/objects.dir/flags.make (added) * code/branches/FICN/src/orxonox/objects/CMakeFiles/objects.dir/link.txt (added) * code/branches/FICN/src/orxonox/objects/CMakeFiles/objects.dir/progress.make (added) * code/branches/FICN/src/orxonox/objects/CMakeFiles/progress.make (added) * code/branches/FICN/src/orxonox/objects/CMakeLists.txt (modified) * code/branches/FICN/src/orxonox/objects/Camera.cc (added) * code/branches/FICN/src/orxonox/objects/Camera.h (added) * code/branches/FICN/src/orxonox/objects/Entity.cc (added) * code/branches/FICN/src/orxonox/objects/Entity.h (added) * code/branches/FICN/src/orxonox/objects/Makefile (added) * code/branches/FICN/src/orxonox/objects/SceneNode.cc (added) * code/branches/FICN/src/orxonox/objects/SceneNode.h (added) * code/branches/FICN/src/orxonox/objects/SpaceshipSteeringObject.cc (added) * code/branches/FICN/src/orxonox/objects/SpaceshipSteeringObject.h (added) * code/branches/FICN/src/orxonox/objects/cmake_install.cmake (added) * code/branches/FICN/src/orxonox/objects/libobjects.so (added) * code/branches/FICN/src/orxonox/orxonox.cc (modified) * code/branches/FICN/src/orxonox/orxonox.h (modified) * code/branches/FICN/src/orxonox/spaceship_steering.cc (modified) * code/branches/FICN/src/orxonox/spaceship_steering.h (modified) Added some objects for the level loader Thu, 13 Dec 2007 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:39:49 GMT landauf [497] * code/branches/FICN/src/orxonox/core/ConfigValueContainer.cc (added) * code/branches/FICN/src/orxonox/core/ConfigValueContainer.h (added) * code/branches/FICN/src/orxonox/core/CoreIncludes.h (added) * code/branches/FICN/src/orxonox/core/IdentifierIncludes.h (deleted) * code/branches/FICN/src/orxonox/core/SignalHandler.cc (added) * code/branches/FICN/src/orxonox/core/SignalHandler.h (added) * code/branches/FICN/src/orxonox/objects/WorldEntity.cc (added) * code/branches/FICN/src/orxonox/objects/WorldEntity.h (added) added the new files from objecthierarchy Wed, 12 Dec 2007 21:37:30 GMT landauf [496] * code/branches/FICN/src/loader/LevelLoader.cc (modified) * code/branches/FICN/src/network/Client.cc (modified) * code/branches/FICN/src/network/Client.h (modified) * code/branches/FICN/src/network/ConnectionManager.cc (modified) * code/branches/FICN/src/network/ConnectionManager.h (modified) * code/branches/FICN/src/network/GameStateClient.h (modified) * code/branches/FICN/src/network/GameStateManager.h (modified) * code/branches/FICN/src/network/Synchronisable.h (modified) * code/branches/FICN/src/orxonox/core/CMakeLists.txt (modified) * code/branches/FICN/src/orxonox/core/ClassFactory.h (modified) * code/branches/FICN/src/orxonox/core/Factory.cc (modified) * code/branches/FICN/src/orxonox/core/Factory.h (modified) * code/branches/FICN/src/orxonox/core/Identifier.cc (modified) * code/branches/FICN/src/orxonox/core/Identifier.h (modified) * code/branches/FICN/src/orxonox/core/IdentifierList.cc (modified) * code/branches/FICN/src/orxonox/core/Iterator.h (modified) * code/branches/FICN/src/orxonox/core/MetaObjectList.h (modified) * code/branches/FICN/src/orxonox/core/ObjectList.h (modified) * code/branches/FICN/src/orxonox/core/OrxonoxClass.h (modified) * code/branches/FICN/src/orxonox/main.cc (modified) * code/branches/FICN/src/orxonox/objects/BaseObject.cc (modified) * code/branches/FICN/src/orxonox/objects/BaseObject.h (modified) * code/branches/FICN/src/orxonox/objects/CMakeLists.txt (modified) * code/branches/FICN/src/orxonox/objects/Test.h (modified) * code/branches/FICN/src/orxonox/objects/Tickable.h (modified) * code/branches/FICN/src/orxonox/objects/Timer.h (modified) * code/branches/FICN/src/orxonox/objects/test3.cc (modified) * code/branches/FICN/src/orxonox/objects/test3.h (modified) * code/branches/FICN/src/orxonox/orxonox.cc (modified) added files from objecthierarchy, changed includes Wed, 12 Dec 2007 19:19:40 GMT nicolape [482] * code/branches/FICN/src/network/CMakeLists.txt (modified) * code/branches/FICN/src/orxonox/CMakeLists.txt (modified) * code/branches/FICN/src/orxonox/objects/CMakeLists.txt (modified) * code/branches/FICN/src/orxonox/objects/test1.cc (modified) * code/branches/FICN/src/orxonox/orxonox.cc (modified) Added example implementation of world entity Wed, 12 Dec 2007 18: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 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 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 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: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 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: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: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 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: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, 26 Nov 2007 15:26:17 GMT landauf [258] * code/trunk/src/CMakeLists.txt (modified) * code/trunk/src/orxonox (copied) * code/trunk/src/orxonox/core (copied) * code/trunk/src/orxonox/core/ClassFactory.h (copied) * code/trunk/src/orxonox/core/Factory.cc (copied) * code/trunk/src/orxonox/core/Factory.h (copied) * code/trunk/src/orxonox/core/Identifier.cc (copied) * code/trunk/src/orxonox/core/Identifier.h (copied) * code/trunk/src/orxonox/core/IdentifierIncludes.h (copied) * code/trunk/src/orxonox/core/IdentifierList.cc (copied) * code/trunk/src/orxonox/core/IdentifierList.h (copied) * code/trunk/src/orxonox/core/Iterator.h (copied) * code/trunk/src/orxonox/core/MetaObjectList.cc (copied) * code/trunk/src/orxonox/core/MetaObjectList.h (copied) * code/trunk/src/orxonox/core/ObjectList.h (copied) * code/trunk/src/orxonox/core/OrxonoxClass.cc (copied) * code/trunk/src/orxonox/core/OrxonoxClass.h (copied) * code/trunk/src/orxonox/objects (copied) * code/trunk/src/orxonox/objects/BaseObject.cc (copied) * code/trunk/src/orxonox/objects/BaseObject.h (copied) * code/trunk/src/orxonox/objects/Test.h (copied) * code/trunk/src/orxonox/objects/test1.cc (copied) * code/trunk/src/orxonox/objects/test1.h (copied) * code/trunk/src/orxonox/objects/test2.cc (copied) * code/trunk/src/orxonox/objects/test2.h (copied) * code/trunk/src/orxonox/objects/test3.cc (copied) * code/trunk/src/orxonox/objects/test3.h (copied) * code/trunk/src/orxonox/orxonox.cc (moved) merged object-hierarchy back to trunk