re3/src
Sergeanur 28dc67dc86 Merge branch 'master' into miami
# Conflicts:
#	src/core/Game.cpp
#	src/core/re3.cpp
#	src/extras/postfx.cpp
#	src/extras/postfx.h
#	src/extras/shaders/Makefile
#	src/render/Clouds.cpp
#	src/render/Hud.cpp
#	src/render/MBlur.cpp
#	src/render/Sprite2d.cpp
2020-08-14 13:52:10 +03:00
..
animation new opcodes, buyable properties, minor fixes 2020-07-30 15:32:34 +03:00
audio Merge remote-tracking branch 'origin/master' into miami 2020-08-10 19:15:51 +03:00
control timecycle done 2020-08-09 19:11:44 +02:00
core Merge branch 'master' into miami 2020-08-14 13:52:10 +03:00
entities NULL -> nil 2020-07-31 21:21:58 +03:00
extras extended postfx and sniper hud fix 2020-08-13 18:14:24 +02:00
fakerw synch fakerw with reVC; update librw 2020-07-29 09:50:06 +02:00
math Merge remote-tracking branch 'origin/master' into miami 2020-08-07 12:34:41 +03:00
modelinfo Small fixes for linux build 2020-07-25 22:04:59 +02:00
objects rem pobj assert 2020-08-09 01:30:57 +03:00
peds implemented extended postfx 2020-08-11 18:40:04 +02:00
render fixed clouds render 2020-08-14 09:28:17 +02:00
rw implemented extended postfx 2020-08-11 18:40:04 +02:00
save Merge branch 'master' into miami 2020-07-13 18:10:17 +03:00
skel Merge remote-tracking branch 'origin/master' into miami 2020-08-10 19:15:51 +03:00
text 64-bit on Windows 2020-07-24 20:26:33 +03:00
vehicles Merge pull request #670 from Fire-Head/miami 2020-08-07 10:18:35 +02:00
weapons Merge remote-tracking branch 'origin/master' into miami 2020-08-07 12:34:41 +03:00