Commit graph

5500 commits

Author SHA1 Message Date
withmorten
034df61f3c codewarrior: finishing touches 2021-01-21 19:42:51 +01:00
Sergeanur
ed74182cc2 Merge remote-tracking branch 'origin/miami' into lcs
# Conflicts:
#	vendor/librw
2021-01-21 16:03:27 +02:00
Nikolay Korolev
f0097ff733 fix 2021-01-21 16:09:58 +03:00
aap
24de9f92e8 enable screenshots for librw; update librw 2021-01-21 10:21:47 +01:00
aap
3c221d9466 update librw 2021-01-21 10:19:43 +01:00
aap
6df52f06b6 enable screenshots for librw 2021-01-21 10:19:01 +01:00
withmorten
f2596b3759 Merge remote-tracking branch 'upstream/master' into cw 2021-01-21 03:20:31 +01:00
withmorten
ac0f759b27 make building with Codewarrior 7 possible 2021-01-21 03:18:15 +01:00
Fire-Head
4ba19c9556 Merge branch 'lcs' of https://github.com/Fire-Head/re3 into lcs 2021-01-21 01:00:39 +03:00
Nikolay Korolev
8e825fa629 fixed saving 2021-01-20 22:16:11 +03:00
Nikolay Korolev
a5be17d941 Merge branch 'lcs-dev' into lcs 2021-01-20 21:15:03 +03:00
Nikolay Korolev
23831e38e6 sync 2021-01-20 21:14:12 +03:00
Nikolay Korolev
ad745aae63 some more script 2021-01-20 21:12:42 +03:00
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
Sergeanur
c54f5c4b4f
Merge pull request #971 from Sergeanur/PoolFlags
Get rid of bitfields in CPool
2021-01-20 18:59:49 +02:00
Sergeanur
9b193a47a2
Merge pull request #966 from Sergeanur/matrix
Get rid of RwMatrix in CMatrix
2021-01-20 18:59:33 +02:00
Sergeanur
95448eea3d More fonts 2021-01-20 18:40:54 +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
Nikolay Korolev
b4b4c996ba Merge branch 'lcs-dev' into lcs 2021-01-20 12:12:56 +03:00
Nikolay Korolev
b1454276ed Merge remote-tracking branch 'upstream/lcs' into lcs 2021-01-20 12:12:46 +03:00
Nikolay Korolev
aa0f77043c script fixes 2021-01-20 12:12:26 +03:00
aap
2c1c5debca pc radar fix 2021-01-19 21:35:25 +01:00
Nikolay Korolev
dac4dd560a saves 2021-01-19 23:34:37 +03:00
aap
505438cd90 Merge branch 'master' of github.com:GTAmodding/re3 2021-01-19 21:33:17 +01:00
aap
bb66028e74 pc radar fix 2021-01-19 21:33:09 +01:00
aap
7e136a792f work on colourfilters 2021-01-19 20:42:16 +01:00
Sergeanur
a9b8d30ce0 Get rid of bitfields in CPool 2021-01-19 21:32:55 +02:00
Sergeanur
e6ef164441 Get rid of VuVector 2021-01-19 18:38:10 +02:00
withmorten
25d3066eae fix RWLIBS build without GTA_PS2_STUFF 2021-01-19 12:05:38 +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
Sergeanur
3ebd08e38c Merge branch 'lcs' into lcsfont
* lcs:
  fix
  some free cam fixes for controller
  initial work on vehicles
2021-01-19 03:25:00 +02:00
Sergeanur
f38ff074c4 more font 2021-01-19 03:24:02 +02:00
Nikolay Korolev
c124bbe4bf Merge branch 'lcs-dev' into lcs 2021-01-19 02:38:28 +03:00
Nikolay Korolev
061fd25c61 fixes 2021-01-19 02:38:02 +03:00
Nikolay Korolev
923abb94d8 Merge branch 'lcs-dev' into lcs 2021-01-19 00:03:52 +03: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
Nikolay Korolev
ef59c623fd Merge remote-tracking branch 'upstream/master' 2021-01-18 23:59:16 +03:00
Nikolay Korolev
8c1f4ba65d fix 2021-01-18 23:59:07 +03:00
Nikolay Korolev
47c697feca fixes 2021-01-18 23:58:26 +03:00
Nikolay Korolev
177680216c fix 2021-01-18 22:30:18 +03:00
Nikolay Korolev
032a937b06 Merge branch 'lcs-dev' into lcs 2021-01-18 22:20:47 +03:00
Nikolay Korolev
4f36a1fb77 sync 2021-01-18 22:20:44 +03:00
Nikolay Korolev
14a1d3d251 Merge branch 'lcs' into lcs-dev 2021-01-18 22:20:27 +03:00
Nikolay Korolev
239dd55146 Merge remote-tracking branch 'upstream/lcs' into lcs 2021-01-18 22:19:50 +03:00