a3x/re3
1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-11-06 05:45:55 +00:00
Code Issues Projects Releases Wiki Activity
4353 commits 4 branches 2 tags 50 MiB
Commit graph

4353 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nikolay Korolev 46ae5700ee a few fixes 2021-01-21 23:51:15 +03:00
Nikolay Korolev c8e715c33b Merge remote-tracking branch 'upstream/lcs' into lcs 2021-01-21 23:19:12 +03: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
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 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 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 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
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 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
Nikolay Korolev c09297997e script full 2021-01-18 22:19:30 +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
Sergeanur 8d2aa61f9b Merge branch 'lcs' into lcsfont 
# Conflicts:
#	src/render/Font.cpp
 2021-01-18 15:01:17 +02:00
Sergeanur 8395704dc6 Use of sized bool types for CFont 2021-01-18 14:55:48 +02:00
aap a672860c40 initial work on vehicles 2021-01-18 10:59:19 +01:00
Fire_Head b73aaa4899
Merge pull request #1 from GTAmodding/lcs 
update
 2021-01-18 01:16:28 +03: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