Changeset 790 for code

Timestamp:

Feb 7, 2008, 5:01:44 PM (17 years ago)

Author:

nicolasc

Message:

merged FICN back into trunk
awaiting release.

Location:

code/trunk

Files:

• . (modified) (view diffs)
• CMakeLists.txt (modified) (view diffs)
• INSTALL (modified) (view diffs)
• Media/materials (copied) (copied from code/branches/FICN/Media/materials) (view diffs)
• Media/materials/scripts (copied) (copied from code/branches/FICN/Media/materials/scripts) (view diffs)
• Media/materials/scripts/Example.material (copied) (copied from code/branches/FICN/Media/materials/scripts/Example.material) (view diffs)
• Media/materials/scripts/Examples.compositor (copied) (copied from code/branches/FICN/Media/materials/scripts/Examples.compositor) (view diffs)
• Media/materials/scripts/Examples.program (copied) (copied from code/branches/FICN/Media/materials/scripts/Examples.program) (view diffs)
• Media/materials/scripts/Ogre.material (copied) (copied from code/branches/FICN/Media/materials/scripts/Ogre.material) (view diffs)
• Media/materials/scripts/Orxonox.material (copied) (copied from code/branches/FICN/Media/materials/scripts/Orxonox.material) (view diffs)
• Media/materials/scripts/OrxonoxSky.material (copied) (copied from code/branches/FICN/Media/materials/scripts/OrxonoxSky.material) (view diffs)
• Media/materials/scripts/PE_materials.material (copied) (copied from code/branches/FICN/Media/materials/scripts/PE_materials.material) (view diffs)
• Media/materials/scripts/assf.material (copied) (copied from code/branches/FICN/Media/materials/scripts/assf.material) (view diffs)
• Media/materials/scripts/assf5.material (copied) (copied from code/branches/FICN/Media/materials/scripts/assf5.material) (view diffs)
• Media/materials/scripts/ast.material (copied) (copied from code/branches/FICN/Media/materials/scripts/ast.material) (view diffs)
• Media/materials/scripts/drone.material (copied) (copied from code/branches/FICN/Media/materials/scripts/drone.material) (view diffs)
• Media/materials/scripts/hoover.material (copied) (copied from code/branches/FICN/Media/materials/scripts/hoover.material) (view diffs)
• Media/materials/scripts/spacecruiser.material (copied) (copied from code/branches/FICN/Media/materials/scripts/spacecruiser.material) (view diffs)
• Media/materials/scripts/starship.material (copied) (copied from code/branches/FICN/Media/materials/scripts/starship.material) (view diffs)
• Media/materials/textures (copied) (copied from code/branches/FICN/Media/materials/textures) (view diffs)
• Media/materials/textures/Dirt.jpg (copied) (copied from code/branches/FICN/Media/materials/textures/Dirt.jpg) (view diffs)
• Media/materials/textures/EnergyBackground.png (copied) (copied from code/branches/FICN/Media/materials/textures/EnergyBackground.png) (view diffs)
• Media/materials/textures/EnergyDistrBackground.png (copied) (copied from code/branches/FICN/Media/materials/textures/EnergyDistrBackground.png) (view diffs)
• Media/materials/textures/GreenSkin.jpg (copied) (copied from code/branches/FICN/Media/materials/textures/GreenSkin.jpg) (view diffs)
• Media/materials/textures/MapBackGround.png (copied) (copied from code/branches/FICN/Media/materials/textures/MapBackGround.png) (view diffs)
• Media/materials/textures/MyShip.png (copied) (copied from code/branches/FICN/Media/materials/textures/MyShip.png) (view diffs)
• Media/materials/textures/OrxonoxBlack.png (copied) (copied from code/branches/FICN/Media/materials/textures/OrxonoxBlack.png) (view diffs)
• Media/materials/textures/OrxonoxORANGE.png (copied) (copied from code/branches/FICN/Media/materials/textures/OrxonoxORANGE.png) (view diffs)
• Media/materials/textures/OrxonoxRED.png (copied) (copied from code/branches/FICN/Media/materials/textures/OrxonoxRED.png) (view diffs)
• Media/materials/textures/PrimalWeaponBackground.png (copied) (copied from code/branches/FICN/Media/materials/textures/PrimalWeaponBackground.png) (view diffs)
• Media/materials/textures/PrimarBackground.png (copied) (copied from code/branches/FICN/Media/materials/textures/PrimarBackground.png) (view diffs)
• Media/materials/textures/PrimarChoice.png (copied) (copied from code/branches/FICN/Media/materials/textures/PrimarChoice.png) (view diffs)
• Media/materials/textures/PrimarSample.png (copied) (copied from code/branches/FICN/Media/materials/textures/PrimarSample.png) (view diffs)
• Media/materials/textures/Racket.png (copied) (copied from code/branches/FICN/Media/materials/textures/Racket.png) (view diffs)
• Media/materials/textures/RacketBackground.png (copied) (copied from code/branches/FICN/Media/materials/textures/RacketBackground.png) (view diffs)
• Media/materials/textures/RacketGrid.png (copied) (copied from code/branches/FICN/Media/materials/textures/RacketGrid.png) (view diffs)
• Media/materials/textures/RedPoint.png (copied) (copied from code/branches/FICN/Media/materials/textures/RedPoint.png) (view diffs)
• Media/materials/textures/RustyBarrel.png (copied) (copied from code/branches/FICN/Media/materials/textures/RustyBarrel.png) (view diffs)
• Media/materials/textures/RustySteel.jpg (copied) (copied from code/branches/FICN/Media/materials/textures/RustySteel.jpg) (view diffs)
• Media/materials/textures/ShieldLeftBottom.png (copied) (copied from code/branches/FICN/Media/materials/textures/ShieldLeftBottom.png) (view diffs)
• Media/materials/textures/ShieldLeftTop.png (copied) (copied from code/branches/FICN/Media/materials/textures/ShieldLeftTop.png) (view diffs)
• Media/materials/textures/ShieldRightBottom.png (copied) (copied from code/branches/FICN/Media/materials/textures/ShieldRightBottom.png) (view diffs)
• Media/materials/textures/ShieldRightTop.png (copied) (copied from code/branches/FICN/Media/materials/textures/ShieldRightTop.png) (view diffs)
• Media/materials/textures/TargetBackground.png (copied) (copied from code/branches/FICN/Media/materials/textures/TargetBackground.png) (view diffs)
• Media/materials/textures/TimeBackground.png (copied) (copied from code/branches/FICN/Media/materials/textures/TimeBackground.png) (view diffs)
• Media/materials/textures/WeirdEye.png (copied) (copied from code/branches/FICN/Media/materials/textures/WeirdEye.png) (view diffs)
• Media/materials/textures/backGround.png (copied) (copied from code/branches/FICN/Media/materials/textures/backGround.png) (view diffs)
• Media/materials/textures/bigflame.png (copied) (copied from code/branches/FICN/Media/materials/textures/bigflame.png) (view diffs)
• Media/materials/textures/black.png (copied) (copied from code/branches/FICN/Media/materials/textures/black.png) (view diffs)
• Media/materials/textures/clock.png (copied) (copied from code/branches/FICN/Media/materials/textures/clock.png) (view diffs)
• Media/materials/textures/crosshair.png (copied) (copied from code/branches/FICN/Media/materials/textures/crosshair.png) (view diffs)
• Media/materials/textures/cursor.png (copied) (copied from code/branches/FICN/Media/materials/textures/cursor.png) (view diffs)
• Media/materials/textures/dirt01.jpg (copied) (copied from code/branches/FICN/Media/materials/textures/dirt01.jpg) (view diffs)
• Media/materials/textures/drone.png (copied) (copied from code/branches/FICN/Media/materials/textures/drone.png) (view diffs)
• Media/materials/textures/explosion.png (copied) (copied from code/branches/FICN/Media/materials/textures/explosion.png) (view diffs)
• Media/materials/textures/flare.png (copied) (copied from code/branches/FICN/Media/materials/textures/flare.png) (view diffs)
• Media/materials/textures/flaretrail.png (copied) (copied from code/branches/FICN/Media/materials/textures/flaretrail.png) (view diffs)
• Media/materials/textures/gun.png (copied) (copied from code/branches/FICN/Media/materials/textures/gun.png) (view diffs)
• Media/materials/textures/hoover_body.png (copied) (copied from code/branches/FICN/Media/materials/textures/hoover_body.png) (view diffs)
• Media/materials/textures/hoover_gear.png (copied) (copied from code/branches/FICN/Media/materials/textures/hoover_gear.png) (view diffs)
• Media/materials/textures/hoover_turbine.png (copied) (copied from code/branches/FICN/Media/materials/textures/hoover_turbine.png) (view diffs)
• Media/materials/textures/human_assf.jpg (copied) (copied from code/branches/FICN/Media/materials/textures/human_assf.jpg) (view diffs)
• Media/materials/textures/human_assf.png (copied) (copied from code/branches/FICN/Media/materials/textures/human_assf.png) (view diffs)
• Media/materials/textures/human_assf5.png (copied) (copied from code/branches/FICN/Media/materials/textures/human_assf5.png) (view diffs)
• Media/materials/textures/man.png (copied) (copied from code/branches/FICN/Media/materials/textures/man.png) (view diffs)
• Media/materials/textures/nskingr.jpg (copied) (copied from code/branches/FICN/Media/materials/textures/nskingr.jpg) (view diffs)
• Media/materials/textures/ogreborder.png (copied) (copied from code/branches/FICN/Media/materials/textures/ogreborder.png) (view diffs)
• Media/materials/textures/ogreborderUp.png (copied) (copied from code/branches/FICN/Media/materials/textures/ogreborderUp.png) (view diffs)
• Media/materials/textures/ogrebordercenter.png (copied) (copied from code/branches/FICN/Media/materials/textures/ogrebordercenter.png) (view diffs)
• Media/materials/textures/ogrelogo-small.jpg (copied) (copied from code/branches/FICN/Media/materials/textures/ogrelogo-small.jpg) (view diffs)
• Media/materials/textures/ogrelogo.png (copied) (copied from code/branches/FICN/Media/materials/textures/ogrelogo.png) (view diffs)
• Media/materials/textures/ring_flare.png (copied) (copied from code/branches/FICN/Media/materials/textures/ring_flare.png) (view diffs)
• Media/materials/textures/ring_flare2.png (copied) (copied from code/branches/FICN/Media/materials/textures/ring_flare2.png) (view diffs)
• Media/materials/textures/rock.png (copied) (copied from code/branches/FICN/Media/materials/textures/rock.png) (view diffs)
• Media/materials/textures/sample_loading.jpg (copied) (copied from code/branches/FICN/Media/materials/textures/sample_loading.jpg) (view diffs)
• Media/materials/textures/shot.png (copied) (copied from code/branches/FICN/Media/materials/textures/shot.png) (view diffs)
• Media/materials/textures/smoke.png (copied) (copied from code/branches/FICN/Media/materials/textures/smoke.png) (view diffs)
• Media/materials/textures/smokecolors.png (copied) (copied from code/branches/FICN/Media/materials/textures/smokecolors.png) (view diffs)
• Media/materials/textures/spacesruiser.png (copied) (copied from code/branches/FICN/Media/materials/textures/spacesruiser.png) (view diffs)
• Media/materials/textures/spheremap.png (copied) (copied from code/branches/FICN/Media/materials/textures/spheremap.png) (view diffs)
• Media/materials/textures/starship.png (copied) (copied from code/branches/FICN/Media/materials/textures/starship.png) (view diffs)
• Media/materials/textures/steelhead.png (copied) (copied from code/branches/FICN/Media/materials/textures/steelhead.png) (view diffs)
• Media/materials/textures/streak.png (copied) (copied from code/branches/FICN/Media/materials/textures/streak.png) (view diffs)
• Media/materials/textures/superegg.png (copied) (copied from code/branches/FICN/Media/materials/textures/superegg.png) (view diffs)
• Media/materials/textures/texmap2.jpg (copied) (copied from code/branches/FICN/Media/materials/textures/texmap2.jpg) (view diffs)
• Media/models (copied) (copied from code/branches/FICN/Media/models) (view diffs)
• Media/models/Barrel.mesh (copied) (copied from code/branches/FICN/Media/models/Barrel.mesh) (view diffs)
• Media/models/assf2.mesh (copied) (copied from code/branches/FICN/Media/models/assf2.mesh) (view diffs)
• Media/models/assf3.mesh (copied) (copied from code/branches/FICN/Media/models/assf3.mesh) (view diffs)
• Media/models/assf5.mesh (copied) (copied from code/branches/FICN/Media/models/assf5.mesh) (view diffs)
• Media/models/ast1.mesh (copied) (copied from code/branches/FICN/Media/models/ast1.mesh) (view diffs)
• Media/models/ast2.mesh (copied) (copied from code/branches/FICN/Media/models/ast2.mesh) (view diffs)
• Media/models/ast3.mesh (copied) (copied from code/branches/FICN/Media/models/ast3.mesh) (view diffs)
• Media/models/ast4.mesh (copied) (copied from code/branches/FICN/Media/models/ast4.mesh) (view diffs)
• Media/models/ast5.mesh (copied) (copied from code/branches/FICN/Media/models/ast5.mesh) (view diffs)
• Media/models/ast6.mesh (copied) (copied from code/branches/FICN/Media/models/ast6.mesh) (view diffs)
• Media/models/cube.mesh (copied) (copied from code/branches/FICN/Media/models/cube.mesh) (view diffs)
• Media/models/drone.mesh (copied) (copied from code/branches/FICN/Media/models/drone.mesh) (view diffs)
• Media/models/fish.mesh (copied) (copied from code/branches/FICN/Media/models/fish.mesh) (view diffs)
• Media/models/fish.skeleton (copied) (copied from code/branches/FICN/Media/models/fish.skeleton) (view diffs)
• Media/models/hoover_body.mesh (copied) (copied from code/branches/FICN/Media/models/hoover_body.mesh) (view diffs)
• Media/models/hoover_gear0.mesh (copied) (copied from code/branches/FICN/Media/models/hoover_gear0.mesh) (view diffs)
• Media/models/hoover_gear1.mesh (copied) (copied from code/branches/FICN/Media/models/hoover_gear1.mesh) (view diffs)
• Media/models/hoover_gear2.mesh (copied) (copied from code/branches/FICN/Media/models/hoover_gear2.mesh) (view diffs)
• Media/models/hoover_turbine.mesh (copied) (copied from code/branches/FICN/Media/models/hoover_turbine.mesh) (view diffs)
• Media/models/ogrehead.mesh (copied) (copied from code/branches/FICN/Media/models/ogrehead.mesh) (view diffs)
• Media/models/razor.mesh (copied) (copied from code/branches/FICN/Media/models/razor.mesh) (view diffs)
• Media/models/spacecruiser.mesh (copied) (copied from code/branches/FICN/Media/models/spacecruiser.mesh) (view diffs)
• Media/models/starship.mesh (copied) (copied from code/branches/FICN/Media/models/starship.mesh) (view diffs)
• Media/overlay (copied) (copied from code/branches/FICN/Media/overlay) (view diffs)
• Media/overlay/OrxonoxHUD1.2.overlay (copied) (copied from code/branches/FICN/Media/overlay/OrxonoxHUD1.2.overlay) (view diffs)
• Media/overlay/OrxonoxLoading.overlay (copied) (copied from code/branches/FICN/Media/overlay/OrxonoxLoading.overlay) (view diffs)
• Media/packs/cubemap.zip (copied) (copied from code/branches/FICN/Media/packs/cubemap.zip) (view diffs)
• Media/packs/skybox.zip (modified) (view diffs)
• Media/particle (copied) (copied from code/branches/FICN/Media/particle) (view diffs)
• Media/particle/Example-Water.particle (copied) (copied from code/branches/FICN/Media/particle/Example-Water.particle) (view diffs)
• Media/particle/Example.particle (copied) (copied from code/branches/FICN/Media/particle/Example.particle) (view diffs)
• Media/particle/emitted_emitter.particle (copied) (copied from code/branches/FICN/Media/particle/emitted_emitter.particle) (view diffs)
• Media/particle/engineglow.particle (copied) (copied from code/branches/FICN/Media/particle/engineglow.particle) (view diffs)
• Media/particle/rauch.particle (copied) (copied from code/branches/FICN/Media/particle/rauch.particle) (view diffs)
• Media/particle/schuss.particle (copied) (copied from code/branches/FICN/Media/particle/schuss.particle) (view diffs)
• Media/particle/smoke.particle (copied) (copied from code/branches/FICN/Media/particle/smoke.particle) (view diffs)
• Media/particle/strahl.particle (copied) (copied from code/branches/FICN/Media/particle/strahl.particle) (view diffs)
• Media/particle/strahl2.particle (copied) (copied from code/branches/FICN/Media/particle/strahl2.particle) (view diffs)
• Media/particle/treibwerk.particle (copied) (copied from code/branches/FICN/Media/particle/treibwerk.particle) (view diffs)
• bin (copied) (copied from code/branches/FICN/bin) (view diffs)
• bin/audio (copied) (copied from code/branches/FICN/bin/audio) (view diffs)
• bin/audio/ambient (copied) (copied from code/branches/FICN/bin/audio/ambient) (view diffs)
• bin/audio/ambient/allgorythm-lift_up.ogg (copied) (copied from code/branches/FICN/bin/audio/ambient/allgorythm-lift_up.ogg) (view diffs)
• bin/audio/ambient/allgorythm-resonance_blaster.ogg (copied) (copied from code/branches/FICN/bin/audio/ambient/allgorythm-resonance_blaster.ogg) (view diffs)
• bin/audio/ambient/luke_grey_-_hypermode.ogg (copied) (copied from code/branches/FICN/bin/audio/ambient/luke_grey_-_hypermode.ogg) (view diffs)
• bin/audio/ambient/task_horizon_-_menu1.ogg (copied) (copied from code/branches/FICN/bin/audio/ambient/task_horizon_-_menu1.ogg) (view diffs)
• bin/audio/ambient/tha_silent_partner_-_void.ogg (copied) (copied from code/branches/FICN/bin/audio/ambient/tha_silent_partner_-_void.ogg) (view diffs)
• bin/audio/sounds (copied) (copied from code/branches/FICN/bin/audio/sounds) (view diffs)
• bin/audio/sounds/.dolphinview (copied) (copied from code/branches/FICN/bin/audio/sounds/.dolphinview) (view diffs)
• bin/audio/sounds/laser1.wav (copied) (copied from code/branches/FICN/bin/audio/sounds/laser1.wav) (view diffs)
• bin/levels (copied) (copied from code/branches/FICN/bin/levels) (view diffs)
• bin/levels/sample.oxw (copied) (copied from code/branches/FICN/bin/levels/sample.oxw) (view diffs)
• bin/media.cfg (copied) (copied from code/branches/FICN/bin/media.cfg) (view diffs)
• bin/ogre.cfg-init (copied) (copied from code/branches/FICN/bin/ogre.cfg-init) (view diffs)
• bin/orxonox.bat (copied) (copied from code/branches/FICN/bin/orxonox.bat) (view diffs)
• bin/plugins.cfg-init (copied) (copied from code/branches/FICN/bin/plugins.cfg-init) (view diffs)
• bin/quake3settings.cfg (copied) (copied from code/branches/FICN/bin/quake3settings.cfg) (view diffs)
• bin/resources.cfg (copied) (copied from code/branches/FICN/bin/resources.cfg) (view diffs)
• bin/run-script (copied) (copied from code/branches/FICN/bin/run-script) (view diffs)
• bin/translation_german.lang (copied) (copied from code/branches/FICN/bin/translation_german.lang) (view diffs)
• cmake/FindALUT.cmake (copied) (copied from code/branches/FICN/cmake/FindALUT.cmake) (view diffs)
• cmake/FindBoost.cmake (copied) (copied from code/branches/FICN/cmake/FindBoost.cmake) (view diffs)
• cmake/FindCEGUI.cmake (modified) (view diffs)
• cmake/FindCEGUI_OGRE.cmake (modified) (view diffs)
• cmake/FindENet.cmake (copied) (copied from code/branches/FICN/cmake/FindENet.cmake) (view diffs)
• cmake/FindODE.cmake (copied) (copied from code/branches/FICN/cmake/FindODE.cmake) (view diffs)
• cmake/FindOGRE.cmake (modified) (view diffs)
• cmake/FindOIS.cmake (modified) (view diffs)
• cmake/FindOggVorbis.cmake (copied) (copied from code/branches/FICN/cmake/FindOggVorbis.cmake) (view diffs)
• cmake/FindOpenAL.cmake (copied) (copied from code/branches/FICN/cmake/FindOpenAL.cmake) (view diffs)
• cmake/FindZLIB.cmake (copied) (copied from code/branches/FICN/cmake/FindZLIB.cmake) (view diffs)
• cmakeclearcache (copied) (copied from code/branches/FICN/cmakeclearcache) (view diffs)
• run (copied) (copied from code/branches/FICN/run) (view diffs)
• src/CMakeLists.txt (modified) (view diffs)
• src/audio (copied) (copied from code/branches/FICN/src/audio) (view diffs)
• src/audio/AudioBuffer.cc (copied) (copied from code/branches/FICN/src/audio/AudioBuffer.cc) (view diffs)
• src/audio/AudioBuffer.h (copied) (copied from code/branches/FICN/src/audio/AudioBuffer.h) (view diffs)
• src/audio/AudioIncludes.h (copied) (copied from code/branches/FICN/src/audio/AudioIncludes.h) (view diffs)
• src/audio/AudioManager.cc (copied) (copied from code/branches/FICN/src/audio/AudioManager.cc) (view diffs)
• src/audio/AudioManager.h (copied) (copied from code/branches/FICN/src/audio/AudioManager.h) (view diffs)
• src/audio/AudioPrereqs.h (copied) (copied from code/branches/FICN/src/audio/AudioPrereqs.h) (view diffs)
• src/audio/AudioSource.cc (copied) (copied from code/branches/FICN/src/audio/AudioSource.cc) (view diffs)
• src/audio/AudioSource.h (copied) (copied from code/branches/FICN/src/audio/AudioSource.h) (view diffs)
• src/audio/AudioStream.cc (copied) (copied from code/branches/FICN/src/audio/AudioStream.cc) (view diffs)
• src/audio/AudioStream.h (copied) (copied from code/branches/FICN/src/audio/AudioStream.h) (view diffs)
• src/audio/CMakeLists.txt (copied) (copied from code/branches/FICN/src/audio/CMakeLists.txt) (view diffs)
• src/audio/_AudioObject.cc (copied) (copied from code/branches/FICN/src/audio/_AudioObject.cc) (view diffs)
• src/loader/CMakeLists.txt (copied) (copied from code/branches/FICN/src/loader/CMakeLists.txt) (view diffs)
• src/loader/LevelLoader.cc (modified) (view diffs)
• src/loader/LevelLoader.h (modified) (view diffs)
• src/loader/Light.cc (deleted)
• src/loader/Light.h (deleted)
• src/loader/LightManager.cc (deleted)
• src/loader/LightManager.h (deleted)
• src/loader/LoaderPrereqs.h (copied) (copied from code/branches/FICN/src/loader/LoaderPrereqs.h) (view diffs)
• src/network/CMakeLists.txt (copied) (copied from code/branches/FICN/src/network/CMakeLists.txt) (view diffs)
• src/network/Client.cc (copied) (copied from code/branches/FICN/src/network/Client.cc) (view diffs)
• src/network/Client.h (copied) (copied from code/branches/FICN/src/network/Client.h) (view diffs)
• src/network/ClientConnection.cc (copied) (copied from code/branches/FICN/src/network/ClientConnection.cc) (view diffs)
• src/network/ClientConnection.h (copied) (copied from code/branches/FICN/src/network/ClientConnection.h) (view diffs)
• src/network/ClientInformation.cc (copied) (copied from code/branches/FICN/src/network/ClientInformation.cc) (view diffs)
• src/network/ClientInformation.h (copied) (copied from code/branches/FICN/src/network/ClientInformation.h) (view diffs)
• src/network/ConnectionManager.cc (copied) (copied from code/branches/FICN/src/network/ConnectionManager.cc) (view diffs)
• src/network/ConnectionManager.h (copied) (copied from code/branches/FICN/src/network/ConnectionManager.h) (view diffs)
• src/network/GameStateClient.cc (copied) (copied from code/branches/FICN/src/network/GameStateClient.cc) (view diffs)
• src/network/GameStateClient.h (copied) (copied from code/branches/FICN/src/network/GameStateClient.h) (view diffs)
• src/network/GameStateManager.cc (copied) (copied from code/branches/FICN/src/network/GameStateManager.cc) (view diffs)
• src/network/GameStateManager.h (copied) (copied from code/branches/FICN/src/network/GameStateManager.h) (view diffs)
• src/network/Makefile.norm (copied) (copied from code/branches/FICN/src/network/Makefile.norm) (view diffs)
• src/network/Makefile.tardis (copied) (copied from code/branches/FICN/src/network/Makefile.tardis) (view diffs)
• src/network/Makefile.test (copied) (copied from code/branches/FICN/src/network/Makefile.test) (view diffs)
• src/network/NetworkFrameListener.h (copied) (copied from code/branches/FICN/src/network/NetworkFrameListener.h) (view diffs)
• src/network/NetworkPrereqs.h (copied) (copied from code/branches/FICN/src/network/NetworkPrereqs.h) (view diffs)
• src/network/PacketBuffer.cc (copied) (copied from code/branches/FICN/src/network/PacketBuffer.cc) (view diffs)
• src/network/PacketBuffer.h (copied) (copied from code/branches/FICN/src/network/PacketBuffer.h) (view diffs)
• src/network/PacketBufferTestExt.cc (copied) (copied from code/branches/FICN/src/network/PacketBufferTestExt.cc) (view diffs)
• src/network/PacketDecoder.cc (copied) (copied from code/branches/FICN/src/network/PacketDecoder.cc) (view diffs)
• src/network/PacketGenerator.cc (copied) (copied from code/branches/FICN/src/network/PacketGenerator.cc) (view diffs)
• src/network/PacketManager.h (copied) (copied from code/branches/FICN/src/network/PacketManager.h) (view diffs)
• src/network/PacketTypes.h (copied) (copied from code/branches/FICN/src/network/PacketTypes.h) (view diffs)
• src/network/Server.cc (copied) (copied from code/branches/FICN/src/network/Server.cc) (view diffs)
• src/network/Server.h (copied) (copied from code/branches/FICN/src/network/Server.h) (view diffs)
• src/network/Synchronisable.cc (copied) (copied from code/branches/FICN/src/network/Synchronisable.cc) (view diffs)
• src/network/Synchronisable.h (copied) (copied from code/branches/FICN/src/network/Synchronisable.h) (view diffs)
• src/network/TODO (copied) (copied from code/branches/FICN/src/network/TODO) (view diffs)
• src/network/dummyclient.cc (copied) (copied from code/branches/FICN/src/network/dummyclient.cc) (view diffs)
• src/network/dummyclient2.cc (copied) (copied from code/branches/FICN/src/network/dummyclient2.cc) (view diffs)
• src/network/dummyclient3.cc (copied) (copied from code/branches/FICN/src/network/dummyclient3.cc) (view diffs)
• src/network/dummyserver.cc (copied) (copied from code/branches/FICN/src/network/dummyserver.cc) (view diffs)
• src/network/dummyserver3.cc (copied) (copied from code/branches/FICN/src/network/dummyserver3.cc) (view diffs)
• src/orxonox/AIClass.h (copied) (copied from code/branches/FICN/src/orxonox/AIClass.h) (view diffs)
• src/orxonox/Arrival.h (copied) (copied from code/branches/FICN/src/orxonox/Arrival.h) (view diffs)
• src/orxonox/CMakeLists.txt (copied) (copied from code/branches/FICN/src/orxonox/CMakeLists.txt) (view diffs)
• src/orxonox/Flocking.h (copied) (copied from code/branches/FICN/src/orxonox/Flocking.h) (view diffs)
• src/orxonox/GraphicsEngine.cc (copied) (copied from code/branches/FICN/src/orxonox/GraphicsEngine.cc) (view diffs)
• src/orxonox/GraphicsEngine.h (copied) (copied from code/branches/FICN/src/orxonox/GraphicsEngine.h) (view diffs)
• src/orxonox/InputManager.cc (copied) (copied from code/branches/FICN/src/orxonox/InputManager.cc) (view diffs)
• src/orxonox/InputManager.h (copied) (copied from code/branches/FICN/src/orxonox/InputManager.h) (view diffs)
• src/orxonox/Main.cc (copied) (copied from code/branches/FICN/src/orxonox/Main.cc) (view diffs)
• src/orxonox/Orxonox.cc (copied) (copied from code/branches/FICN/src/orxonox/Orxonox.cc) (view diffs)
• src/orxonox/Orxonox.h (copied) (copied from code/branches/FICN/src/orxonox/Orxonox.h) (view diffs)
• src/orxonox/OrxonoxPlatform.h (copied) (copied from code/branches/FICN/src/orxonox/OrxonoxPlatform.h) (view diffs)
• src/orxonox/OrxonoxPrereqs.h (copied) (copied from code/branches/FICN/src/orxonox/OrxonoxPrereqs.h) (view diffs)
• src/orxonox/OrxonoxStableHeaders.h (copied) (copied from code/branches/FICN/src/orxonox/OrxonoxStableHeaders.h) (view diffs)
• src/orxonox/PrecompiledHeaderFiles.cc (copied) (copied from code/branches/FICN/src/orxonox/PrecompiledHeaderFiles.cc) (view diffs)
• src/orxonox/SpaceshipSteering.cc (copied) (copied from code/branches/FICN/src/orxonox/SpaceshipSteering.cc) (view diffs)
• src/orxonox/SpaceshipSteering.h (copied) (copied from code/branches/FICN/src/orxonox/SpaceshipSteering.h) (view diffs)
• src/orxonox/core/ArgReader.cc (copied) (copied from code/branches/FICN/src/orxonox/core/ArgReader.cc) (view diffs)
• src/orxonox/core/ArgReader.h (copied) (copied from code/branches/FICN/src/orxonox/core/ArgReader.h) (view diffs)
• src/orxonox/core/BaseObject.cc (copied) (copied from code/branches/FICN/src/orxonox/core/BaseObject.cc) (view diffs)
• src/orxonox/core/BaseObject.h (copied) (copied from code/branches/FICN/src/orxonox/core/BaseObject.h) (view diffs)
• src/orxonox/core/CMakeLists.txt (copied) (copied from code/branches/FICN/src/orxonox/core/CMakeLists.txt) (view diffs)
• src/orxonox/core/ClassFactory.h (modified) (view diffs)
• src/orxonox/core/ConfigValueContainer.cc (copied) (copied from code/branches/FICN/src/orxonox/core/ConfigValueContainer.cc) (view diffs)
• src/orxonox/core/ConfigValueContainer.h (copied) (copied from code/branches/FICN/src/orxonox/core/ConfigValueContainer.h) (view diffs)
• src/orxonox/core/CoreIncludes.h (copied) (copied from code/branches/FICN/src/orxonox/core/CoreIncludes.h) (view diffs)
• src/orxonox/core/CorePrereqs.h (copied) (copied from code/branches/FICN/src/orxonox/core/CorePrereqs.h) (view diffs)
• src/orxonox/core/Debug.h (copied) (copied from code/branches/FICN/src/orxonox/core/Debug.h) (view diffs)
• src/orxonox/core/DebugLevel.cc (copied) (copied from code/branches/FICN/src/orxonox/core/DebugLevel.cc) (view diffs)
• src/orxonox/core/DebugLevel.h (copied) (copied from code/branches/FICN/src/orxonox/core/DebugLevel.h) (view diffs)
• src/orxonox/core/Error.cc (copied) (copied from code/branches/FICN/src/orxonox/core/Error.cc) (view diffs)
• src/orxonox/core/Error.h (copied) (copied from code/branches/FICN/src/orxonox/core/Error.h) (view diffs)
• src/orxonox/core/Factory.cc (modified) (view diffs)
• src/orxonox/core/Factory.h (modified) (view diffs)
• src/orxonox/core/Identifier.cc (modified) (view diffs)
• src/orxonox/core/Identifier.h (modified) (view diffs)
• src/orxonox/core/IdentifierIncludes.h (deleted)
• src/orxonox/core/IdentifierList.cc (modified) (view diffs)
• src/orxonox/core/IdentifierList.h (modified) (view diffs)
• src/orxonox/core/Iterator.h (modified) (view diffs)
• src/orxonox/core/Language.cc (copied) (copied from code/branches/FICN/src/orxonox/core/Language.cc) (view diffs)
• src/orxonox/core/Language.h (copied) (copied from code/branches/FICN/src/orxonox/core/Language.h) (view diffs)
• src/orxonox/core/MetaObjectList.cc (modified) (view diffs)
• src/orxonox/core/MetaObjectList.h (modified) (view diffs)
• src/orxonox/core/ObjectList.h (modified) (view diffs)
• src/orxonox/core/OrxonoxClass.cc (modified) (view diffs)
• src/orxonox/core/OrxonoxClass.h (modified) (view diffs)
• src/orxonox/core/OutputHandler.cc (copied) (copied from code/branches/FICN/src/orxonox/core/OutputHandler.cc) (view diffs)
• src/orxonox/core/OutputHandler.h (copied) (copied from code/branches/FICN/src/orxonox/core/OutputHandler.h) (view diffs)
• src/orxonox/core/SignalHandler.cc (copied) (copied from code/branches/FICN/src/orxonox/core/SignalHandler.cc) (view diffs)
• src/orxonox/core/SignalHandler.h (copied) (copied from code/branches/FICN/src/orxonox/core/SignalHandler.h) (view diffs)
• src/orxonox/hud (copied) (copied from code/branches/FICN/src/orxonox/hud) (view diffs)
• src/orxonox/hud/HUD.cc (copied) (copied from code/branches/FICN/src/orxonox/hud/HUD.cc) (view diffs)
• src/orxonox/hud/HUD.h (copied) (copied from code/branches/FICN/src/orxonox/hud/HUD.h) (view diffs)
• src/orxonox/objects/Ambient.cc (copied) (copied from code/branches/FICN/src/orxonox/objects/Ambient.cc) (view diffs)
• src/orxonox/objects/Ambient.h (copied) (copied from code/branches/FICN/src/orxonox/objects/Ambient.h) (view diffs)
• src/orxonox/objects/BaseObject.cc (deleted)
• src/orxonox/objects/BaseObject.h (deleted)
• src/orxonox/objects/Camera.cc (copied) (copied from code/branches/FICN/src/orxonox/objects/Camera.cc) (view diffs)
• src/orxonox/objects/Camera.h (copied) (copied from code/branches/FICN/src/orxonox/objects/Camera.h) (view diffs)
• src/orxonox/objects/Explosion.cc (copied) (copied from code/branches/FICN/src/orxonox/objects/Explosion.cc) (view diffs)
• src/orxonox/objects/Explosion.h (copied) (copied from code/branches/FICN/src/orxonox/objects/Explosion.h) (view diffs)
• src/orxonox/objects/Fighter.cc (copied) (copied from code/branches/FICN/src/orxonox/objects/Fighter.cc) (view diffs)
• src/orxonox/objects/Fighter.h (copied) (copied from code/branches/FICN/src/orxonox/objects/Fighter.h) (view diffs)
• src/orxonox/objects/Model.cc (copied) (copied from code/branches/FICN/src/orxonox/objects/Model.cc) (view diffs)
• src/orxonox/objects/Model.h (copied) (copied from code/branches/FICN/src/orxonox/objects/Model.h) (view diffs)
• src/orxonox/objects/NPC.cc (copied) (copied from code/branches/FICN/src/orxonox/objects/NPC.cc) (view diffs)
• src/orxonox/objects/NPC.h (copied) (copied from code/branches/FICN/src/orxonox/objects/NPC.h) (view diffs)
• src/orxonox/objects/Projectile.cc (copied) (copied from code/branches/FICN/src/orxonox/objects/Projectile.cc) (view diffs)
• src/orxonox/objects/Projectile.h (copied) (copied from code/branches/FICN/src/orxonox/objects/Projectile.h) (view diffs)
• src/orxonox/objects/Skybox.cc (copied) (copied from code/branches/FICN/src/orxonox/objects/Skybox.cc) (view diffs)
• src/orxonox/objects/Skybox.h (copied) (copied from code/branches/FICN/src/orxonox/objects/Skybox.h) (view diffs)
• src/orxonox/objects/SpaceShip.cc (copied) (copied from code/branches/FICN/src/orxonox/objects/SpaceShip.cc) (view diffs)
• src/orxonox/objects/SpaceShip.h (copied) (copied from code/branches/FICN/src/orxonox/objects/SpaceShip.h) (view diffs)
• src/orxonox/objects/SpaceshipSteeringObject.cc (copied) (copied from code/branches/FICN/src/orxonox/objects/SpaceshipSteeringObject.cc) (view diffs)
• src/orxonox/objects/SpaceshipSteeringObject.h (copied) (copied from code/branches/FICN/src/orxonox/objects/SpaceshipSteeringObject.h) (view diffs)
• src/orxonox/objects/Test.h (modified) (view diffs)
• src/orxonox/objects/Tickable.h (copied) (copied from code/branches/FICN/src/orxonox/objects/Tickable.h) (view diffs)
• src/orxonox/objects/WorldEntity.cc (copied) (copied from code/branches/FICN/src/orxonox/objects/WorldEntity.cc) (view diffs)
• src/orxonox/objects/WorldEntity.h (copied) (copied from code/branches/FICN/src/orxonox/objects/WorldEntity.h) (view diffs)
• src/orxonox/objects/test1.cc (modified) (view diffs)
• src/orxonox/objects/test1.h (modified) (view diffs)
• src/orxonox/objects/test2.cc (modified) (view diffs)
• src/orxonox/objects/test2.h (modified) (view diffs)
• src/orxonox/objects/test3.cc (modified) (view diffs)
• src/orxonox/objects/test3.h (modified) (view diffs)
• src/orxonox/objects/weapon (copied) (copied from code/branches/FICN/src/orxonox/objects/weapon) (view diffs)
• src/orxonox/objects/weapon/AmmunitionDump.cc (copied) (copied from code/branches/FICN/src/orxonox/objects/weapon/AmmunitionDump.cc) (view diffs)
• src/orxonox/objects/weapon/AmmunitionDump.h (copied) (copied from code/branches/FICN/src/orxonox/objects/weapon/AmmunitionDump.h) (view diffs)
• src/orxonox/objects/weapon/BarrelGun.cc (copied) (copied from code/branches/FICN/src/orxonox/objects/weapon/BarrelGun.cc) (view diffs)
• src/orxonox/objects/weapon/BarrelGun.h (copied) (copied from code/branches/FICN/src/orxonox/objects/weapon/BarrelGun.h) (view diffs)
• src/orxonox/objects/weapon/BaseWeapon.cc (copied) (copied from code/branches/FICN/src/orxonox/objects/weapon/BaseWeapon.cc) (view diffs)
• src/orxonox/objects/weapon/BaseWeapon.h (copied) (copied from code/branches/FICN/src/orxonox/objects/weapon/BaseWeapon.h) (view diffs)
• src/orxonox/objects/weapon/Bullet.cc (copied) (copied from code/branches/FICN/src/orxonox/objects/weapon/Bullet.cc) (view diffs)
• src/orxonox/objects/weapon/Bullet.h (copied) (copied from code/branches/FICN/src/orxonox/objects/weapon/Bullet.h) (view diffs)
• src/orxonox/objects/weapon/BulletManager.cc (copied) (copied from code/branches/FICN/src/orxonox/objects/weapon/BulletManager.cc) (view diffs)
• src/orxonox/objects/weapon/BulletManager.h (copied) (copied from code/branches/FICN/src/orxonox/objects/weapon/BulletManager.h) (view diffs)
• src/orxonox/objects/weapon/WeaponStation.cc (copied) (copied from code/branches/FICN/src/orxonox/objects/weapon/WeaponStation.cc) (view diffs)
• src/orxonox/objects/weapon/WeaponStation.h (copied) (copied from code/branches/FICN/src/orxonox/objects/weapon/WeaponStation.h) (view diffs)
• src/orxonox/orxonox.cc (deleted)
• src/orxonox/particle (copied) (copied from code/branches/FICN/src/orxonox/particle) (view diffs)
• src/orxonox/particle/ParticleInterface.cc (copied) (copied from code/branches/FICN/src/orxonox/particle/ParticleInterface.cc) (view diffs)
• src/orxonox/particle/ParticleInterface.h (copied) (copied from code/branches/FICN/src/orxonox/particle/ParticleInterface.h) (view diffs)
• src/orxonox/tools (copied) (copied from code/branches/FICN/src/orxonox/tools) (view diffs)
• src/orxonox/tools/BillboardSet.cc (copied) (copied from code/branches/FICN/src/orxonox/tools/BillboardSet.cc) (view diffs)
• src/orxonox/tools/BillboardSet.h (copied) (copied from code/branches/FICN/src/orxonox/tools/BillboardSet.h) (view diffs)
• src/orxonox/tools/Light.cc (copied) (copied from code/branches/FICN/src/orxonox/tools/Light.cc) (view diffs)
• src/orxonox/tools/Light.h (copied) (copied from code/branches/FICN/src/orxonox/tools/Light.h) (view diffs)
• src/orxonox/tools/Mesh.cc (copied) (copied from code/branches/FICN/src/orxonox/tools/Mesh.cc) (view diffs)
• src/orxonox/tools/Mesh.h (copied) (copied from code/branches/FICN/src/orxonox/tools/Mesh.h) (view diffs)
• src/orxonox/tools/Timer.h (copied) (copied from code/branches/FICN/src/orxonox/tools/Timer.h) (view diffs)
• src/util (copied) (copied from code/branches/FICN/src/util) (view diffs)
• src/util/CMakeLists.txt (copied) (copied from code/branches/FICN/src/util/CMakeLists.txt) (view diffs)
• src/util/Convert.h (copied) (copied from code/branches/FICN/src/util/Convert.h) (view diffs)
• src/util/Math.h (copied) (copied from code/branches/FICN/src/util/Math.h) (view diffs)
• src/util/Sleep.h (copied) (copied from code/branches/FICN/src/util/Sleep.h) (view diffs)
• src/util/String2Number.h (copied) (copied from code/branches/FICN/src/util/String2Number.h) (view diffs)
• src/util/Tokenizer.h (copied) (copied from code/branches/FICN/src/util/Tokenizer.h) (view diffs)
• src/util/substring.cc (copied) (copied from code/branches/FICN/src/util/substring.cc) (view diffs)
• src/util/substring.h (copied) (copied from code/branches/FICN/src/util/substring.h) (view diffs)
• src/util/testing (copied) (copied from code/branches/FICN/src/util/testing) (view diffs)
• src/util/testing/CMakeLists.txt (copied) (copied from code/branches/FICN/src/util/testing/CMakeLists.txt) (view diffs)
• src/util/testing/TestConverter.cpp (copied) (copied from code/branches/FICN/src/util/testing/TestConverter.cpp) (view diffs)
• src/util/tinyxml (copied) (copied from code/branches/FICN/src/util/tinyxml) (view diffs)
• src/util/tinyxml/TinyXMLPrereqs.h (copied) (copied from code/branches/FICN/src/util/tinyxml/TinyXMLPrereqs.h) (view diffs)
• src/util/tinyxml/ticpp.cc (copied) (copied from code/branches/FICN/src/util/tinyxml/ticpp.cc) (view diffs)
• src/util/tinyxml/ticpp.h (copied) (copied from code/branches/FICN/src/util/tinyxml/ticpp.h) (view diffs)
• src/util/tinyxml/ticpprc.h (copied) (copied from code/branches/FICN/src/util/tinyxml/ticpprc.h) (view diffs)
• src/util/tinyxml/tinystr.cc (copied) (copied from code/branches/FICN/src/util/tinyxml/tinystr.cc) (view diffs)
• src/util/tinyxml/tinystr.h (copied) (copied from code/branches/FICN/src/util/tinyxml/tinystr.h) (view diffs)
• src/util/tinyxml/tinyxml.cc (copied) (copied from code/branches/FICN/src/util/tinyxml/tinyxml.cc) (view diffs)
• src/util/tinyxml/tinyxml.h (copied) (copied from code/branches/FICN/src/util/tinyxml/tinyxml.h) (view diffs)
• src/util/tinyxml/tinyxmlerror.cc (copied) (copied from code/branches/FICN/src/util/tinyxml/tinyxmlerror.cc) (view diffs)
• src/util/tinyxml/tinyxmlparser.cc (copied) (copied from code/branches/FICN/src/util/tinyxml/tinyxmlparser.cc) (view diffs)
• src/xml (deleted)
• visual_studio (copied) (copied from code/branches/FICN/visual_studio) (view diffs)
• visual_studio/audio_properties.vsprops (copied) (copied from code/branches/FICN/visual_studio/audio_properties.vsprops) (view diffs)
• visual_studio/base_properties.vsprops (copied) (copied from code/branches/FICN/visual_studio/base_properties.vsprops) (view diffs)
• visual_studio/base_properties_debug.vsprops (copied) (copied from code/branches/FICN/visual_studio/base_properties_debug.vsprops) (view diffs)
• visual_studio/base_properties_release.vsprops (copied) (copied from code/branches/FICN/visual_studio/base_properties_release.vsprops) (view diffs)
• visual_studio/base_properties_release_sse.vsprops (copied) (copied from code/branches/FICN/visual_studio/base_properties_release_sse.vsprops) (view diffs)
• visual_studio/base_properties_release_sse2.vsprops (copied) (copied from code/branches/FICN/visual_studio/base_properties_release_sse2.vsprops) (view diffs)
• visual_studio/core_properties.vsprops (copied) (copied from code/branches/FICN/visual_studio/core_properties.vsprops) (view diffs)
• visual_studio/directory_properties.vsprops (copied) (copied from code/branches/FICN/visual_studio/directory_properties.vsprops) (view diffs)
• visual_studio/loader_properties.vsprops (copied) (copied from code/branches/FICN/visual_studio/loader_properties.vsprops) (view diffs)
• visual_studio/network_properties.vsprops (copied) (copied from code/branches/FICN/visual_studio/network_properties.vsprops) (view diffs)
• visual_studio/orxonox_properties.vsprops (copied) (copied from code/branches/FICN/visual_studio/orxonox_properties.vsprops) (view diffs)
• visual_studio/orxonox_vc8.sln (copied) (copied from code/branches/FICN/visual_studio/orxonox_vc8.sln) (view diffs)
• visual_studio/orxonox_vc9.sln (copied) (copied from code/branches/FICN/visual_studio/orxonox_vc9.sln) (view diffs)
• visual_studio/util_properties.vsprops (copied) (copied from code/branches/FICN/visual_studio/util_properties.vsprops) (view diffs)
• visual_studio/vc8 (copied) (copied from code/branches/FICN/visual_studio/vc8) (view diffs)
• visual_studio/vc8/audio.vcproj (copied) (copied from code/branches/FICN/visual_studio/vc8/audio.vcproj) (view diffs)
• visual_studio/vc8/core.vcproj (copied) (copied from code/branches/FICN/visual_studio/vc8/core.vcproj) (view diffs)
• visual_studio/vc8/loader.vcproj (copied) (copied from code/branches/FICN/visual_studio/vc8/loader.vcproj) (view diffs)
• visual_studio/vc8/network.vcproj (copied) (copied from code/branches/FICN/visual_studio/vc8/network.vcproj) (view diffs)
• visual_studio/vc8/orxonox.vcproj (copied) (copied from code/branches/FICN/visual_studio/vc8/orxonox.vcproj) (view diffs)
• visual_studio/vc8/util.vcproj (copied) (copied from code/branches/FICN/visual_studio/vc8/util.vcproj) (view diffs)
• visual_studio/vc9 (copied) (copied from code/branches/FICN/visual_studio/vc9) (view diffs)
• visual_studio/vc9/audio.vcproj (copied) (copied from code/branches/FICN/visual_studio/vc9/audio.vcproj) (view diffs)
• visual_studio/vc9/core.vcproj (copied) (copied from code/branches/FICN/visual_studio/vc9/core.vcproj) (view diffs)
• visual_studio/vc9/loader.vcproj (copied) (copied from code/branches/FICN/visual_studio/vc9/loader.vcproj) (view diffs)
• visual_studio/vc9/network.vcproj (copied) (copied from code/branches/FICN/visual_studio/vc9/network.vcproj) (view diffs)
• visual_studio/vc9/orxonox.vcproj (copied) (copied from code/branches/FICN/visual_studio/vc9/orxonox.vcproj) (view diffs)
• visual_studio/vc9/util.vcproj (copied) (copied from code/branches/FICN/visual_studio/vc9/util.vcproj) (view diffs)