summaryrefslogtreecommitdiffstats
path: root/src/render/WaterLevel.cpp (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'miami' into lcsSergeanur2021-06-301-20/+20
|\ | | | | | | | | | | | | # Conflicts: # src/control/CarCtrl.cpp # src/control/Script4.cpp # src/core/Frontend.cpp
| * rename clamp macro to Clamp to fix compilation with g++11 (and clamp2 for consistency sake)withmorten2021-06-281-20/+20
| |
| * fixSergeanur2021-06-241-1/+1
| |
| * Fix IsSphereVisible callsSergeanur2021-06-241-9/+9
| |
* | fixSergeanur2021-06-241-1/+1
| |
* | Fix IsSphereVisible callsSergeanur2021-06-241-9/+9
| |
* | Merge branch 'miami' into lcsSergeanur2021-02-261-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 -> falsewithmorten2021-02-191-2/+2
| |
| * add debug render groupsaap2021-02-181-0/+4
| |
* | Merge remote-tracking branch 'origin/miami' into lcsSergeanur2021-02-161-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 offsetwithmorten2021-01-301-1/+1
| |
| * waterlevel: use macro for 400.0fwithmorten2021-01-291-3/+3
| |
| * fix shutdownaap2021-01-291-0/+1
| |
| * waterlevel fix fixwithmorten2021-01-291-2/+2
| |
| * waterlevel fixwithmorten2021-01-291-2/+2
| |
* | Merge remote-tracking branch 'origin/miami' into lcsSergeanur2021-01-131-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 commentswithmorten2021-01-131-34/+34
| |
* | Disable water creaturesSergeanur2021-01-081-6/+7
|/
* Encode files to UTF-8Filip Gawin2021-01-011-2/+2
|
* more tiny water syncaap2020-12-161-4/+0
|
* tiny water syncaap2020-12-161-1/+1
|
* sync WaterLevelInit with master, and other small fixeswithmorten2020-12-151-31/+341
|
* couple of fixes and cleanupaap2020-10-311-1/+1
|
* WaterLevel (Beachtoys)erorcun2020-10-241-13/+106
|
* CWaterCreaturesmajestic2020-10-111-6/+4
|\
* | CWaterCreaturesmajestic2020-10-081-1/+1
|/
* VC replaysNikolay Korolev2020-09-261-0/+8
|
* Peds, Hud, CFO 1/2, fixes - including zone nameseray orçunus2020-07-221-11/+11
|
* Merge remote-tracking branch 'origin/master' into miamiSergeanur2020-06-031-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 uploadrollschuh22822020-05-291-0/+7
| |
* | rem unnecessary assertsFire-Head2020-05-281-5/+9
| |
* | surfacetable includedFire-Head2020-05-271-0/+1
| |
* | fix SURFACE_SANDFire-Head2020-05-271-2/+2
| |
* | seagulls, shipsFire-Head2020-05-271-70/+345
| |
* | VC WaterFire-Head2020-05-271-582/+2002
| |
* | Merge branch 'master' into miamiSergeanur2020-05-121-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 warningsFilip Gawin2020-05-121-1/+1
| |
* | Merge branch 'master' into miamiSergeanur2020-05-081-0/+5
|\|
| * Fix water UV on high FPS and inverted free cameraSergeanur2020-05-081-0/+5
| |
* | use water color and new water textureaap2020-05-071-8/+5
| |
* | waterlevel with offset (from Fire_Head)aap2020-05-061-27/+49
|/
* Try to build with mingwFilip Gawin2020-04-201-5/+5
|
* Remove patchesSergeanur2020-04-171-20/+1
|
* rem refsFire-Head2020-04-171-2/+2
|
* CleanupFilip Gawin2019-08-271-5/+5
|
* More more more audioFilip Gawin2019-08-271-5/+5
|
* CleanupFilip Gawin2019-08-271-5/+5
|
* More audio pedFilip Gawin2019-08-271-6/+6
|
* CParticleObject done, cDMAudio doneFire-Head2019-08-151-3/+3
|
* Merge branch 'master' into masterFire_Head2019-07-241-13/+13
|\
| * updateFire-Head2019-07-241-6/+6
| |
| * shadows doneFire-Head2019-07-241-7/+7
| |
* | implemented cBuoyancyaap2019-07-231-1/+1
| |
* | couple of fixesaap2019-07-201-3/+2
| |
* | implemented col line renderingaap2019-07-191-0/+1
|/
* fixfixfixFire-Head2019-07-111-25/+0
|
* Merge branch 'master' of github.com:Fire-Head/re3Fire-Head2019-07-111-0/+24
|\ | | | | | | | | | | # Conflicts: # src/render/WaterLevel.cpp # src/render/WaterLevel.h
| * WaterLevel doneFire-Head2019-07-111-2/+1247
| |
* | waterupdFire-Head2019-07-111-0/+1
| |
* | WaterLevel doneFire-Head2019-07-111-2/+1252
|/
* implemented some higher level functions; added lots of stubs; switched top and bottom in CRectaap2019-05-301-0/+5