Sergeanur
|
cea6b20c09
|
Merge remote-tracking branch 'origin/miami' into lcs
# Conflicts:
# src/animation/CutsceneMgr.cpp
# src/control/CarCtrl.cpp
# src/control/Script.cpp
# src/control/Script2.cpp
# src/core/Frontend.cpp
# src/core/main.cpp
# src/entities/Physical.cpp
# src/peds/Ped.cpp
# src/peds/PedAI.cpp
# src/text/Messages.cpp
# src/vehicles/Cranes.cpp
# src/vehicles/Transmission.cpp
|
2021-01-22 15:04:09 +02:00 |
|
withmorten
|
feb993e751
|
get rid of most --MIAMI comments
|
2021-01-22 11:43:29 +01:00 |
|
Sergeanur
|
8dab92d158
|
CMessages::GetTokenPadKeyString
|
2021-01-22 05:49:17 +02:00 |
|
Sergeanur
|
b5deee823c
|
Load LCS radar blips
|
2021-01-22 04:00:17 +02:00 |
|
Sergeanur
|
7091ab5e75
|
Fix save/load and brief menus
|
2021-01-22 02:44:32 +02:00 |
|
Sergeanur
|
e6d9a0d1ad
|
Get rid of outro screen
|
2021-01-22 02:19:02 +02:00 |
|
aap
|
c8236d0dd2
|
Merge pull request #976 from Fire-Head/lcs
Lcs pobj
|
2021-01-22 01:12:03 +01:00 |
|
Fire_Head
|
6bdf005171
|
Update ParticleObject.h
|
2021-01-22 03:10:19 +03:00 |
|
aap
|
ce77e80414
|
Merge pull request #963 from Nick007J/lcs
all LCS script commands
|
2021-01-22 00:59:20 +01:00 |
|
aap
|
de10f0dda6
|
Merge pull request #975 from aap/lcs
loadscreens, not accurate
|
2021-01-22 00:59:13 +01:00 |
|
Fire-Head
|
37b9ba5bd7
|
lcs pobj
|
2021-01-22 02:59:08 +03:00 |
|
aap
|
035d655e47
|
Merge pull request #972 from Sergeanur/lcsfont
Partial CFont
|
2021-01-22 00:59:07 +01:00 |
|
Sergeanur
|
06d8860d42
|
Merge remote-tracking branch 'origin/miami' into lcs
* origin/miami:
fuck
bletch
fixed anisotropic filtering; updated librw
fix
|
2021-01-22 01:58:38 +02:00 |
|
Sergeanur
|
9d2509ab5b
|
A bit of frontend and GXT
|
2021-01-22 01:56:47 +02:00 |
|
aap
|
f7ab5cb7c4
|
loadscreens, not accurate
|
2021-01-22 00:41:34 +01:00 |
|
aap
|
8520bbd2c7
|
higher wheel LOD dist
|
2021-01-22 00:40:46 +01:00 |
|
withmorten
|
d1317f8fa6
|
m_nWantedLevel -> GetWantedLevel()
|
2021-01-22 00:20:51 +01:00 |
|
aap
|
1999427225
|
fuck
|
2021-01-21 22:26:44 +01:00 |
|
aap
|
94ff966994
|
bletch
|
2021-01-21 22:25:14 +01:00 |
|
aap
|
e99589a3eb
|
fixed anisotropic filtering; updated librw
|
2021-01-21 22:17:35 +01:00 |
|
Nikolay Korolev
|
50cde66067
|
fix
|
2021-01-22 00:14:30 +03:00 |
|
Sergeanur
|
e8db0e3abb
|
Merge branch 'lcs' into lcsfont
* lcs:
fix
enable screenshots for librw; update librw
Get rid of bitfields in CPool
Sync matrix with master
free cam inversion fix
free cam inversion fix
Fix CFont::PrintStringFromBottom
pc radar fix
work on colourfilters
PSP rendering and shader cleanup
fix handbrake
fix
wrong ifdef
fix
some free cam fixes for controller
sync milessdk with re3mss
vehicle fixes
fix
add the bad crack "features" behind SECUROM define
# Conflicts:
# src/render/Font.cpp
|
2021-01-21 23:11:36 +02:00 |
|
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 |
|
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
|
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 |
|
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 |
|
Nikolay Korolev
|
5e1113d884
|
fix attempt
|
2021-01-17 18:46:49 +03:00 |
|
Nikolay Korolev
|
9001a64ef9
|
Merge branch 'lcs' into lcs-dev
|
2021-01-17 16:02:56 +03:00 |
|
Nikolay Korolev
|
186441e7f5
|
Merge remote-tracking branch 'upstream/lcs' into lcs
|
2021-01-17 16:02:38 +03:00 |
|
Nikolay Korolev
|
e5af1edcb9
|
script until 1497
|
2021-01-17 16:02:19 +03: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
|
e99cd8052c
|
sync
|
2021-01-16 20:06:55 +03:00 |
|
Nikolay Korolev
|
d25420a33b
|
fix
|
2021-01-16 20:06:10 +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 |
|
Nikolay Korolev
|
9a7442c2fd
|
script7
|
2021-01-16 20:02:41 +03:00 |
|
Nikolay Korolev
|
ef97134f50
|
sync
|
2021-01-16 18:17:42 +03:00 |
|
Nikolay Korolev
|
c28ed42617
|
script6
|
2021-01-16 18:16:35 +03:00 |
|
Sergeanur
|
eb5fdac918
|
Merge branch 'miami' into lcs
# Conflicts:
# src/control/Script.h
|
2021-01-16 16:56:24 +02:00 |
|
Sergeanur
|
518bc555a6
|
font
|
2021-01-16 16:55:26 +02:00 |
|
Sergeanur
|
21a6ed247b
|
Use of sized bool types for CFont
|
2021-01-16 16:06:11 +02:00 |
|
Nikolay Korolev
|
19505b664c
|
consistency fix
|
2021-01-16 13:42:46 +03:00 |
|
Nikolay Korolev
|
32ab01cd32
|
consistency fix
|
2021-01-16 13:42:04 +03:00 |
|
Nikolay Korolev
|
b4f6a9336b
|
more fix
|
2021-01-16 13:35:36 +03:00 |
|
Nikolay Korolev
|
7ea77d8da4
|
more fix
|
2021-01-16 13:32:41 +03:00 |
|
Nikolay Korolev
|
708d5831e4
|
Script5.cpp
|
2021-01-16 13:26:46 +03:00 |
|
Nikolay
|
193fb2a381
|
fix
|
2021-01-16 13:24:22 +03: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
|
96fdbac69a
|
rem null checks
|
2021-01-16 01:12:27 +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 |
|