# # ChangeLog for code/branches/FICN/src/orxonox/hud # # Generated by Trac 1.0.9 # Jun 3, 2024, 5:18:20 AM Sun, 30 Dec 2007 20:48:52 GMT rgrieder [729] * 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/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/OrxonoxPlatform.h (modified) * code/branches/FICN/src/orxonox/OrxonoxPrereqs.h (modified) * code/branches/FICN/src/orxonox/SpaceshipSteering.h (modified) * code/branches/FICN/src/orxonox/core/CoreIncludes.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/Identifier.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/ObjectList.h (modified) * code/branches/FICN/src/orxonox/core/OrxonoxClass.h (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.h (modified) * code/branches/FICN/src/orxonox/objects/Camera.h (modified) * 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.h (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.h (modified) * code/branches/FICN/src/orxonox/objects/Projectile.h (modified) * 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) * code/branches/FICN/visual_studio/FICN.sln (modified) * code/branches/FICN/visual_studio/audio.vcproj (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) - fixed multiple template instantiation problem under windows - ... 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 ... 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: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 ... 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 ... 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 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 11:32:09 GMT rgrieder [609] * code/branches/FICN/src/orxonox/Flocking.h (modified) * code/branches/FICN/src/orxonox/graphicsEngine.h (modified) * code/branches/FICN/src/orxonox/hud/HUD.h (modified) * code/branches/FICN/src/orxonox/orxonox.cc (modified) * code/branches/FICN/src/orxonox/orxonox.h (modified) * code/branches/FICN/src/orxonox/particle/ParticleInterface.h (modified) - removed all the "using namespace Ogre" in the header files - ... Mon, 17 Dec 2007 17:38:36 GMT bknecht [588] * code/branches/FICN/Media/materials/scripts/Ogre.material (modified) * code/branches/FICN/Media/materials/scripts/Orxonox.material (modified) * code/branches/FICN/Media/materials/scripts/OrxonoxSky.material (added) * code/branches/FICN/Media/materials/textures/EnergyBackground.png (added) * code/branches/FICN/Media/materials/textures/EnergyDistrBackground.png (added) * code/branches/FICN/Media/materials/textures/MapBackGround.png (added) * code/branches/FICN/Media/materials/textures/MyShip.png (added) * code/branches/FICN/Media/materials/textures/OrxonoxBlack.png (added) * code/branches/FICN/Media/materials/textures/OrxonoxORANGE.png (added) * code/branches/FICN/Media/materials/textures/OrxonoxRED.png (added) * code/branches/FICN/Media/materials/textures/PrimalWeaponBackground.png (added) * code/branches/FICN/Media/materials/textures/PrimarBackground.png (added) * code/branches/FICN/Media/materials/textures/PrimarChoice.png (added) * code/branches/FICN/Media/materials/textures/PrimarSample.png (added) * code/branches/FICN/Media/materials/textures/Racket.png (added) * code/branches/FICN/Media/materials/textures/RacketBackground.png (added) * code/branches/FICN/Media/materials/textures/RacketGrid.png (added) * code/branches/FICN/Media/materials/textures/RedPoint.png (added) * code/branches/FICN/Media/materials/textures/ShieldLeftBottom.png (added) * code/branches/FICN/Media/materials/textures/ShieldLeftTop.png (added) * code/branches/FICN/Media/materials/textures/ShieldRightBottom.png (added) * code/branches/FICN/Media/materials/textures/ShieldRightTop.png (added) * code/branches/FICN/Media/materials/textures/TargetBackground.png (added) * code/branches/FICN/Media/materials/textures/TimeBackground.png (added) * code/branches/FICN/Media/materials/textures/backGround.png (added) * code/branches/FICN/Media/materials/textures/clock.png (added) * code/branches/FICN/Media/materials/textures/gun.png (added) * code/branches/FICN/Media/materials/textures/man.png (added) * code/branches/FICN/Media/materials/textures/shot.png (added) * code/branches/FICN/Media/materials/textures/superegg.png (added) * code/branches/FICN/Media/overlay/EnergyBackground.png (deleted) * code/branches/FICN/Media/overlay/EnergyDistrBackground.png (deleted) * code/branches/FICN/Media/overlay/MapBackGround.png (deleted) * code/branches/FICN/Media/overlay/MyShip.png (deleted) * code/branches/FICN/Media/overlay/OrxonoxBlack.png (deleted) * code/branches/FICN/Media/overlay/OrxonoxHUD.overlay (deleted) * code/branches/FICN/Media/overlay/OrxonoxHUD1.1.overlay (deleted) * code/branches/FICN/Media/overlay/OrxonoxHUD1.2.overlay (modified) * code/branches/FICN/Media/overlay/OrxonoxORANGE.png (deleted) * code/branches/FICN/Media/overlay/OrxonoxRED.png (deleted) * code/branches/FICN/Media/overlay/PrimalWeaponBackground.png (deleted) * code/branches/FICN/Media/overlay/PrimarBackground.png (deleted) * code/branches/FICN/Media/overlay/PrimarChoice.png (deleted) * code/branches/FICN/Media/overlay/PrimarSample.png (deleted) * code/branches/FICN/Media/overlay/Racket.png (deleted) * code/branches/FICN/Media/overlay/RacketBackground.png (deleted) * code/branches/FICN/Media/overlay/RacketBackground.pxi (deleted) * code/branches/FICN/Media/overlay/RacketGrid.png (deleted) * code/branches/FICN/Media/overlay/RedPoint.png (deleted) * code/branches/FICN/Media/overlay/ShildLeftBottom.png (deleted) * code/branches/FICN/Media/overlay/ShildLeftTop.png (deleted) * code/branches/FICN/Media/overlay/ShildRightBottom.png (deleted) * code/branches/FICN/Media/overlay/ShildRightTop.png (deleted) * code/branches/FICN/Media/overlay/TargetBackground.png (deleted) * code/branches/FICN/Media/overlay/TimeBackground.png (deleted) * code/branches/FICN/Media/overlay/backGround.png (deleted) * code/branches/FICN/Media/overlay/clock.png (deleted) * code/branches/FICN/Media/overlay/gun.png (deleted) * code/branches/FICN/Media/overlay/man.png (deleted) * code/branches/FICN/Media/overlay/shot.png (deleted) * code/branches/FICN/Media/overlay/superegg.png (deleted) * code/branches/FICN/bin/levels/sample.oxw (modified) * code/branches/FICN/src/orxonox/hud/HUD.cc (modified) * code/branches/FICN/src/orxonox/orxonox.cc (modified) * code/branches/FICN/src/orxonox/run_manager.cc (modified) * code/branches/FICN/src/orxonox/run_manager.h (modified) corrected strange behaviour Mon, 17 Dec 2007 17:24:56 GMT bknecht [587] * code/branches/FICN/src/orxonox/hud/CMakeLists.txt (modified) * code/branches/FICN/src/orxonox/hud/HUD.cc (added) * code/branches/FICN/src/orxonox/hud/HUD.h (added) added HUD 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 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 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: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.) ... Wed, 28 Nov 2007 20:54:59 GMT rgrieder [341] * code/branches/FICN/CMakeLists.txt (modified) * code/branches/FICN/src/CMakeLists.txt (modified) * code/branches/FICN/src/class_hierarchy (deleted) * code/branches/FICN/src/loader/CMakeLists.txt (modified) * code/branches/FICN/src/loader/LevelLoader.cc (modified) * code/branches/FICN/src/loader/LevelLoader.h (modified) * code/branches/FICN/src/loader/Light.cc (modified) * code/branches/FICN/src/loader/Light.h (modified) * code/branches/FICN/src/loader/LightManager.cc (modified) * code/branches/FICN/src/loader/LightManager.h (modified) * code/branches/FICN/src/network/CMakeLists.txt (modified) * code/branches/FICN/src/network/PacketDecoder.cc (modified) * code/branches/FICN/src/network/PacketGenerator.cc (modified) * code/branches/FICN/src/network/PacketManager.h (modified) * code/branches/FICN/src/network/dummyserver.cc (modified) * code/branches/FICN/src/orxonox/CMakeLists.txt (modified) * code/branches/FICN/src/orxonox/Flocking.h (deleted) * code/branches/FICN/src/orxonox/core/CMakeLists.txt (modified) * code/branches/FICN/src/orxonox/hud/CMakeLists.txt (modified) * code/branches/FICN/src/orxonox/hud/hud_overlay.h (modified) * code/branches/FICN/src/orxonox/hud/test_overlay.h (modified) * code/branches/FICN/src/orxonox/inertial_node.h (deleted) * code/branches/FICN/src/orxonox/objects/BaseObject.h (modified) * code/branches/FICN/src/orxonox/objects/CMakeFiles (deleted) * code/branches/FICN/src/orxonox/objects/CMakeLists.txt (modified) * code/branches/FICN/src/orxonox/ogre_control.h (deleted) * code/branches/FICN/src/orxonox/orxonox.cc (modified) * code/branches/FICN/src/orxonox/orxonox.h (deleted) * code/branches/FICN/src/orxonox/orxonox_prerequisites.h (deleted) * code/branches/FICN/src/orxonox/orxonox_scene.h (deleted) * code/branches/FICN/src/orxonox/orxonox_ship.h (deleted) * code/branches/FICN/src/orxonox/run_manager.h (deleted) * code/branches/FICN/src/orxonox/weapon/CMakeLists.txt (modified) * code/branches/FICN/src/orxonox/weapon/ammunition_dump.cc (modified) * code/branches/FICN/src/orxonox/weapon/ammunition_dump.h (modified) * code/branches/FICN/src/orxonox/weapon/barrel_gun.cc (modified) * code/branches/FICN/src/orxonox/weapon/barrel_gun.h (modified) * code/branches/FICN/src/orxonox/weapon/base_weapon.cc (modified) * code/branches/FICN/src/orxonox/weapon/base_weapon.h (modified) * code/branches/FICN/src/orxonox/weapon/bullet.h (modified) * code/branches/FICN/src/orxonox/weapon/bullet_manager.h (modified) * code/branches/FICN/src/orxonox/weapon/weapon_station.h (modified) - removed folder src/class_hierarchy - removed a few unnec. files in ... Wed, 28 Nov 2007 20:36:07 GMT nicolasc [340] * code/branches/FICN/src/inertial_node.cc (deleted) * code/branches/FICN/src/ogre_control.cc (deleted) * code/branches/FICN/src/orxonox/Flocking.h (moved) * code/branches/FICN/src/orxonox/hud/hud_overlay.h (modified) * code/branches/FICN/src/orxonox/hud/test_overlay.h (modified) * code/branches/FICN/src/orxonox/inertial_node.h (moved) * code/branches/FICN/src/orxonox/ogre_control.h (moved) * code/branches/FICN/src/orxonox/orxonox.cc (modified) * code/branches/FICN/src/orxonox/orxonox.h (moved) * code/branches/FICN/src/orxonox/orxonox_prerequisites.h (moved) * code/branches/FICN/src/orxonox/orxonox_scene.h (moved) * code/branches/FICN/src/orxonox/orxonox_ship.h (moved) * code/branches/FICN/src/orxonox/run_manager.h (moved) * code/branches/FICN/src/orxonox_scene.cc (deleted) * code/branches/FICN/src/orxonox_ship.cc (deleted) * code/branches/FICN/src/run_manager.cc (deleted) applied retos proposals Wed, 28 Nov 2007 17:13:04 GMT bknecht [337] * code/branches/FICN/CMakeLists.txt (modified) * code/branches/FICN/INSTALL (modified) * code/branches/FICN/Media/materials (copied) * code/branches/FICN/Media/materials/scripts (copied) * code/branches/FICN/Media/materials/scripts/Example.material (copied) * code/branches/FICN/Media/materials/scripts/Examples.compositor (copied) * code/branches/FICN/Media/materials/scripts/Examples.program (copied) * code/branches/FICN/Media/materials/scripts/Ogre.material (copied) * code/branches/FICN/Media/materials/textures (copied) * code/branches/FICN/Media/materials/textures/Dirt.jpg (copied) * code/branches/FICN/Media/materials/textures/GreenSkin.jpg (copied) * code/branches/FICN/Media/materials/textures/RustyBarrel.png (copied) * code/branches/FICN/Media/materials/textures/RustySteel.jpg (copied) * code/branches/FICN/Media/materials/textures/WeirdEye.png (copied) * code/branches/FICN/Media/materials/textures/cursor.png (copied) * code/branches/FICN/Media/materials/textures/dirt01.jpg (copied) * code/branches/FICN/Media/materials/textures/flare.png (copied) * code/branches/FICN/Media/materials/textures/nskingr.jpg (copied) * code/branches/FICN/Media/materials/textures/ogreborder.png (copied) * code/branches/FICN/Media/materials/textures/ogreborderUp.png (copied) * code/branches/FICN/Media/materials/textures/ogrebordercenter.png (copied) * code/branches/FICN/Media/materials/textures/ogrelogo-small.jpg (copied) * code/branches/FICN/Media/materials/textures/ogrelogo.png (copied) * code/branches/FICN/Media/materials/textures/smoke.png (copied) * code/branches/FICN/Media/materials/textures/smokecolors.png (copied) * code/branches/FICN/Media/materials/textures/spheremap.png (copied) * code/branches/FICN/Media/materials/textures/steelhead.png (copied) * code/branches/FICN/Media/models (copied) * code/branches/FICN/Media/models/Barrel.mesh (copied) * code/branches/FICN/Media/models/cube.mesh (copied) * code/branches/FICN/Media/models/fish.mesh (copied) * code/branches/FICN/Media/models/fish.skeleton (copied) * code/branches/FICN/Media/models/ogrehead.mesh (copied) * code/branches/FICN/Media/overlay (copied) * code/branches/FICN/Media/overlay/EnergyBackground.png (copied) * code/branches/FICN/Media/overlay/EnergyDistrBackground.png (copied) * code/branches/FICN/Media/overlay/MapBackGround.png (copied) * code/branches/FICN/Media/overlay/MyShip.png (copied) * code/branches/FICN/Media/overlay/OrxonoxBlack.png (copied) * code/branches/FICN/Media/overlay/OrxonoxHUD.overlay (copied) * code/branches/FICN/Media/overlay/OrxonoxHUD1.1.overlay (copied) * code/branches/FICN/Media/overlay/OrxonoxHUD1.2.overlay (copied) * code/branches/FICN/Media/overlay/OrxonoxORANGE.png (copied) * code/branches/FICN/Media/overlay/OrxonoxRED.png (copied) * code/branches/FICN/Media/overlay/PrimalWeaponBackground.png (copied) * code/branches/FICN/Media/overlay/PrimarBackground.png (copied) * code/branches/FICN/Media/overlay/PrimarChoice.png (copied) * code/branches/FICN/Media/overlay/PrimarSample.png (copied) * code/branches/FICN/Media/overlay/Racket.png (copied) * code/branches/FICN/Media/overlay/RacketBackground.png (copied) * code/branches/FICN/Media/overlay/RacketBackground.pxi (copied) * code/branches/FICN/Media/overlay/RacketGrid.png (copied) * code/branches/FICN/Media/overlay/RedPoint.png (copied) * code/branches/FICN/Media/overlay/ShildLeftBottom.png (copied) * code/branches/FICN/Media/overlay/ShildLeftTop.png (copied) * code/branches/FICN/Media/overlay/ShildRightBottom.png (copied) * code/branches/FICN/Media/overlay/ShildRightTop.png (copied) * code/branches/FICN/Media/overlay/TargetBackground.png (copied) * code/branches/FICN/Media/overlay/TimeBackground.png (copied) * code/branches/FICN/Media/overlay/backGround.png (copied) * code/branches/FICN/Media/overlay/clock.png (copied) * code/branches/FICN/Media/overlay/gun.png (copied) * code/branches/FICN/Media/overlay/man.png (copied) * code/branches/FICN/Media/overlay/shot.png (copied) * code/branches/FICN/Media/overlay/superegg.png (copied) * code/branches/FICN/Media/packs/cubemap.zip (copied) * code/branches/FICN/Media/particle (copied) * code/branches/FICN/Media/particle/Example-Water.particle (copied) * code/branches/FICN/Media/particle/Example.particle (copied) * code/branches/FICN/Media/particle/emitted_emitter.particle (copied) * code/branches/FICN/Media/particle/smoke.particle (copied) * code/branches/FICN/bin/CMakeCache.txt (copied) * code/branches/FICN/bin/resources.cfg (modified) * code/branches/FICN/cmake/FindBoost.cmake (copied) * code/branches/FICN/cmake/FindENet.cmake (copied) * code/branches/FICN/cmake/FindODE.cmake (copied) * code/branches/FICN/src/CMakeLists.txt (modified) * code/branches/FICN/src/Flocking.h (copied) * code/branches/FICN/src/class_hierarchy (copied) * code/branches/FICN/src/class_hierarchy/BaseObject.cc (copied) * code/branches/FICN/src/class_hierarchy/BaseObject.h (copied) * code/branches/FICN/src/class_hierarchy/CMakeLists.txt (copied) * code/branches/FICN/src/class_hierarchy/ClassHierarchy.cc (copied) * code/branches/FICN/src/class_hierarchy/ClassHierarchy.h (copied) * code/branches/FICN/src/class_hierarchy/Identifier.cc (copied) * code/branches/FICN/src/class_hierarchy/Identifier.h (copied) * code/branches/FICN/src/class_hierarchy/IdentifierIncludes.h (copied) * code/branches/FICN/src/class_hierarchy/IdentifierList.cc (copied) * code/branches/FICN/src/class_hierarchy/IdentifierList.h (copied) * code/branches/FICN/src/class_hierarchy/ObjectList.cc (copied) * code/branches/FICN/src/class_hierarchy/ObjectList.h (copied) * code/branches/FICN/src/class_hierarchy/OrxonoxClass.cc (copied) * code/branches/FICN/src/class_hierarchy/OrxonoxClass.h (copied) * code/branches/FICN/src/class_hierarchy/Test.h (copied) * code/branches/FICN/src/class_hierarchy/orxonox.cc (copied) * code/branches/FICN/src/class_hierarchy/test1.cc (copied) * code/branches/FICN/src/class_hierarchy/test1.h (copied) * code/branches/FICN/src/class_hierarchy/test2.cc (copied) * code/branches/FICN/src/class_hierarchy/test2.h (copied) * code/branches/FICN/src/class_hierarchy/test3.cc (copied) * code/branches/FICN/src/class_hierarchy/test3.h (copied) * code/branches/FICN/src/inertial_node.cc (copied) * code/branches/FICN/src/inertial_node.h (copied) * code/branches/FICN/src/loader/CMakeLists.txt (copied) * code/branches/FICN/src/network/CMakeLists.txt (copied) * code/branches/FICN/src/network/Client.cc (copied) * code/branches/FICN/src/network/Client.h (copied) * code/branches/FICN/src/network/ClientConnection.cc (copied) * code/branches/FICN/src/network/ClientConnection.h (copied) * code/branches/FICN/src/network/ConnectionManager.cc (copied) * code/branches/FICN/src/network/ConnectionManager.h (copied) * code/branches/FICN/src/network/GameStateManager.cc (copied) * code/branches/FICN/src/network/GameStateManager.h (copied) * code/branches/FICN/src/network/Makefile.norm (copied) * code/branches/FICN/src/network/Makefile.tardis (copied) * code/branches/FICN/src/network/PacketBuffer.cc (copied) * code/branches/FICN/src/network/PacketBuffer.h (copied) * code/branches/FICN/src/network/PacketBufferTest.cc (copied) * code/branches/FICN/src/network/PacketBufferTestExt.cc (copied) * code/branches/FICN/src/network/PacketDecoder.cc (copied) * code/branches/FICN/src/network/PacketGenerator.cc (copied) * code/branches/FICN/src/network/PacketManager.h (copied) * code/branches/FICN/src/network/Server.cc (copied) * code/branches/FICN/src/network/Server.h (copied) * code/branches/FICN/src/network/Synchronisable.cc (copied) * code/branches/FICN/src/network/Synchronisable.h (copied) * code/branches/FICN/src/network/dummyclient.cc (copied) * code/branches/FICN/src/network/dummyclient2.cc (copied) * code/branches/FICN/src/network/dummyserver.cc (copied) * code/branches/FICN/src/ogre_control.cc (copied) * code/branches/FICN/src/ogre_control.h (copied) * code/branches/FICN/src/orxonox.h (copied) * code/branches/FICN/src/orxonox/CMakeLists.txt (copied) * code/branches/FICN/src/orxonox/core/CMakeLists.txt (copied) * code/branches/FICN/src/orxonox/core/Iterator.h (modified) * code/branches/FICN/src/orxonox/hud (copied) * code/branches/FICN/src/orxonox/hud/CMakeLists.txt (copied) * code/branches/FICN/src/orxonox/hud/hud_overlay.cc (copied) * code/branches/FICN/src/orxonox/hud/hud_overlay.h (copied) * code/branches/FICN/src/orxonox/hud/test_overlay.cc (copied) * code/branches/FICN/src/orxonox/hud/test_overlay.h (copied) * code/branches/FICN/src/orxonox/objects/CMakeFiles (copied) * code/branches/FICN/src/orxonox/objects/CMakeLists.txt (copied) * code/branches/FICN/src/orxonox/orxonox.cc (modified) * code/branches/FICN/src/orxonox/spaceship_steering.cc (copied) * code/branches/FICN/src/orxonox/spaceship_steering.h (copied) * code/branches/FICN/src/orxonox/weapon (copied) * code/branches/FICN/src/orxonox/weapon/CMakeLists.txt (copied) * code/branches/FICN/src/orxonox/weapon/ammunition_dump.cc (copied) * code/branches/FICN/src/orxonox/weapon/ammunition_dump.h (copied) * code/branches/FICN/src/orxonox/weapon/barrel_gun.cc (copied) * code/branches/FICN/src/orxonox/weapon/barrel_gun.h (copied) * code/branches/FICN/src/orxonox/weapon/base_weapon.cc (copied) * code/branches/FICN/src/orxonox/weapon/base_weapon.h (copied) * code/branches/FICN/src/orxonox/weapon/bullet.cc (copied) * code/branches/FICN/src/orxonox/weapon/bullet.h (copied) * code/branches/FICN/src/orxonox/weapon/bullet_manager.cc (copied) * code/branches/FICN/src/orxonox/weapon/bullet_manager.h (copied) * code/branches/FICN/src/orxonox/weapon/weapon_station.cc (copied) * code/branches/FICN/src/orxonox/weapon/weapon_station.h (copied) * code/branches/FICN/src/orxonox_prerequisites.h (copied) * code/branches/FICN/src/orxonox_scene.cc (copied) * code/branches/FICN/src/orxonox_scene.h (copied) * code/branches/FICN/src/orxonox_ship.cc (copied) * code/branches/FICN/src/orxonox_ship.h (copied) * code/branches/FICN/src/run_manager.cc (copied) * code/branches/FICN/src/run_manager.h (copied) merged merger to FICN branch Wed, 28 Nov 2007 14:10:28 GMT nicolasc [319] * code/branches/merger/bin/resources.cfg (modified) * code/branches/merger/src/CMakeLists.txt (modified) * code/branches/merger/src/loader/CMakeLists.txt (modified) * code/branches/merger/src/network/CMakeLists.txt (modified) * code/branches/merger/src/orxonox/CMakeLists.txt (modified) * code/branches/merger/src/orxonox/core/CMakeLists.txt (modified) * code/branches/merger/src/orxonox/hud/CMakeLists.txt (added) * code/branches/merger/src/orxonox/objects/CMakeLists.txt (modified) * code/branches/merger/src/spaceship_steering.cc (copied) * code/branches/merger/src/spaceship_steering.h (copied) initial merge of steering