Nikolay Korolev
|
c5a24eaf70
|
Merge remote-tracking branch 'upstream/miami' into miami
|
2020-06-07 18:20:00 +03:00 |
|
Nikolay Korolev
|
1748aabd69
|
fix
|
2020-06-07 18:19:44 +03:00 |
|
aap
|
3f5ecbe007
|
Merge pull request #622 from Sergeanur/VC/Font
some font stuff
|
2020-06-07 17:19:12 +02:00 |
|
Nikolay Korolev
|
b14e034344
|
fix
|
2020-06-07 17:52:14 +03:00 |
|
Nikolay Korolev
|
d0213e466c
|
more script commands
|
2020-06-07 15:49:25 +03:00 |
|
Nikolay Korolev
|
0b156f1d26
|
some stats tweaks; saves dead again
|
2020-06-07 15:23:52 +03:00 |
|
Sergeanur
|
fe3a3ad8b5
|
cleanup
|
2020-06-07 15:19:29 +03:00 |
|
Nikolay Korolev
|
c50a61d52a
|
fixed some arithmetic
|
2020-06-07 15:08:58 +03:00 |
|
eray orçunus
|
de4323f949
|
Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami
|
2020-06-07 12:46:15 +03:00 |
|
eray orçunus
|
d1a02e6ddc
|
New ped objectives
|
2020-06-07 12:45:53 +03:00 |
|
Nikolay Korolev
|
5fd330b35e
|
making it close to original
|
2020-06-07 11:31:52 +03:00 |
|
aap
|
1234fe9c1c
|
removed a "fix"
|
2020-06-07 10:24:33 +02:00 |
|
Sergeanur
|
a44510d1df
|
more font
|
2020-06-07 10:36:37 +03:00 |
|
Sergeanur
|
91e2b427ef
|
more font stuff
|
2020-06-07 05:12:01 +03:00 |
|
Sergeanur
|
fc7e35e1cd
|
fixes
|
2020-06-07 04:20:02 +03:00 |
|
Sergeanur
|
24bf4c2cba
|
Merge branch 'miami' into Font
# Conflicts:
# src/render/Font.cpp
# src/render/Font.h
|
2020-06-07 04:16:10 +03:00 |
|
Sergeanur
|
1c01899799
|
Merge branch 'master' into miami
# Conflicts:
# src/control/Garages.cpp
# src/core/Frontend.cpp
# src/peds/PlayerPed.cpp
# src/render/Hud.cpp
# src/vehicles/Train.cpp
|
2020-06-07 04:15:10 +03:00 |
|
Sergeanur
|
678a19ce3b
|
a bit of fonts
|
2020-06-07 04:11:10 +03:00 |
|
Sergeanur
|
552205dfba
|
FONT_BANK renamed to FONT_STANDARD
|
2020-06-07 04:10:06 +03:00 |
|
aap
|
44e2fcee39
|
disable skidding bugfix
|
2020-06-07 00:03:51 +02:00 |
|
aap
|
5711159e68
|
CBike done
|
2020-06-07 00:01:59 +02:00 |
|
eray orçunus
|
db9057f5a8
|
fix
|
2020-06-06 22:24:30 +03:00 |
|
eray orçunus
|
096ecc1d14
|
Some wait states
|
2020-06-06 22:16:59 +03:00 |
|
eray orçunus
|
fc0498b3a8
|
CFont crash workaround
|
2020-06-06 19:25:37 +03:00 |
|
eray orçunus
|
4e4a3489ef
|
Use KnockOffRider
|
2020-06-06 17:19:36 +03:00 |
|
Nikolay Korolev
|
e099aaaa6b
|
minor fixes
|
2020-06-06 16:36:26 +03:00 |
|
aap
|
d6640832f1
|
bla
|
2020-06-06 14:43:35 +02:00 |
|
aap
|
ef4f8ec713
|
more CBike functions
|
2020-06-06 14:42:42 +02:00 |
|
aap
|
c0481e7207
|
CBike::KnockOffRider
|
2020-06-06 13:22:55 +02:00 |
|
Nikolay Korolev
|
3f26250d73
|
fixing some uninitialized stuff
|
2020-06-06 13:31:09 +03:00 |
|
Nikolay Korolev
|
408f47fc9d
|
fixed linux saving
|
2020-06-06 12:58:10 +03:00 |
|
Sergeanur
|
afa4fa6510
|
Merge branch 'master' into miami
# Conflicts:
# src/audio/AudioLogic.cpp
# src/audio/AudioSamples.h
# src/audio/soundlist.h
# src/core/Frontend.cpp
# src/core/Frontend.h
# src/core/MenuScreens.cpp
# src/peds/Ped.cpp
# src/peds/PlayerPed.cpp
# src/render/Hud.cpp
# src/vehicles/Vehicle.h
|
2020-06-06 08:42:58 +03:00 |
|
Sergeanur
|
2016cd54b0
|
ps2 audio banks
|
2020-06-06 03:45:24 +03:00 |
|
aap
|
68caac1abd
|
Merge pull request #617 from majesticCoding/miami
some original VC's cheats and comparator for them
|
2020-06-05 23:43:15 +02:00 |
|
majestic
|
f014b29fc4
|
Update Pad.cpp
|
2020-06-05 14:31:17 -07:00 |
|
majestic
|
66262b14ad
|
Update Pad.cpp
|
2020-06-05 14:20:29 -07:00 |
|
eray orçunus
|
d3736ccb17
|
Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami
|
2020-06-05 23:20:16 +03:00 |
|
eray orçunus
|
f045ce4386
|
Bike riding anims, SA bike/heli cam
|
2020-06-05 23:13:34 +03:00 |
|
aap
|
1bfb01d5f5
|
a bit more CBike
|
2020-06-05 15:09:45 +02:00 |
|
aap
|
98de658c8f
|
Merge pull request #619 from ShFil119/heads
Fix collision with peds heads
|
2020-06-05 13:43:07 +02:00 |
|
Nikolay Korolev
|
83e4023dc0
|
fix
|
2020-06-05 12:59:27 +03:00 |
|
Sergeanur
|
147dca44fa
|
ProcessTrainAnnouncements
|
2020-06-05 11:27:33 +03:00 |
|
Nikolay Korolev
|
d325a3d247
|
basic bike support in traffic, script and car gen; some heli AI
|
2020-06-05 11:22:15 +03:00 |
|
majestic
|
e2cc3e1a33
|
some original VC's cheats and comparator for them
|
2020-06-04 18:19:53 -07:00 |
|
aap
|
647fd951ec
|
more CBike
|
2020-06-05 00:24:42 +02:00 |
|
aap
|
7f0474e9de
|
Merge pull request #615 from majesticCoding/miami
some orig chearts
|
2020-06-04 21:50:00 +02:00 |
|
aap
|
f7612c4a49
|
forgot to delete debug code
|
2020-06-04 17:49:27 +02:00 |
|
aap
|
95e96c86a1
|
minor stuff
|
2020-06-04 17:39:26 +02:00 |
|
aap
|
3e36428568
|
more CBike and fixes
|
2020-06-04 17:38:41 +02:00 |
|
eray orçunus
|
016ebc0b00
|
fixes, mostly from miami
|
2020-06-04 06:03:12 +03:00 |
|