Commit Graph

2488 Commits

Author SHA1 Message Date
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
aap
fe71a58f28
Merge pull request #620 from erorcun/miami
Bike riding anims, SA bike/heli cam
2020-06-05 22:38:43 +02: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
aap
2641cd6737
Merge pull request #618 from Nick007J/miami
basic bike support in traffic, script and car gen; some heli AI
2020-06-05 11:56:58 +02: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
shfil
4a7f0849ab
Update links to bintray on miami branch 2020-06-04 21:36:06 +02:00
shfil
7059bead84
Publish artifacts for reVC 2020-06-04 21:28:42 +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
Sergeanur
07c6752cf7 Merge branch 'master' into miami
# Conflicts:
#	src/peds/Ped.cpp
2020-06-04 05:10:50 +03:00
Sergeanur
2578880e1c PedChat & PedDebug 2020-06-04 05:04:00 +03:00
Sergeanur
a6e4619378 Revert "fix accident~"
This reverts commit 04de93796b.
2020-06-04 04:42:42 +03:00
Sergeanur
07d336ddf0 Merge branch 'master' into miami
# Conflicts:
#	src/peds/Ped.cpp
#	src/peds/Ped.h
2020-06-04 04:32:49 +03:00
Sergeanur
12717917cc Restore original logic of CPed::WanderRange 2020-06-04 04:31:04 +03:00
majestic
20ffcb68b6 some orig chearts
- weapon model indices added
- orig weapon cheats added
- some cheats' names changed to original ones
2020-06-03 14:48:26 -07:00
aap
e1201fc6e2 fixed CPed::AddInCarAnims 2020-06-03 16:55:23 +02:00
erorcun
1e2b087601
Merge pull request #614 from erorcun/miami
Peds, eSound and PedState enum, fixes
2020-06-03 17:06:07 +03:00
eray orçunus
5dc410a999 Peds, eSound and PedState enum, fixes 2020-06-03 17:01:11 +03:00
aap
c498af29aa get rid of III code 2020-06-03 09:24:26 +02:00
aap
04de93796b fix accident~ 2020-06-03 09:24:02 +02:00