re3-wiiu/src
Sergeanur 9fd91e6250 Merge remote-tracking branch 'origin/master' into miami
# Conflicts:
#	src/core/Collision.cpp
#	src/core/Streaming.cpp
#	src/core/config.h
#	src/core/main.cpp
#	src/core/re3.cpp
#	src/extras/custompipes.cpp
#	src/extras/custompipes_d3d9.cpp
#	src/extras/custompipes_gl.cpp
#	src/extras/shaders/Makefile
#	src/extras/shaders/colourfilterVC.frag
#	src/extras/shaders/colourfilterVC_fs_gl3.inc
#	src/modelinfo/ModelInfo.cpp
#	src/modelinfo/PedModelInfo.cpp
#	src/modelinfo/SimpleModelInfo.cpp
#	src/modelinfo/VehicleModelInfo.cpp
#	src/render/Renderer.cpp
#	src/rw/VisibilityPlugins.cpp
#	src/save/GenericGameStorage.cpp
2020-08-19 23:44:08 +03:00
..
animation new opcodes, buyable properties, minor fixes 2020-07-30 15:32:34 +03:00
audio Stats(except displaying), PlayerInfo, marker fix 2020-08-14 01:14:04 +03:00
control Merge remote-tracking branch 'origin/master' into miami 2020-08-19 23:44:08 +03:00
core Merge remote-tracking branch 'origin/master' into miami 2020-08-19 23:44:08 +03:00
entities small stuff 2020-08-19 21:58:00 +02:00
extras txd.img bug 2020-08-19 16:54:09 +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 neo pipelines; postfx fix 2020-08-19 16:10:22 +02:00
objects rem pobj assert 2020-08-09 01:30:57 +03:00
peds Merge branch 'master' into miami 2020-08-19 23:34:33 +03:00
render small stuff 2020-08-19 21:58:00 +02:00
rw txd.img bug 2020-08-19 16:54:09 +02:00
save Island loading cleanup and fix 2020-08-19 03:31:42 +03:00
skel Merge branch 'master' into miami 2020-08-19 23:34:33 +03:00
text 64-bit on Windows 2020-07-24 20:26:33 +03:00
vehicles small stuff 2020-08-19 21:58:00 +02:00
weapons Stats(except displaying), PlayerInfo, marker fix 2020-08-14 01:14:04 +03:00