summaryrefslogtreecommitdiff
path: root/src/audio/AudioLogic.cpp (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'miami' into lcs•••# Conflicts: # src/audio/AudioLogic.cpp # src/audio/sampman.h # src/audio/sampman_miles.cpp # src/audio/sampman_oal.cpp origin/lcsSergeanur2021-09-021-13/+13
|\
| * Fixes from masterorigin/miamiSergeanur2021-09-021-14/+14
* | Merge branch 'miami' into lcs•••# Conflicts: # src/audio/AudioManager.cpp Sergeanur2021-09-021-3/+2
|\|
| * Fix heli soundSergeanur2021-09-021-3/+2
* | Audio: separate buffers for mission audioSergeanur2021-09-011-8/+2
* | Merge branch 'miami' into lcs•••# Conflicts: # src/audio/AudioLogic.cpp # src/audio/AudioSamples.h # src/audio/sampman_miles.cpp Sergeanur2021-09-011-2/+35
|\|
| * Audio: add separate buffer for player comments like on PS2 to fix overflow, a...Sergeanur2021-09-011-2/+35
* | Merge pull request #1327 from Nick007J/lcs•••some lcs stuffNikolay2021-08-311-2/+2
|\ \
| * \ Merge remote-tracking branch 'upstream/lcs' into lcsNikolay Korolev2021-08-301-4/+99
| |\ \
| * \ \ mergeNikolay Korolev2021-08-291-3166/+3290
| |\ \ \
| * | | | script revision p1Nikolay Korolev2021-08-291-2/+2
* | | | | Bridge sound doneSergeanur2021-08-301-118/+46
| |_|/ / |/| | |
* | | | Ferry sounds doneSergeanur2021-08-301-4/+99
| |/ / |/| |
* | | Merge branch 'miami' into lcsSergeanur2021-08-291-3132/+3250
|\ \ \ | | |/ | |/|
| * | Audio: fixing bugs, fixing types, making code more accurate to originalSergeanur2021-08-291-3100/+3216
* | | Merge remote-tracking branch 'origin/miami' into lcs•••# Conflicts: # src/audio/AudioManager.cpp # src/core/Radar.cpp Sergeanur2021-08-291-36/+42
|\| | | |/ |/|
| * Fix acceleration sound on exiting the vehicleSergeanur2021-08-261-0/+4
| * Refactor cPedCommentsSergeanur2021-08-251-36/+38
* | Merge branch 'miami' into lcs•••# Conflicts: # premake5.lua # src/audio/AudioLogic.cpp # src/audio/AudioManager.cpp Sergeanur2021-08-251-138/+156
|\|
| * Audio: refactoring, type fixes, renaming cAudioManager fieldsSergeanur2021-08-251-91/+91
| * Audio: fix PS2 ifdefsSergeanur2021-08-241-0/+2
| * 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 Sergeanur2021-08-241-4/+11
| * Make ped comments update position and volume + fix cPedComments::ProcessSergeanur2021-08-231-50/+59
* | Merge branch 'miami' into lcs•••# Conflicts: # src/audio/AudioLogic.cpp # src/audio/AudioManager.cpp # src/audio/PolRadio.cpp # src/control/CarCtrl.cpp Sergeanur2021-08-211-96/+91
|\|
| * Remove cMissionAudio, move cAMCrime array outside of cPoliceRadioQueue (R* vi...Sergeanur2021-08-211-95/+89
| * Audio: bits of PS2 codeSergeanur2021-08-211-1/+5
* | Merge branch 'miami' into lcs•••# Conflicts: # src/audio/AudioLogic.cpp # src/audio/AudioManager.cpp Sergeanur2021-08-201-513/+516
|\|
| * 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 Sergeanur2021-08-201-514/+517
* | Merge branch 'miami' into lcs•••# Conflicts: # premake5.lua # src/audio/AudioLogic.cpp # src/audio/sampman_miles.cpp # src/audio/sampman_oal.cpp Sergeanur2021-08-191-345/+305
|\|
| * Add AUDIO_REVERB defineSergeanur2021-08-191-73/+79
| * Audio: ifdef more things that aren't on ps2Sergeanur2021-08-191-21/+24
| * Fix acceleration sound playing when exiting the vehicle, code fixes in Proces...Sergeanur2021-08-181-78/+41
| * Possible fix of ProcessVehicleOneShots crashSergeanur2021-08-181-1/+1
| * Port audio changes from masterSergeanur2021-08-181-182/+173
* | Merge branch 'miami' into lcsSergeanur2021-08-161-6/+16
|\|
| * Merge branch 'master' into miami•••# Conflicts: # src/audio/AudioLogic.cpp Sergeanur2021-08-161-6/+16
| |\
| | * Fix ped comments playing at full volume behind the wallSergeanur2021-08-161-5/+12
| | * Make UpdateReflections a bit more binary exact + small code changes to sync w...Sergeanur2021-08-161-2/+2
| | * Fix cAudioManager::ProcessVehicleEngine return type, document PS2 changes, re...Sergeanur2021-08-151-230/+234
| | * Sync fixes from miamiSergeanur2021-08-121-1/+1
| | * Put more things under ifdefSergeanur2021-08-121-78/+85
| | * Add define to enable/disable external 3d audio simulationSergeanur2021-08-121-0/+9
| | * Fix unset emitting volume for sawmillSergeanur2021-08-111-0/+3
| | * Fix unset emitting volume for moan soundSergeanur2021-08-111-0/+3
* | | 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 Sergeanur2021-08-161-348/+352
|\| |
| * | Fix cAudioManager::ProcessVehicleEngine return type, rename Sound IntensitySergeanur2021-08-161-348/+352
* | | 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 Sergeanur2021-08-121-97/+117
|\| |
| * | Sync audio changes from masterSergeanur2021-08-121-97/+117
* | | Reverse miami vice ped commentsSergeanur2021-08-111-9/+9
* | | uncomment GetSpecialCharacterTalkSfxSergeanur2021-08-111-1/+1