crt0mega/re3
1
0
Fork 0
mirror of https://github.com/GTAmodding/re3.git synced 2021-09-07 08:09:38 +00:00
Code Issues Projects Releases Wiki Activity
5,421 Commits 3 Branches 0 Tags 79 MiB
4141caa4d6
Commit Graph

240 Commits

Author SHA1 Message Date
Sergeanur
4141caa4d6 Merge branch 'miami' into lcs 
# Conflicts:
#	src/audio/AudioLogic.cpp
#	src/audio/sampman.h
#	src/audio/sampman_miles.cpp
#	src/core/Radar.cpp
#	src/core/config.h
 2021-08-12 16:04:25 +03:00
Sergeanur
92c5cf1877 Sync audio changes from master 2021-08-12 14:57:16 +03:00
Sergeanur
68c37d2d88 Reverse miami vice ped comments 2021-08-11 10:55:00 +03:00
Sergeanur
80dc23621e uncomment GetSpecialCharacterTalkSfx 2021-08-11 10:47:02 +03:00
Sergeanur
b289bb4edb Reverse special characters' ped comments 2021-08-11 10:09:20 +03:00
Nikolay Korolev
74f00c3c63 merge 2021-08-08 15:46:47 +03:00
Nikolay Korolev
88b4c7b50b merge 2021-08-08 15:34:02 +03:00
Sergeanur
e8dcc8432d Possible crashfix with wanted level 2021-07-30 20:36:07 +03:00
Sergeanur
b77d93ba4a Merge branch 'miami' into lcs 
# Conflicts:
#	src/audio/AudioLogic.cpp
 2021-07-29 01:59:20 +03:00
Sergeanur
7bacf3b6f4 Reverse unused audio functions 2021-07-29 01:52:49 +03:00
Sergeanur
92679555b9 Merge branch 'miami' into lcs 
# Conflicts:
#	src/audio/AudioLogic.cpp
#	src/audio/MusicManager.cpp
 2021-07-28 09:42:24 +03:00
Sergeanur
8960ffaf0b Get rid of audio getters 2021-07-28 09:39:57 +03:00
Sergeanur
7adc85995f Merge branch 'miami' into lcs 
# Conflicts:
#	src/audio/AudioLogic.cpp
#	src/audio/AudioManager.h
 2021-07-28 09:24:23 +03:00
Sergeanur
61176acbad Ped comments ordering and type fix + vice function(s) fix 2021-07-28 09:17:38 +03:00
Sergeanur
98003d0d41 Merge branch 'miami' into lcs 
# Conflicts:
#	src/audio/AudioLogic.cpp
 2021-07-28 00:56:42 +03:00
Sergeanur
49ee711c75 AudioLogic type fixes and reordering (after peds) 2021-07-28 00:55:22 +03:00
Sergeanur
029e315f0a Merge branch 'miami' into lcs 
# Conflicts:
#	src/audio/AudioLogic.cpp
 2021-07-28 00:42:18 +03:00
Sergeanur
16f892b667 AudioLogic type fixes and reordering (before peds) 2021-07-28 00:41:34 +03:00
Sergeanur
6dc8c5bd92 Merge branch 'miami' into lcs 2021-07-27 20:58:17 +03:00
Sergeanur
1180f32d9c Fix bike kick sound 2021-07-26 11:33:56 +03:00
Sergeanur
a064b3a687 Audio changes: 
- Reorder AudioCollision.cpp functions into original order
- Add missing cAudioCollision::Reset()
- Move cAudioCollision ctor into .h (like original)
- Fix argument types for ped comment functions and more
- Fix wrong names of ped comment functions
- Fix incorrect ped comments
- Remove getters
- Reorder declarations of cAudioManager
- Wrap PC only functions around ifdef
- Add cAudioManager methods from PS2 and mobile
 2021-07-26 04:34:55 +03:00
Sergeanur
a510a03b8a Small fix 2021-07-25 22:27:00 +03:00
Sergeanur
c234cb4663 Law enforcers and generic female ped comments 2021-07-25 22:16:02 +03:00
Sergeanur
cc13e31264 Merge branch 'miami' into lcs 2021-07-22 21:17:55 +03:00
Sergeanur
a1444b992f Fix Predator shooting sound 2021-07-22 07:01:04 +03:00
Sergeanur
4981fe3091 Remove redundant SampleManager.InitialiseChannel call 2021-07-10 02:06:35 +03:00
Sergeanur
7a1ff3b2ad Mission audio cleanup + sound pause 2021-07-09 00:02:35 +03:00
Sergeanur
138abb91f6 Merge branch 'miami' into lcs 
# Conflicts:
#	src/control/CarCtrl.cpp
#	src/control/Script4.cpp
#	src/core/Frontend.cpp
 2021-06-30 21:26:36 +03:00
Sergeanur
b1c9340fd3 Fix unused code 2021-06-30 21:16:48 +03:00
withmorten
d17d437de3 rename clamp macro to Clamp to fix compilation with g++11 (and clamp2 for consistency sake) 2021-06-28 13:57:05 +02:00
withmorten
cb3b3855b8 rename clamp macro to Clamp to fix compilation with g++11 2021-06-28 13:31:35 +02:00
erorcun
53a4b6936b Revert "Use PS2-y global names on SampMan" 
We know that they changed all those names on PC.

This reverts commit 091a65996e.
 2021-06-27 17:59:50 +03:00
erorcun
091a65996e Use PS2-y global names on SampMan 2021-06-27 17:53:14 +03:00
Sergeanur
74867af2e7 Fixes 2021-06-24 21:50:09 +03:00
Sergeanur
ba23408007 Fix use of enum in ped comment banks switch 2021-06-24 21:46:21 +03:00
Sergeanur
0910188058 Add macros to set sample loop offsets 2021-06-24 21:46:18 +03:00
Sergeanur
3cc9eb1c1c Fix cAudioManager::ProcessCarHeli 2021-06-24 21:45:49 +03:00
Sergeanur
db1c7de125 Fix bullet trace sound offset 2021-06-24 21:45:49 +03:00
Sergeanur
60bb16d26c Increase the number of audio channels to PS2 count and some small audio fixes 2021-06-24 21:45:18 +03:00
Sergeanur
1fa0116f5f Use bool8 in audio code 2021-06-24 21:44:36 +03:00
Sergeanur
008f8a1e19 Fix mod 0 crash 2021-06-24 21:42:10 +03:00
Sergeanur
499b16678f Fix engine sounds, player and male01 ped comments 2021-06-24 21:42:10 +03:00
Sergeanur
1471c82a20 LCS sfx + mission audio 2021-06-24 21:42:08 +03:00
Sergeanur
0f0cb40151 Fix use of enum in ped comment banks switch 2021-06-24 21:34:33 +03:00
Sergeanur
1b5dbc4b41 Add macros to set sample loop offsets 2021-06-24 21:34:33 +03:00
Sergeanur
6426963807 Fix cAudioManager::ProcessCarHeli 2021-06-24 21:34:33 +03:00
Sergeanur
23755fdfb4 Fix bullet trace sound offset 2021-06-24 21:34:33 +03:00
Sergeanur
02655313e9 Increase the number of audio channels to PS2 count and some small audio fixes 2021-06-24 21:34:33 +03:00
Sergeanur
5bcdb933a7 Use bool8 in audio code 2021-06-24 21:34:32 +03:00
Sergeanur
8fc99387f5 Fix use of enum in ped comment banks switch 2021-06-24 21:32:44 +03:00