Commit graph

4205 commits

Author SHA1 Message Date
Sergeanur
cc94419a72 Merge branch 'miami' into lcs
# Conflicts:
#	src/control/Script.cpp
#	src/control/Script4.cpp
#	src/render/Weather.cpp
#	src/render/Weather.h
#	src/vehicles/Automobile.cpp
2021-01-20 19:32:03 +02:00
Sergeanur
c7c7eff918 Get rid of bitfields in CPool
# Conflicts:
#	src/core/templates.h
2021-01-20 19:24:08 +02:00
Sergeanur
3b52b683e3 Sync matrix with master 2021-01-20 19:20:11 +02:00
withmorten
ba34d72183 free cam inversion fix 2021-01-20 13:59:17 +01:00
withmorten
8590457d41 free cam inversion fix 2021-01-20 13:57:03 +01:00
Sergeanur
9b820cc0b6 Fix CFont::PrintStringFromBottom 2021-01-20 14:23:03 +02:00
aap
2c1c5debca pc radar fix 2021-01-19 21:35:25 +01:00
aap
7e136a792f work on colourfilters 2021-01-19 20:42:16 +01:00
aap
8baae4c77f PSP rendering and shader cleanup 2021-01-19 11:38:51 +01:00
aap
c295981c5a fix handbrake 2021-01-19 09:06:43 +01:00
Nikolay Korolev
03cf1e7535 Merge remote-tracking branch 'upstream/miami' into miami 2021-01-19 00:00:12 +03:00
Nikolay Korolev
8b80a8803b fix 2021-01-18 23:59:54 +03:00
withmorten
776693235c fix 2021-01-18 20:10:13 +01:00
withmorten
b5c09965a9 some free cam fixes for controller 2021-01-18 20:10:13 +01:00
aap
d01deec11d wrong ifdef 2021-01-18 20:03:30 +01:00
withmorten
20dabf0b49 fix 2021-01-18 17:30:18 +01:00
withmorten
df4e22e3d0 some free cam fixes for controller 2021-01-18 17:25:31 +01:00
aap
7a730384ef
Merge pull request #962 from aap/lcs
initial work on vehicles
2021-01-18 14:11:55 +01:00
aap
a672860c40 initial work on vehicles 2021-01-18 10:59:19 +01:00
withmorten
78cf2ead38 sync milessdk with re3mss 2021-01-17 22:23:34 +01:00
withmorten
4babb11e2f sync milessdk with re3mss 2021-01-17 22:21:53 +01:00
aap
2b4b00b388
Merge pull request #960 from withmorten/miami
add the bad crack "features" behind SECUROM define
2021-01-17 20:06:25 +01:00
aap
913a001375 vehicle fixes 2021-01-17 10:00:41 +01:00
Fire-Head
777ef6b663 fix ida's sweet little lies 2021-01-17 06:16:49 +03:00
Fire-Head
f5164f3804 fix crash on exit 2021-01-17 03:13:21 +03:00
Fire_Head
6075bf3fc2
Merge pull request #959 from Fire-Head/lcs
Lcs Particle
2021-01-16 22:00:02 +03:00
Nikolay Korolev
72b25cd3a8 Merge remote-tracking branch 'upstream/miami' into miami 2021-01-16 20:04:41 +03:00
Nikolay Korolev
df98d04d79 fix 2021-01-16 20:04:17 +03:00
Sergeanur
eb5fdac918 Merge branch 'miami' into lcs
# Conflicts:
#	src/control/Script.h
2021-01-16 16:56:24 +02:00
Sergeanur
21a6ed247b Use of sized bool types for CFont 2021-01-16 16:06:11 +02:00
Nikolay Korolev
32ab01cd32 consistency fix 2021-01-16 13:42:04 +03:00
Nikolay Korolev
7ea77d8da4 more fix 2021-01-16 13:32:41 +03:00
Nikolay
193fb2a381
fix 2021-01-16 13:24:22 +03:00
Filip Gawin
405a75f26b Fixes for lcs conan 2021-01-16 01:53:21 +01:00
Filip Gawin
34942b5af3 Fixes for lcs conan 2021-01-16 01:51:48 +01:00
Filip Gawin
d2fac78413 Port debug messagess for audio cache 2021-01-16 01:42:16 +01:00
Filip Gawin
6bebde8279 Port debug messagess for audio cache 2021-01-16 01:38:18 +01:00
Fire-Head
481cebee7e Merge branch 'lcs' of github.com:Fire-Head/re3 into lcs 2021-01-16 01:13:01 +03:00
Fire-Head
96fdbac69a rem null checks 2021-01-16 01:12:27 +03:00
Fire-Head
068093aae0 Update librw 2021-01-15 19:20:44 +03:00
Fire-Head
d8f352ae7c Merge branch 'lcs' of github.com:Fire-Head/re3 into lcs 2021-01-15 19:17:52 +03:00
Fire_Head
21bb2ea063
Merge pull request #1 from GTAmodding/lcs
update
2021-01-15 19:15:24 +03:00
Fire-Head
efae5d6a69 Merge branch 'lcs' of github.com:Fire-Head/re3 into lcs 2021-01-15 19:13:56 +03:00
Fire-Head
8989b5ea39 Merge branch 'lcs' of https://github.com/GTAmodding/re3 into lcs 2021-01-15 19:13:05 +03:00
Sergeanur
4bd7bafd7c Merge branch 'miami' into lcs
# Conflicts:
#	.github/workflows/reLCS_msvc_amd64.yml
#	.github/workflows/reLCS_msvc_x86.yml
#	premake5.lua
#	src/control/Script2.cpp
#	src/control/Script8.cpp
2021-01-15 17:57:35 +02:00
Sergeanur
19749effce Fix Jumbo Sound reseting when walking 2021-01-15 17:54:21 +02:00
withmorten
d5ce8b1ea3 add the bad crack "features" behind SECUROM define 2021-01-14 23:16:42 +01:00
Filip Gawin
7541fa7cb7 Revert extra checks before autolinking 2021-01-14 22:26:36 +01:00
Filip Gawin
5acbf9ef59 fix 2021-01-14 22:20:40 +01:00
Filip Gawin
1082b13830 RE3_NO_AUTOLINK to CMAKE_NO_AUTOLINK 2021-01-14 22:15:36 +01:00