| spring: develop 7f1ea0be | [ Diff ] [ Back to Repository ] | |||
| Author | Committer | Branch | Timestamp | Parent |
|---|---|---|---|---|
| hoijui | hoijui | develop | 2010-04-14 13:46:09 | develop 28a1d0ea |
| Changeset | Merge remote branch 'originSpring/master' into pureint Conflicts: AI/Wrappers/LegacyCpp/AIAICallback.cpp AI/Wrappers/JavaOO/CMakeLists.txt rts/ExternalAI/AICallback.cpp rts/ExternalAI/Interface/AISCommands.h rts/ExternalAI/SSkirmishAICallbackImpl.cpp |
|||
| mod - AI/Wrappers/Cpp/CMakeLists.txt | [ Diff ] [ File ] | |||
| mod - AI/Wrappers/JavaOO/CMakeLists.txt | [ Diff ] [ File ] | |||
| mod - AI/Wrappers/LegacyCpp/AIAICallback.cpp | [ Diff ] [ File ] | |||
| mod - AI/Wrappers/LegacyCpp/AIAICallback.h | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/AICallback.cpp | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/AICallback.h | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/IAICallback.h | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/Interface/AISCommands.h | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/SSkirmishAICallbackImpl.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/Game.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/SelectedUnitsAI.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/SelectedUnitsAI.h | [ Diff ] [ File ] | |||
| mod - rts/Rendering/DebugDrawerAI.cpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/DebugDrawerAI.h | [ Diff ] [ File ] | |||
| mod - rts/Rendering/Env/BaseTreeDrawer.cpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/Env/BaseTreeDrawer.h | [ Diff ] [ File ] | |||
| mod - rts/Rendering/FeatureDrawer.cpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/FeatureDrawer.h | [ Diff ] [ File ] | |||
| mod - rts/Rendering/GL/VertexArray.cpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/GL/VertexArray.h | [ Diff ] [ File ] | |||
| mod - rts/Rendering/GL/VertexArray.inl | [ Diff ] [ File ] | |||
| mod - rts/Rendering/GroundFlash.cpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/GroundFlash.h | [ Diff ] [ File ] | |||
| mod - rts/Rendering/Models/ModelDrawer.cpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/Models/ModelDrawer.hpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/Models/OBJParser.cpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/Models/WorldObjectModelRenderer.cpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/ProjectileDrawer.cpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/ProjectileDrawer.hpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/UnitDrawer.cpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/UnitDrawer.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Features/Feature.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Features/FeatureHandler.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Projectiles/ExplosionGenerator.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Projectiles/FireProjectile.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Projectiles/FireProjectile.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Projectiles/FlareProjectile.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Projectiles/FlareProjectile.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Projectiles/PieceProjectile.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Projectiles/PieceProjectile.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Projectiles/Projectile.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Projectiles/Projectile.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Projectiles/ProjectileHandler.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Projectiles/ProjectileHandler.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Projectiles/Unsynced/BitmapMuzzleFlame.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Projectiles/Unsynced/BitmapMuzzleFlame.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Projectiles/Unsynced/BubbleProjectile.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Projectiles/Unsynced/BubbleProjectile.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Projectiles/Unsynced/DirtProjectile.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Projectiles/Unsynced/DirtProjectile.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Projectiles/Unsynced/ExploSpikeProjectile.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Projectiles/Unsynced/ExploSpikeProjectile.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Projectiles/Unsynced/GenericParticleProjectile.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Projectiles/Unsynced/GenericParticleProjectile.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Projectiles/Unsynced/GeoSquareProjectile.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Projectiles/Unsynced/GeoSquareProjectile.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Projectiles/Unsynced/GeoThermSmokeProjectile.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Projectiles/Unsynced/GeoThermSmokeProjectile.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Projectiles/Unsynced/GfxProjectile.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Projectiles/Unsynced/GfxProjectile.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Projectiles/Unsynced/HeatCloudProjectile.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Projectiles/Unsynced/HeatCloudProjectile.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Projectiles/Unsynced/MuzzleFlame.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Projectiles/Unsynced/MuzzleFlame.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Projectiles/Unsynced/RepulseGfx.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Projectiles/Unsynced/RepulseGfx.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Projectiles/Unsynced/ShieldPartProjectile.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Projectiles/Unsynced/ShieldPartProjectile.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Projectiles/Unsynced/SimpleParticleSystem.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Projectiles/Unsynced/SimpleParticleSystem.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Projectiles/Unsynced/SmokeProjectile.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Projectiles/Unsynced/SmokeProjectile.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Projectiles/Unsynced/SmokeProjectile2.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Projectiles/Unsynced/SmokeProjectile2.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Projectiles/Unsynced/SmokeTrailProjectile.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Projectiles/Unsynced/SmokeTrailProjectile.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Projectiles/Unsynced/SpherePartProjectile.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Projectiles/Unsynced/SpherePartProjectile.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Projectiles/Unsynced/TracerProjectile.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Projectiles/Unsynced/TracerProjectile.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Projectiles/Unsynced/WakeProjectile.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Projectiles/Unsynced/WakeProjectile.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Projectiles/Unsynced/WreckProjectile.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Projectiles/Unsynced/WreckProjectile.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Projectiles/WeaponProjectiles/BeamLaserProjectile.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Projectiles/WeaponProjectiles/BeamLaserProjectile.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Projectiles/WeaponProjectiles/EmgProjectile.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Projectiles/WeaponProjectiles/EmgProjectile.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Projectiles/WeaponProjectiles/ExplosiveProjectile.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Projectiles/WeaponProjectiles/ExplosiveProjectile.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Projectiles/WeaponProjectiles/FireBallProjectile.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Projectiles/WeaponProjectiles/FireBallProjectile.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Projectiles/WeaponProjectiles/FlameProjectile.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Projectiles/WeaponProjectiles/FlameProjectile.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Projectiles/WeaponProjectiles/LargeBeamLaserProjectile.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Projectiles/WeaponProjectiles/LargeBeamLaserProjectile.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Projectiles/WeaponProjectiles/LaserProjectile.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Projectiles/WeaponProjectiles/LaserProjectile.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Projectiles/WeaponProjectiles/LightningProjectile.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Projectiles/WeaponProjectiles/LightningProjectile.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Projectiles/WeaponProjectiles/MissileProjectile.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Projectiles/WeaponProjectiles/MissileProjectile.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Projectiles/WeaponProjectiles/StarburstProjectile.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Projectiles/WeaponProjectiles/StarburstProjectile.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Projectiles/WeaponProjectiles/TorpedoProjectile.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Projectiles/WeaponProjectiles/TorpedoProjectile.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Projectiles/WeaponProjectiles/WeaponProjectile.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Projectiles/WeaponProjectiles/WeaponProjectile.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Units/UnitHandler.cpp | [ Diff ] [ File ] | |||
| add - rts/System/EventBatchHandler.cpp | [ Diff ] [ File ] | |||
| add - rts/System/EventBatchHandler.h | [ Diff ] [ File ] | |||
| mod - rts/System/EventClient.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/EventClient.h | [ Diff ] [ File ] | |||
| mod - rts/System/EventHandler.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/EventHandler.h | [ Diff ] [ File ] | |||
| mod - rts/System/LogOutput.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/Net/UDPConnection.cpp | [ Diff ] [ File ] | |||
| mod - rts/build/vstudio8/rts.vcproj | [ Diff ] [ File ] | |||
| mod - rts/lib/gml/gml.h | [ Diff ] [ File ] | |||
