Nikolay Korolev
c5c887cc11
merge
2021-08-29 19:40:10 +03:00
Nikolay Korolev
453f8c05a4
script revision p1
2021-08-29 19:32:22 +03:00
Sergeanur
c6f9bbce8e
Fix tabs after merge
2021-08-29 13:52:14 +03:00
Sergeanur
eeacbfeb6a
Merge branch 'miami' into lcs
2021-08-29 10:31:13 +03:00
Sergeanur
9a7b469f4e
Audio: fixing bugs, fixing types, making code more accurate to original
2021-08-29 09:42:32 +03:00
Sergeanur
800ab92960
Merge branch 'miami' into lcs
...
# Conflicts:
# premake5.lua
# src/audio/AudioLogic.cpp
# src/audio/AudioManager.cpp
2021-08-25 09:07:41 +03:00
Sergeanur
c8492ab5e0
Audio: refactoring, type fixes, renaming cAudioManager fields
2021-08-25 08:49:58 +03:00
Sergeanur
d4a2113a8a
Audio: fix PS2 ifdefs
2021-08-24 15:25:51 +03:00
Sergeanur
abbfb09a64
Audio enhancements:
...
* redo high fps fix
* make releasing vehicle sounds attach to entities
* fix bug with reusing audio entity that is still being used
* use time scale to modify sound speed
2021-08-24 14:58:41 +03:00
Sergeanur
3779a39f1f
Audio: a couple of LCS changes
2021-08-21 13:32:37 +03:00
Sergeanur
e0be6beb18
Merge branch 'miami' into lcs
...
# Conflicts:
# src/audio/AudioLogic.cpp
# src/audio/AudioManager.cpp
# src/audio/PolRadio.cpp
# src/control/CarCtrl.cpp
2021-08-21 13:25:42 +03:00
Sergeanur
7c80093efa
Remove cMissionAudio, move cAMCrime array outside of cPoliceRadioQueue (R* vision)
2021-08-21 13:02:07 +03:00
Sergeanur
9c40489589
Merge branch 'miami' into lcs
...
# Conflicts:
# src/audio/AudioLogic.cpp
# src/audio/AudioManager.cpp
2021-08-20 14:34:11 +03:00
Sergeanur
a401f926d3
Audio refactoring:
...
* renamed tSound fields, added descriptions for each field
* getting rid of term 'intensity' in favour of 'max distance'
* renamed two cAudioManager fields
* fix volume not being reduced for stopping sounds that are looped
2021-08-20 14:28:55 +03:00
Sergeanur
136b25133d
Merge branch 'miami' into lcs
...
# Conflicts:
# premake5.lua
# src/audio/AudioLogic.cpp
# src/audio/sampman_miles.cpp
# src/audio/sampman_oal.cpp
2021-08-19 11:47:03 +03:00
Sergeanur
71e0895dc6
Add AUDIO_REVERB define
2021-08-19 10:53:14 +03:00
Sergeanur
51ba90dd52
Audio: ifdef more things that aren't on ps2
2021-08-19 08:45:56 +03:00
Sergeanur
a13089cd2e
Port audio changes from master
2021-08-18 15:49:06 +03:00
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
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
e671fe682d
Merge remote-tracking branch 'GitHub/miami' into lcs
2021-06-25 00:47:06 +03:00
Sergeanur
14c71f39ff
High FPS Fixes
2021-06-25 00:39:47 +03:00
Sergeanur
7c3457257b
Small fix
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
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
1471c82a20
LCS sfx + mission audio
2021-06-24 21:42:08 +03:00
Sergeanur
4b8b0a6d74
Small fix
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
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
247974afd3
Merge branch 'miami' into lcs
...
* miami:
Fixes to sfx names
2021-05-16 13:18:00 +03:00
Sergeanur
8a728faeb6
Fixes to sfx names
2021-05-16 13:17:35 +03:00
Sergeanur
478f6e07d4
Uhh, right
...
# Conflicts:
# src/audio/AudioManager.h
2021-02-26 11:08:32 +02:00
Sergeanur
f6910d35f7
Merge branch 'miami' into lcs
...
# Conflicts:
# README.md
# premake5.lua
# src/audio/MusicManager.cpp
# src/core/main.cpp
# src/core/re3.cpp
# src/extras/postfx.cpp
# src/render/Font.cpp
2021-02-26 11:07:32 +02:00
Sergeanur
b01d6be3f4
PoliceRadio -> PolRadio (original name)
2021-02-26 10:57:11 +02:00
