Commit Graph

2488 Commits

Author SHA1 Message Date
Sergeanur
0321f3b55f Merge branch 'master' into miami
# Conflicts:
#	src/audio/audio_enums.h
#	src/core/AnimViewer.cpp
2020-06-08 18:03:00 +03:00
Sergeanur
85d845c5ce
Merge pull request #623 from Sergeanur/VC/MissionAudio
Mission audio
2020-06-08 17:32:57 +03:00
Sergeanur
95e9fe7693 fixes 2020-06-08 16:22:49 +03:00
Sergeanur
03f3b4fc5a remove numbers from enum 2020-06-08 14:33:10 +03:00
Sergeanur
8cd87236c9 miamification of some audio structs 2020-06-08 14:29:55 +03:00
aap
f8b4c0ee1d bla 2020-06-08 13:23:08 +02:00
aap
d5515c9d0e cleaned up and updated animviewer; fixed animation bug 2020-06-08 13:01:23 +02:00
aap
94e5b24fc8 cleaned up and fixed animviewer 2020-06-08 13:01:20 +02:00
Sergeanur
65032389a4 Merge branch 'miami' into VC/MissionAudio
# Conflicts:
#	src/audio/AudioLogic.cpp
#	src/audio/AudioManager.h
#	src/audio/DMAudio.cpp
#	src/audio/DMAudio.h
#	src/audio/MusicManager.cpp
2020-06-08 10:38:09 +03:00
Sergeanur
5942f1a8f9 Merge branch 'master' into miami
# Conflicts:
#	src/control/CarCtrl.cpp
#	src/control/Script.cpp
#	src/render/Font.cpp
2020-06-08 10:36:37 +03:00
Sergeanur
36a6d124aa Mission audio slots 2020-06-08 10:34:31 +03:00
Sergeanur
be9954ecc6 IsMissionAudioSamplePlaying (from VC) 2020-06-08 10:33:32 +03:00
Sergeanur
0afb1d9e24 Scale font shadow 2020-06-08 10:30:09 +03:00
Nikolay Korolev
2de3c6d67b some fixes to heli AI (not all yet) 2020-06-08 02:34:53 +03:00
Nikolay Korolev
b498ad800c Merge remote-tracking branch 'upstream/miami' into miami 2020-06-08 02:04:58 +03:00
Nikolay Korolev
d48749f797 fixed attached ped 2020-06-08 02:04:37 +03:00
eray orçunus
94e9101ce0 more fixes 2020-06-08 01:51:11 +03:00
Nikolay Korolev
16a5c2f676 fixes 2020-06-08 01:21:49 +03:00
Nikolay Korolev
af564d865c fixes 2020-06-08 01:16:21 +03:00
Nikolay Korolev
5ec46bcdfb Merge remote-tracking branch 'upstream/miami' into miami 2020-06-08 01:01:39 +03:00
eray orçunus
a77b181e32 CarCtrl fixes 2020-06-08 00:59:43 +03:00
Nikolay Korolev
5a09eeea27 more accurate code 2020-06-08 00:53:25 +03:00
eray orçunus
e07b6fdce7 Message box, letterbox and ped attaching 2020-06-07 21:44:54 +03:00
Nikolay Korolev
23f20ceaf8 fix 2020-06-07 19:35:05 +03:00
Nikolay Korolev
27eaa10873 Merge remote-tracking branch 'upstream/miami' into miami 2020-06-07 19:32:51 +03:00
Nikolay Korolev
2f9becbac6 fix 2020-06-07 19:31:15 +03:00
eray orçunus
6cc39e9bdb Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami 2020-06-07 19:13:27 +03:00
eray orçunus
88f066f469 HUD sizes 2020-06-07 19:13:12 +03:00
aap
dda9d03e54 nother bike bug 2020-06-07 17:35:22 +02:00
aap
464b232321 accidental shadowing in CBike::ProcessControl 2020-06-07 17:27:23 +02:00
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
Nikolay Korolev
be2291e44c fixed some arithmetic 2020-06-07 15:07:36 +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
31569d512c font fix 2020-06-07 09:10:09 +03:00
Sergeanur
0d0e519e68 Merge branch 'miami' into Font 2020-06-07 05:13:44 +03:00
Sergeanur
950cb9a717 Merge remote-tracking branch 'origin/master' into miami
# Conflicts:
#	src/core/Frontend.cpp
#	src/render/Hud.cpp
2020-06-07 05:13:01 +03:00
Sergeanur
91e2b427ef more font stuff 2020-06-07 05:12:01 +03:00
Fire-Head
9c0adf6a8f Revert "FONT_BANK renamed to FONT_STANDARD"
This reverts commit 552205dfba.
2020-06-07 05:03:06 +03:00
Sergeanur
fc7e35e1cd fixes 2020-06-07 04:20:02 +03:00