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 |
|
Sergeanur
|
5d5e0f62e8
|
Merge branch 'miami' into lcs
# Conflicts:
# premake5.lua
|
2021-07-03 16:39:22 +03:00 |
|
Sergeanur
|
77f31105de
|
Fix overflow in audio code
|
2021-07-03 15:57:48 +03:00 |
|
Sergeanur
|
3ed4cdf109
|
Fix overflow in audio code
|
2021-07-03 15:57:08 +03:00 |
|
erorcun
|
70fa7fc239
|
Sanitizer fixes
|
2021-07-03 01:28:32 +03:00 |
|
Sergeanur
|
dd790b00e5
|
Merge branch 'miami' into lcs
# Conflicts:
# src/audio/MusicManager.cpp
|
2021-06-30 21:46:08 +03:00 |
|
Sergeanur
|
cb72fee941
|
fix
|
2021-06-30 21:45:19 +03:00 |
|
Sergeanur
|
a3964dfd4a
|
Pause radio when game is paused
|
2021-06-30 21:36:11 +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
|
a73a2c9179
|
Pause radio when game is paused
|
2021-06-30 21:21:45 +03:00 |
|
Sergeanur
|
b1c9340fd3
|
Fix unused code
|
2021-06-30 21:16:48 +03:00 |
|
erorcun
|
9f0daee186
|
Sanitizer fixes
|
2021-06-30 03:31:10 +03:00 |
|
erorcun
|
fdbd414299
|
Fix MP3 finding stack crash
|
2021-06-28 17:44:48 +03:00 |
|
erorcun
|
22e8e0eff8
|
Fix MP3 finding stack crash
|
2021-06-28 17:35:25 +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 |
|
Sergeanur
|
eaebaa6db3
|
Merge branch 'miami' into lcs
# Conflicts:
# src/control/Script5.cpp
# src/entities/Entity.cpp
|
2021-06-28 05:16:21 +03:00 |
|
Sergeanur
|
f8297df9c5
|
Redo ReadSaveBuf + common.h cleanup
|
2021-06-28 05:12:54 +03: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
|
879761af2c
|
Merge fixes
|
2021-06-27 14:51:48 +03:00 |
|
Sergeanur
|
c7243aa2e9
|
Merge remote-tracking branch 'origin/miami' into lcs
|
2021-06-27 14:49:14 +03:00 |
|
erorcun
|
3587cb029e
|
Remove waiting for stream closure in multi-thread audio
|
2021-06-27 14:42:52 +03:00 |
|
Sergeanur
|
883d8172b0
|
Merge remote-tracking branch 'origin/miami' into lcs
|
2021-06-27 14:33:39 +03:00 |
|
erorcun
|
05a29c7e6c
|
Multi-threaded audio fixes
|
2021-06-27 00:00:07 +03:00 |
|
withmorten
|
f3a931e1c9
|
Revert "Revert "Redo ReadSaveBuf + common.h cleanup""
This reverts commit af7573ddbe .
|
2021-06-26 19:14:46 +02:00 |
|
erorcun
|
107c4df69c
|
Multi-threaded audio streams
Under MULTITHREADED_AUDIO define.
|
2021-06-26 16:24:23 +03:00 |
|
erorcun
|
9b5caa190e
|
Pool fixes
Mostly for Linux
|
2021-06-26 00:27:20 +03:00 |
|
erorcun
|
af7573ddbe
|
Revert "Redo ReadSaveBuf + common.h cleanup"
This reverts commit 2b67aba94c .
|
2021-06-26 00:25:59 +03:00 |
|
Sergeanur
|
2b67aba94c
|
Redo ReadSaveBuf + common.h cleanup
|
2021-06-25 19:03:51 +03:00 |
|
Sergeanur
|
7e7a2b74cd
|
Fixes
|
2021-06-25 01:16:03 +03:00 |
|