re3-mirror/src
Sergeanur d7e764d519 Merge branch 'miami' into lcs
# Conflicts:
#	README.md
#	gamefiles/TEXT/american.gxt
#	gamefiles/TEXT/french.gxt
#	gamefiles/TEXT/german.gxt
#	gamefiles/TEXT/italian.gxt
#	gamefiles/TEXT/spanish.gxt
#	src/audio/AudioLogic.cpp
#	src/core/config.h
#	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-08-16 10:09:39 +03:00
..
animation tiny diff fixes 2021-07-11 03:26:21 +02:00
audio Merge branch 'miami' into lcs 2021-08-16 10:09:39 +03:00
buildings Pool fixes 2021-06-26 00:27:20 +03:00
collision Merge branch 'miami' into lcs 2021-08-11 09:36:58 +03:00
control small revision 2021-08-16 01:03:08 +03:00
core Merge branch 'miami' into lcs 2021-08-16 10:09:39 +03:00
entities lcs specific hack 2021-08-07 20:03:45 +03:00
extras merge 2021-08-08 13:38:21 +03:00
fakerw Merge branch 'miami' into lcs 2021-08-11 09:36:58 +03:00
leeds CVisibilityPlugins, CRenderer, some fixes 2021-07-29 19:59:34 +02:00
math work on CAutomobile 2021-08-16 00:19:09 +02:00
modelinfo Merge branch 'lcs' of github.com:GTAmodding/re3 into lcs 2021-08-16 00:25:14 +02:00
objects Merge branch 'miami' into lcs 2021-07-12 04:13:22 +03:00
peds Merge branch 'miami' into lcs 2021-08-16 10:09:39 +03:00
renderer Merge branch 'miami' into lcs 2021-08-11 09:36:58 +03:00
rw Merge remote-tracking branch 'aap/lcs' into lcs 2021-08-12 11:45:25 +03:00
save Merge branch 'miami' into lcs 2021-08-11 09:36:58 +03:00
skel Merge branch 'miami' into lcs 2021-08-16 10:09:39 +03:00
text Merge branch 'miami' into lcs 2021-02-26 11:07:32 +02:00
vehicles Merge branch 'miami' into lcs 2021-08-16 10:09:39 +03:00
weapons Merge branch 'miami' into lcs 2021-08-16 10:09:39 +03:00
CMakeLists.txt Merge branch 'miami' into lcs 2021-08-16 10:09:39 +03:00