Sergeanur
e38467ef3a
Merge remote-tracking branch 'origin/miami' into lcs
...
# 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
2021-02-16 18:08:19 +02:00
withmorten
5dfe396af3
use macro for waterlevel z offset
2021-01-30 20:13:25 +01:00
withmorten
990637bf52
waterlevel: use macro for 400.0f
2021-01-29 17:57:51 +01:00
aap
595a000f6a
fix shutdown
2021-01-29 13:43:50 +01:00
withmorten
8482180706
waterlevel fix fix
2021-01-29 01:20:20 +01:00
withmorten
2fc6b542bc
waterlevel fix
2021-01-29 01:18:32 +01:00
Sergeanur
94f25a429f
Merge remote-tracking branch 'origin/miami' into lcs
...
* 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
2021-01-13 02:08:13 +02:00
withmorten
232d990e6d
move stuff back into class; securom comments
2021-01-13 00:18:58 +01:00
Sergeanur
e9001207ea
Disable water creatures
2021-01-08 18:26:35 +02:00
Filip Gawin
55af046c92
Encode files to UTF-8
2021-01-01 21:07:39 +01:00
aap
78c7459b3a
more tiny water sync
2020-12-16 13:32:03 +01:00
aap
0d97a31ce9
tiny water sync
2020-12-16 13:25:45 +01:00
withmorten
ce9eafcd51
sync WaterLevelInit with master, and other small fixes
2020-12-15 21:55:04 +01:00
aap
ea5b86774d
couple of fixes and cleanup
2020-10-31 14:33:49 +01:00
erorcun
29a2d810a7
WaterLevel (Beachtoys)
2020-10-24 19:31:18 +03:00
majestic
e7ef45a606
CWaterCreatures
2020-10-10 17:49:54 -07:00
majestic
7861992fe6
CWaterCreatures
2020-10-08 05:59:08 -07:00
Nikolay Korolev
f7d5021ac5
VC replays
2020-09-26 21:10:23 +03:00
eray orçunus
f40f44b14e
Peds, Hud, CFO 1/2, fixes - including zone names
2020-07-22 15:19:22 +03:00
Sergeanur
509ca11d76
Merge remote-tracking branch 'origin/master' into miami
...
# 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
2020-06-03 01:24:08 +03:00
rollschuh2282
2d5f7d92e5
Add files via upload
2020-05-29 12:04:20 +02:00
Fire-Head
8280e04b23
rem unnecessary asserts
2020-05-28 02:40:23 +03:00
Fire-Head
fab2c8699c
surfacetable included
2020-05-28 00:36:52 +03:00
Fire-Head
98af5e4ddb
fix SURFACE_SAND
2020-05-28 00:28:36 +03:00
Fire-Head
895580c724
seagulls, ships
2020-05-28 00:15:37 +03:00
Fire-Head
63d0bdc863
VC Water
2020-05-27 21:50:01 +03:00
Sergeanur
7c2b9478d5
Merge branch 'master' into miami
...
# 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
2020-05-13 00:55:52 +03:00
Filip Gawin
c2ac6b3759
Fix linux warnings
2020-05-12 23:18:54 +02:00
Sergeanur
1ef8d61f36
Merge branch 'master' into miami
2020-05-08 17:49:19 +03:00
Sergeanur
e0b3418e65
Fix water UV on high FPS and inverted free camera
2020-05-08 14:34:21 +03:00
aap
dbbf390983
use water color and new water texture
2020-05-07 13:38:14 +02:00
aap
3931dc795f
waterlevel with offset (from Fire_Head)
2020-05-06 23:13:12 +02:00
Filip Gawin
370c4e48cd
Try to build with mingw
2020-04-20 18:18:46 +02:00
Sergeanur
599164006a
Remove patches
2020-04-17 16:31:11 +03:00
Fire-Head
a4922d5cb7
rem refs
2020-04-17 08:54:14 +03:00
Filip Gawin
01ac2929cd
Cleanup
2019-08-27 22:29:23 +02:00
Filip Gawin
2fabbc3b4c
More more more audio
2019-08-27 21:18:47 +02:00
Filip Gawin
458fc63f01
Cleanup
2019-08-27 21:14:28 +02:00
Filip Gawin
af5bd951ae
More audio ped
2019-08-27 21:13:17 +02:00
Fire-Head
6093d855b0
CParticleObject done, cDMAudio done
2019-08-15 04:43:00 +03:00
Fire_Head
b79f77634d
Merge branch 'master' into master
2019-07-24 20:59:16 +03:00
Fire-Head
0c0e564019
update
2019-07-24 20:30:09 +03:00
Fire-Head
b4ecb3e3da
shadows done
2019-07-24 19:55:43 +03:00
aap
ae69aaf5ce
implemented cBuoyancy
2019-07-23 22:55:23 +02:00
aap
60045ec6cd
couple of fixes
2019-07-20 14:39:38 +02:00
aap
0ad39c020c
implemented col line rendering
2019-07-19 13:58:19 +02:00
Fire-Head
d8dd649617
fixfixfix
2019-07-11 03:44:54 +03:00
Fire-Head
3225fe3b92
Merge branch 'master' of github.com:Fire-Head/re3
...
# Conflicts:
# src/render/WaterLevel.cpp
# src/render/WaterLevel.h
2019-07-11 03:40:15 +03:00
Fire-Head
565f36f4e3
waterupd
2019-07-11 03:39:20 +03:00
Fire-Head
aed8218ef1
WaterLevel done
2019-07-11 03:33:28 +03:00