Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'miami' into lcs | Sergeanur | 2021-02-26 | 1 | -2/+6 |
|\ | | | | | | | | | | | | | | | | | | | | | # Conflicts: # README.md # premake5.lua # src/audio/MusicManager.cpp # src/core/main.cpp # src/core/re3.cpp # src/extras/postfx.cpp # src/render/Font.cpp | ||||
| * | nil -> false | withmorten | 2021-02-19 | 1 | -2/+2 |
| | | |||||
| * | add debug render groups | aap | 2021-02-18 | 1 | -0/+4 |
| | | |||||
* | | Merge remote-tracking branch 'origin/miami' into lcs | Sergeanur | 2021-02-16 | 1 | -8/+9 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # .github/workflows/reLCS_msvc_amd64.yml # .github/workflows/reLCS_msvc_x86.yml # README.md # gamefiles/TEXT/american.gxt # gamefiles/TEXT/french.gxt # gamefiles/TEXT/german.gxt # gamefiles/TEXT/italian.gxt # gamefiles/TEXT/spanish.gxt # premake5.lua # src/animation/AnimManager.cpp # src/animation/AnimationId.h # src/audio/MusicManager.cpp # src/audio/audio_enums.h # src/control/Script7.cpp # src/core/FileLoader.cpp # src/core/re3.cpp # src/extras/custompipes_d3d9.cpp # src/extras/custompipes_gl.cpp # src/extras/postfx.cpp # src/extras/shaders/colourfilterVC.frag # src/extras/shaders/colourfilterVC_PS.hlsl # src/extras/shaders/make_hlsl.cmd # src/extras/shaders/obj/colourfilterVC_PS.cso # src/extras/shaders/obj/colourfilterVC_PS.inc # src/extras/shaders/obj/colourfilterVC_frag.inc # src/peds/PedFight.cpp # src/render/Font.cpp # src/render/Hud.cpp # src/render/Particle.cpp # src/render/WaterCannon.cpp # src/skel/win/gtavc.ico # src/vehicles/Automobile.cpp # utils/gxt/american.txt # utils/gxt/french.txt # utils/gxt/german.txt # utils/gxt/italian.txt # utils/gxt/spanish.txt | ||||
| * | use macro for waterlevel z offset | withmorten | 2021-01-30 | 1 | -1/+1 |
| | | |||||
| * | waterlevel: use macro for 400.0f | withmorten | 2021-01-29 | 1 | -3/+3 |
| | | |||||
| * | fix shutdown | aap | 2021-01-29 | 1 | -0/+1 |
| | | |||||
| * | waterlevel fix fix | withmorten | 2021-01-29 | 1 | -2/+2 |
| | | |||||
| * | waterlevel fix | withmorten | 2021-01-29 | 1 | -2/+2 |
| | | |||||
* | | Merge remote-tracking branch 'origin/miami' into lcs | Sergeanur | 2021-01-13 | 1 | -34/+34 |
|\| | | | | | | | | | | | | | | | | | | | | | * origin/miami: more securom fixes move stuff back into class; securom comments More font fixes fix fix CreateInstance virtual overload order escalator fix ProcessWheel bug | ||||
| * | move stuff back into class; securom comments | withmorten | 2021-01-13 | 1 | -34/+34 |
| | | |||||
* | | Disable water creatures | Sergeanur | 2021-01-08 | 1 | -6/+7 |
|/ | |||||
* | Encode files to UTF-8 | Filip Gawin | 2021-01-01 | 1 | -2/+2 |
| | |||||
* | more tiny water sync | aap | 2020-12-16 | 1 | -4/+0 |
| | |||||
* | tiny water sync | aap | 2020-12-16 | 1 | -1/+1 |
| | |||||
* | sync WaterLevelInit with master, and other small fixes | withmorten | 2020-12-15 | 1 | -31/+341 |
| | |||||
* | couple of fixes and cleanup | aap | 2020-10-31 | 1 | -1/+1 |
| | |||||
* | WaterLevel (Beachtoys) | erorcun | 2020-10-24 | 1 | -13/+106 |
| | |||||
* | CWaterCreatures | majestic | 2020-10-11 | 1 | -6/+4 |
|\ | |||||
* | | CWaterCreatures | majestic | 2020-10-08 | 1 | -1/+1 |
|/ | |||||
* | VC replays | Nikolay Korolev | 2020-09-26 | 1 | -0/+8 |
| | |||||
* | Peds, Hud, CFO 1/2, fixes - including zone names | eray orçunus | 2020-07-22 | 1 | -11/+11 |
| | |||||
* | Merge remote-tracking branch 'origin/master' into miami | Sergeanur | 2020-06-03 | 1 | -0/+7 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/control/GameLogic.cpp # src/control/PathFind.cpp # src/control/RoadBlocks.cpp # src/control/Script.cpp # src/control/Script.h # src/core/Frontend.cpp # src/core/Frontend.h # src/core/MenuScreens.cpp # src/core/TempColModels.cpp # src/core/config.h # src/core/re3.cpp # src/modelinfo/SimpleModelInfo.cpp # src/modelinfo/VehicleModelInfo.cpp # src/modelinfo/VehicleModelInfo.h # src/render/Skidmarks.h # src/render/WaterLevel.cpp # src/save/GenericGameStorage.h # src/vehicles/Automobile.cpp # src/vehicles/Automobile.h # src/vehicles/DamageManager.cpp # src/vehicles/Vehicle.cpp # src/vehicles/Vehicle.h | ||||
| * | Add files via upload | rollschuh2282 | 2020-05-29 | 1 | -0/+7 |
| | | |||||
* | | rem unnecessary asserts | Fire-Head | 2020-05-28 | 1 | -5/+9 |
| | | |||||
* | | surfacetable included | Fire-Head | 2020-05-27 | 1 | -0/+1 |
| | | |||||
* | | fix SURFACE_SAND | Fire-Head | 2020-05-27 | 1 | -2/+2 |
| | | |||||
* | | seagulls, ships | Fire-Head | 2020-05-27 | 1 | -70/+345 |
| | | |||||
* | | VC Water | Fire-Head | 2020-05-27 | 1 | -582/+2002 |
| | | |||||
* | | Merge branch 'master' into miami | Sergeanur | 2020-05-12 | 1 | -1/+1 |
|\| | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/control/Garages.cpp # src/core/FileLoader.cpp # src/core/Streaming.cpp # src/core/Zones.cpp # src/core/Zones.h # src/render/Renderer.cpp # src/rw/VisibilityPlugins.cpp | ||||
| * | Fix linux warnings | Filip Gawin | 2020-05-12 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into miami | Sergeanur | 2020-05-08 | 1 | -0/+5 |
|\| | |||||
| * | Fix water UV on high FPS and inverted free camera | Sergeanur | 2020-05-08 | 1 | -0/+5 |
| | | |||||
* | | use water color and new water texture | aap | 2020-05-07 | 1 | -8/+5 |
| | | |||||
* | | waterlevel with offset (from Fire_Head) | aap | 2020-05-06 | 1 | -27/+49 |
|/ | |||||
* | Try to build with mingw | Filip Gawin | 2020-04-20 | 1 | -5/+5 |
| | |||||
* | Remove patches | Sergeanur | 2020-04-17 | 1 | -20/+1 |
| | |||||
* | rem refs | Fire-Head | 2020-04-17 | 1 | -2/+2 |
| | |||||
* | Cleanup | Filip Gawin | 2019-08-27 | 1 | -5/+5 |
| | |||||
* | More more more audio | Filip Gawin | 2019-08-27 | 1 | -5/+5 |
| | |||||
* | Cleanup | Filip Gawin | 2019-08-27 | 1 | -5/+5 |
| | |||||
* | More audio ped | Filip Gawin | 2019-08-27 | 1 | -6/+6 |
| | |||||
* | CParticleObject done, cDMAudio done | Fire-Head | 2019-08-15 | 1 | -3/+3 |
| | |||||
* | Merge branch 'master' into master | Fire_Head | 2019-07-24 | 1 | -13/+13 |
|\ | |||||
| * | update | Fire-Head | 2019-07-24 | 1 | -6/+6 |
| | | |||||
| * | shadows done | Fire-Head | 2019-07-24 | 1 | -7/+7 |
| | | |||||
* | | implemented cBuoyancy | aap | 2019-07-23 | 1 | -1/+1 |
| | | |||||
* | | couple of fixes | aap | 2019-07-20 | 1 | -3/+2 |
| | | |||||
* | | implemented col line rendering | aap | 2019-07-19 | 1 | -0/+1 |
|/ | |||||
* | fixfixfix | Fire-Head | 2019-07-11 | 1 | -25/+0 |
| | |||||
* | Merge branch 'master' of github.com:Fire-Head/re3 | Fire-Head | 2019-07-11 | 1 | -0/+24 |
|\ | | | | | | | | | | | # Conflicts: # src/render/WaterLevel.cpp # src/render/WaterLevel.h | ||||
| * | WaterLevel done | Fire-Head | 2019-07-11 | 1 | -2/+1247 |
| | | |||||
* | | waterupd | Fire-Head | 2019-07-11 | 1 | -0/+1 |
| | | |||||
* | | WaterLevel done | Fire-Head | 2019-07-11 | 1 | -2/+1252 |
|/ | |||||
* | implemented some higher level functions; added lots of stubs; switched top and bottom in CRect | aap | 2019-05-30 | 1 | -0/+5 |