This repository has been archived by the owner. It is now read-only.
Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Merge remote-tracking branch 'Fire-Head/master' into Standalone
# Conflicts: # src/render/Coronas.cpp
- Loading branch information
Showing
with
1,346 additions
and 1,395 deletions.
- +1 −1 src/animation/RpAnimBlend.cpp
- +1 −1 src/animation/RpAnimBlend.h
- +12 −12 src/audio/AudioManager.cpp
- +1 −1 src/audio/DMAudio.cpp
- +1 −1 src/audio/DMAudio.h
- +8 −8 src/audio/PoliceRadio.cpp
- +0 −1 src/control/CarAI.cpp
- +19 −19 src/control/CarCtrl.cpp
- +18 −18 src/control/CarCtrl.h
- +1 −1 src/control/GameLogic.cpp
- +5 −5 src/control/PathFind.cpp
- +3 −3 src/control/PathFind.h
- +6 −6 src/control/Phones.cpp
- +6 −6 src/control/Phones.h
- +8 −8 src/control/Pickups.cpp
- +5 −5 src/control/Pickups.h
- +14 −14 src/control/Record.cpp
- +15 −15 src/control/Record.h
- +65 −69 src/control/Replay.cpp
- +62 −62 src/control/Replay.h
- +16 −16 src/control/Restart.cpp
- +16 −16 src/control/Restart.h
- +3 −3 src/control/RoadBlocks.cpp
- +3 −3 src/control/RoadBlocks.h
- +41 −41 src/control/Script.cpp
- +40 −40 src/control/Script.h
- +1 −1 src/core/Accident.cpp
- +1 −1 src/core/Accident.h
- +1 −1 src/core/Cam.cpp
- +3 −3 src/core/Camera.cpp
- +3 −3 src/core/Camera.h
- +10 −10 src/core/Clock.cpp
- +9 −9 src/core/Clock.h
- +1 −1 src/core/ControllerConfig.cpp
- +1 −1 src/core/ControllerConfig.h
- +0 −1 src/core/EventList.cpp
- +2 −2 src/core/FileMgr.cpp
- +2 −2 src/core/FileMgr.h
- +1 −1 src/core/Fire.cpp
- +1 −1 src/core/Fire.h
- +1 −1 src/core/Frontend.cpp
- +13 −9 src/core/Game.cpp
- +8 −8 src/core/Game.h
- +2 −2 src/core/IniFile.cpp
- +12 −12 src/core/Pad.cpp
- +11 −11 src/core/Pad.h
- +9 −9 src/core/Pools.cpp
- +9 −9 src/core/Pools.h
- +22 −22 src/core/Radar.cpp
- +2 −2 src/core/References.cpp
- +2 −2 src/core/References.h
- +53 −53 src/core/Stats.cpp
- +53 −53 src/core/Stats.h
- +42 −42 src/core/Streaming.cpp
- +28 −28 src/core/Streaming.h
- +1 −1 src/core/SurfaceTable.cpp
- +1 −2 src/core/SurfaceTable.h
- +13 −13 src/core/TempColModels.cpp
- +13 −13 src/core/TempColModels.h
- +3 −3 src/core/TimeStep.cpp
- +3 −3 src/core/TimeStep.h
- +22 −28 src/core/Timer.cpp
- +10 −10 src/core/Timer.h
- +4 −4 src/core/User.cpp
- +4 −4 src/core/User.h
- +2 −2 src/core/Wanted.cpp
- +2 −2 src/core/Wanted.h
- +15 −15 src/core/ZoneCull.cpp
- +14 −14 src/core/ZoneCull.h
- +12 −12 src/core/Zones.cpp
- +11 −11 src/core/Zones.h
- +1 −0 src/core/config.h
- +6 −11 src/core/main.cpp
- +6 −10 src/core/main.h
- +1 −4 src/modelinfo/ModelInfo.cpp
- +1 −1 src/modelinfo/ModelInfo.h
- +8 −8 src/modelinfo/VehicleModelInfo.cpp
- +5 −5 src/modelinfo/VehicleModelInfo.h
- +2 −2 src/objects/Object.cpp
- +2 −2 src/objects/Object.h
- +4 −4 src/objects/ParticleObject.cpp
- +4 −4 src/objects/ParticleObject.h
- +2 −2 src/render/Credits.cpp
- +2 −2 src/render/Credits.h
- +8 −8 src/render/Draw.cpp
- +8 −8 src/render/Draw.h
- +5 −5 src/render/Font.cpp
- +6 −5 src/render/Font.h
- +39 −39 src/render/Hud.cpp
- +3 −3 src/render/MBlur.cpp
- +3 −3 src/render/MBlur.h
- +5 −10 src/render/Particle.cpp
- +1 −6 src/render/Particle.h
- +3 −3 src/render/PointLights.cpp
- +2 −2 src/render/PointLights.h
- +6 −6 src/render/RenderBuffer.cpp
- +6 −6 src/render/RenderBuffer.h
- +17 −29 src/render/Shadows.cpp
- +15 −15 src/render/Shadows.h
- +7 −7 src/render/Sprite.cpp
- +4 −4 src/render/Sprite.h
- +95 −95 src/render/Timecycle.cpp
- +92 −92 src/render/Timecycle.h
- +2 −2 src/render/WaterLevel.cpp
- +1 −1 src/render/WaterLevel.h
- +24 −24 src/render/Weather.cpp
- +25 −25 src/render/Weather.h
- +12 −12 src/rw/Lights.cpp
- +1 −1 src/rw/NodeName.cpp
- +2 −0 src/rw/RwHelper.cpp
- +2 −2 src/rw/TexRead.cpp
- +2 −2 src/rw/TxdStore.cpp
- +18 −18 src/rw/VisibilityPlugins.cpp
- +15 −15 src/save/GenericGameStorage.cpp
- +1 −1 src/save/PCSave.cpp
- +1 −2 src/skel/skeleton.cpp
- +1 −1 src/skel/skeleton.h
- +10 −16 src/skel/win/win.cpp
- +3 −3 src/skel/win/win.h
- +3 −3 src/text/Messages.cpp
- +1 −1 src/text/Text.cpp
- +1 −1 src/vehicles/Automobile.cpp
- +5 −5 src/vehicles/Boat.cpp
- +2 −2 src/vehicles/Floater.cpp
- +1 −1 src/vehicles/HandlingMgr.cpp
- +6 −6 src/vehicles/Heli.cpp
- +35 −35 src/vehicles/Plane.cpp
- +0 −2 src/weapons/ShotInfo.cpp
- +0 −1 src/weapons/WeaponInfo.cpp
There are no files selected for viewing
Oops, something went wrong.