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
a13089cd2e
Port audio changes from master
2021-08-18 15:49:06 +03:00
Sergeanur
0c55f331cf
Merge branch 'miami' into lcs
2021-08-16 14:32:15 +03:00
Sergeanur
176cadff05
Merge branch 'master' into miami
...
# Conflicts:
# src/audio/AudioLogic.cpp
2021-08-16 14:31:40 +03:00
Sergeanur
076b324539
Fix ped comments playing at full volume behind the wall
2021-08-16 14:21:51 +03:00
Sergeanur
2633295ada
Merge branch 'miami' into lcs
2021-08-16 10:33:54 +03:00
Sergeanur
76f2191476
Remove not needed entry from config
2021-08-16 10:31:35 +03:00
Sergeanur
bcb5b4f94d
Remove not needed entry from config
2021-08-16 10:29:44 +03:00
Sergeanur
d7e764d519
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/AudioLogic.cpp
# src/core/config.h
# src/vehicles/Automobile.cpp
# utils/gxt/american.txt
# utils/gxt/french.txt
# utils/gxt/german.txt
# utils/gxt/italian.txt
# utils/gxt/spanish.txt
2021-08-16 10:09:39 +03:00
Sergeanur
d6fbf9fbe7
PS2 audio reflections
2021-08-16 10:02:29 +03:00
Sergeanur
c7e05c74b9
Fix cAudioManager::ProcessVehicleEngine return type, rename Sound Intensity
2021-08-16 10:00:10 +03:00
Sergeanur
854ee12d9d
Fix ifdef for audio reflection members
2021-08-15 14:11:20 +03:00
Sergeanur
5ddd0649e3
Fix cAudioManager::ProcessVehicleEngine return type, document PS2 changes, rename Sound Intensity
2021-08-15 13:14:16 +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
f1545daeae
Rename unused audio member
2021-08-12 11:46:10 +03:00
Sergeanur
ce78081a7f
Put more things under ifdef
2021-08-12 11:39:34 +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
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
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
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
c234cb4663
Law enforcers and generic female ped comments
2021-07-25 22:16: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
Sergeanur
7e7a2b74cd
Fixes
2021-06-25 01:16:03 +03:00
