Sergeanur
|
cb4b4d584c
|
Merge branch 'miami' into lcs
# Conflicts:
# src/control/Script.cpp
# src/control/Script3.cpp
# src/extras/custompipes_d3d9.cpp
# src/extras/custompipes_gl.cpp
|
2021-01-12 12:55:07 +02:00 |
|
Nikolay Korolev
|
167a841010
|
Merge branch 'lcs-dev' into lcs
|
2021-01-12 12:17:22 +03:00 |
|
Nikolay Korolev
|
2736c3a9d1
|
fix
|
2021-01-12 12:16:52 +03:00 |
|
Sergeanur
|
7e888a6379
|
Fix collective commands
|
2021-01-12 02:29:10 +02:00 |
|
Sergeanur
|
dcb4eedeb0
|
Fix collective commands
|
2021-01-12 02:28:08 +02:00 |
|
aap
|
afcb794d59
|
Merge pull request #947 from withmorten/miami
fix CPed struct, GetWantedLevel
|
2021-01-11 22:46:06 +01:00 |
|
aap
|
6ef3b8c458
|
Merge pull request #949 from majesticCoding/lcs
unused CFerryDoor
|
2021-01-11 22:45:10 +01:00 |
|
Nikolay Korolev
|
daf5cfe425
|
Merge remote-tracking branch 'upstream/miami' into miami
|
2021-01-12 00:43:45 +03:00 |
|
Nikolay Korolev
|
42e4e7c063
|
fix
|
2021-01-12 00:43:26 +03:00 |
|
Nikolay Korolev
|
7496a463d4
|
Merge branch 'lcs-dev' into lcs
|
2021-01-12 00:42:44 +03:00 |
|
Nikolay Korolev
|
091b40cb39
|
script3.cpp
|
2021-01-12 00:42:11 +03:00 |
|
majestic
|
0f0812618a
|
unused CFerryDoor
|
2021-01-11 12:47:09 -08:00 |
|
aap
|
383142bcbe
|
some useless code
|
2021-01-11 20:20:08 +01:00 |
|
Fire-Head
|
f728c58383
|
Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami
|
2021-01-11 21:10:28 +03:00 |
|
Fire-Head
|
e2095bf70b
|
fix explosion jet
|
2021-01-11 21:10:24 +03:00 |
|
Nikolay Korolev
|
c7052b3d6f
|
fuck
|
2021-01-11 20:51:18 +03:00 |
|
withmorten
|
4a8a1af885
|
fix CPed struct, GetWantedLevel
|
2021-01-11 18:43:04 +01:00 |
|
Nikolay Korolev
|
4422a3df23
|
Merge branch 'lcs-dev' into lcs
|
2021-01-11 17:26:17 +03:00 |
|
Nikolay Korolev
|
a214d0ed4c
|
fix
|
2021-01-11 17:25:51 +03:00 |
|
Nikolay Korolev
|
81b5e66dd4
|
fixes
|
2021-01-11 17:18:25 +03:00 |
|
Nikolay Korolev
|
625376f0d3
|
500-599
|
2021-01-11 17:14:56 +03:00 |
|
Nikolay Korolev
|
cf11b32849
|
of course
|
2021-01-11 02:43:57 +03:00 |
|
Nikolay Korolev
|
53a99cb9ee
|
script2
|
2021-01-11 02:35:03 +03:00 |
|
erorcun
|
b5711b21dc
|
Automobile: fix
|
2021-01-11 01:10:24 +03:00 |
|
Sergeanur
|
585300cd33
|
More font fix
|
2021-01-10 22:37:11 +02:00 |
|
Nikolay Korolev
|
642970df95
|
Merge branch 'lcs-dev' into lcs
|
2021-01-10 22:58:43 +03:00 |
|
Nikolay Korolev
|
75d1715442
|
script file 1 done (hopefully)
|
2021-01-10 22:58:06 +03:00 |
|
Fire-Head
|
adc7127055
|
fix pickup coronas
|
2021-01-10 22:24:21 +03:00 |
|
aap
|
ca64363899
|
debugmenu vehicle spawn list
|
2021-01-10 19:58:58 +01:00 |
|
aap
|
93ea98520b
|
mobile building rendering
|
2021-01-10 19:45:58 +01:00 |
|
aap
|
ebca91e0d0
|
update librw
|
2021-01-10 18:43:44 +01:00 |
|
shfil
|
c3b6e9da43
|
Fix linux build
|
2021-01-10 17:14:33 +01:00 |
|
aap
|
c631e6c61c
|
env map tweaks
|
2021-01-10 14:32:37 +01:00 |
|
aap
|
453405f131
|
dont render untextured world
|
2021-01-10 13:05:34 +01:00 |
|
aap
|
0ee87d7b46
|
env map rendering
|
2021-01-10 11:59:57 +01:00 |
|
Nikolay
|
b0e395e853
|
Merge pull request #942 from majesticCoding/lcs
just original marker's colors
|
2021-01-10 13:44:40 +03:00 |
|
Seemann
|
ad7855f995
|
Update command definitions
|
2021-01-10 12:27:51 +03:00 |
|
Seemann
|
c2265e29d2
|
Update command definitions
|
2021-01-09 23:59:47 -05:00 |
|
Nikolay Korolev
|
1b3047c812
|
Merge branch 'lcs-dev' into lcs
|
2021-01-09 22:24:52 +03:00 |
|
Nikolay Korolev
|
f5b97f1e8a
|
can finish first mission
|
2021-01-09 22:24:18 +03:00 |
|
aap
|
d3aa8a118c
|
fix rendering; update librw
|
2021-01-09 19:45:19 +01:00 |
|
majestic
|
2639fba582
|
just original marker color
|
2021-01-09 10:26:07 -08:00 |
|
aap
|
03c5fdef43
|
moved new renderer; implemented leeds building rendering
|
2021-01-09 19:20:32 +01:00 |
|
Nikolay Korolev
|
203dff9165
|
script
|
2021-01-09 20:33:21 +03:00 |
|
aap
|
e906a807f1
|
moved new renderer
|
2021-01-09 18:22:09 +01:00 |
|
aap
|
434bc01f0b
|
fix fix
|
2021-01-09 16:17:47 +01:00 |
|
aap
|
f6f0cb708e
|
boat fix
|
2021-01-09 16:13:38 +01:00 |
|
Sergeanur
|
322d93ab0c
|
Fix font
|
2021-01-09 16:55:45 +02:00 |
|
Nikolay Korolev
|
1f79fb608a
|
fix
|
2021-01-09 17:47:55 +03:00 |
|
Nikolay Korolev
|
c1e68b2c61
|
fix
|
2021-01-09 17:43:21 +03:00 |
|