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
cce97588fe
Reverse unused audio functions from mobile
...
# Conflicts:
# src/audio/AudioManager.h
2021-07-29 00:43:04 +03:00
Sergeanur
6cea1de9e6
Reverse unused audio functions from mobile
2021-07-29 00:40:32 +03:00
Sergeanur
81673ab304
Fix comments
2021-07-28 10:36:18 +03:00
Sergeanur
04126cd18a
Merge branch 'miami' into lcs
2021-07-28 10:32:58 +03:00
Sergeanur
2aa37813d2
cAudioManager declaration reordering
2021-07-28 10:32:43 +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
f82c3c8ea7
Merge branch 'miami' into lcs
2021-07-27 22:39:14 +03:00
Sergeanur
9dbaa7a77f
PolRadio type fixes
2021-07-27 22:38:57 +03:00
Sergeanur
d0666a8702
One more type fix
2021-07-27 22:38:35 +03:00
Sergeanur
16e2e3d091
Type fix
2021-07-27 22:32:47 +03:00
Sergeanur
fbb42085bd
Merge branch 'miami' into lcs
2021-07-27 22:30:45 +03:00
Sergeanur
7aa8d7c073
AudioManager.cpp reordering
2021-07-27 22:29:40 +03:00
Sergeanur
ad2ccdb44a
Merge branch 'miami' into lcs
2021-07-27 22:02:45 +03:00
Sergeanur
782d38c6b7
Sort AudioCollision functions into original order
2021-07-27 22:02:25 +03:00
Sergeanur
5240dce018
cAudioManager::GetCollisionOneShotRatio cleanup
2021-07-27 22:01:17 +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
6a94299eac
Fix
2021-07-26 04:42:15 +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
780cd225e9
Make PS2 VB files work together with PC audio files
2021-07-15 18:06:12 +03:00
Sergeanur
2ce36a48b9
Make PS2 VB files work together with PC audio files
2021-07-15 18:06:02 +03:00
Sergeanur
55d30a11ec
Merge branch 'miami' into lcs
...
# Conflicts:
# README.md
# gamefiles/TEXT/american.gxt
# gamefiles/TEXT/french.gxt
# gamefiles/TEXT/german.gxt
# gamefiles/TEXT/italian.gxt
# gamefiles/TEXT/spanish.gxt
# src/audio/AudioManager.h
# src/control/Garages.cpp
# src/control/Garages.h
# src/control/Script5.cpp
# src/core/config.h
# utils/gxt/american.txt
# utils/gxt/spanish.txt
2021-07-12 04:13:22 +03:00
withmorten
f686065769
get rid of // done comments in audiomanager.h
2021-07-11 03:59:37 +02:00
withmorten
3194fdb2c1
fix the fix (and another fix)
2021-07-11 03:34:43 +02:00
withmorten
58de524d70
tiny diff fix
2021-07-11 03:26:59 +02:00
withmorten
d7ceb4870c
tiny diff fixes
2021-07-11 03:26:21 +02:00
erorcun
d82dbf91ef
Merge/sync fixes after threaded audio
2021-07-10 23:14:13 +03:00
erorcun
db4ae18e5d
Remove waiting for stream closure in multi-thread audio
2021-07-10 23:14:08 +03:00
erorcun
5458632c40
Multi-threaded audio fixes
2021-07-10 23:13:51 +03:00
erorcun
ab73c2f539
Multi-threaded audio streams
...
Under MULTITHREADED_AUDIO define.
2021-07-10 23:13:42 +03:00
Sergeanur
4981fe3091
Remove redundant SampleManager.InitialiseChannel call
2021-07-10 02:06:35 +03:00
Sergeanur
d781db6c0f
Merge branch 'miami' into lcs
...
# Conflicts:
# README.md
# premake5.lua
2021-07-09 00:05:26 +03:00
Sergeanur
7a1ff3b2ad
Mission audio cleanup + sound pause
2021-07-09 00:02:35 +03:00
withmorten
79c010f082
fix macro redefinition warnings on win-glfw build
2021-07-08 01:44:55 +02:00
withmorten
f9a2f1daf7
fix macro redefinition warnings on win-glfw build
2021-07-08 01:40:58 +02:00
withmorten
e6544a6983
fix sampman_null build
2021-07-07 01:59:16 +02:00
withmorten
dadc56ccf9
fix sampman_null build
2021-07-07 01:54:16 +02:00
