Commit Graph

26 Commits

Author SHA1 Message Date
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
Fire-Head
a644c4e9ce WaterLevel done 2019-07-11 03:22:01 +03:00
aap
188aab4196 implemented some higher level functions; added lots of stubs; switched top and bottom in CRect 2019-05-30 21:24:47 +02:00