aboutsummaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'miami' into lcslcsSergeanur2021-09-026-58/+81
|\ | | | | | | | | | | | | | | # Conflicts: # src/audio/AudioLogic.cpp # src/audio/sampman.h # src/audio/sampman_miles.cpp # src/audio/sampman_oal.cpp
| * Fixes from mastermiamiSergeanur2021-09-026-57/+80
| |
* | Merge branch 'miami' into lcsSergeanur2021-09-022-32/+32
|\| | | | | | | | | # Conflicts: # src/audio/AudioManager.cpp
| * Audio: small refactoringSergeanur2021-09-021-29/+30
| |
| * Fix heli soundSergeanur2021-09-021-3/+2
| |
* | Audio: separate buffers for mission audioSergeanur2021-09-014-47/+110
| |
* | Merge branch 'miami' into lcsSergeanur2021-09-018-64/+244
|\| | | | | | | | | | | | | # Conflicts: # src/audio/AudioLogic.cpp # src/audio/AudioSamples.h # src/audio/sampman_miles.cpp
| * Audio: add separate buffer for player comments like on PS2 to fix overflow, ↵Sergeanur2021-09-017-8/+197
| | | | | | | | add ped comments debug to debug menu
| * replace ugly else if with switchFire-Head2021-08-301-53/+48
| |
* | Merge pull request #1327 from Nick007J/lcsNikolay2021-08-3129-238/+487
|\ \ | | | | | | some lcs stuff
| * | fix compileNikolay Korolev2021-08-302-19/+22
| | |
| * | Merge remote-tracking branch 'upstream/lcs' into lcsNikolay Korolev2021-08-303-6/+108
| |\ \
| * | | script revision p2Nikolay Korolev2021-08-308-24/+30
| | | |
| * | | mergeNikolay Korolev2021-08-2919-3373/+3554
| |\ \ \
| * | | | script revision p1Nikolay Korolev2021-08-2925-226/+462
| | | | |
| * | | | fixNikolay2021-08-281-1/+1
| | | | |
* | | | | Bridge sound doneSergeanur2021-08-303-122/+47
| | | | |
* | | | | Merge branch 'miami' into lcsSergeanur2021-08-302-7/+11
|\ \ \ \ \ | |_|_|/ / |/| | | / | | |_|/ | |/| | # Conflicts: # src/audio/AudioManager.h
| * | | Audio: ps2 code ifdefSergeanur2021-08-302-7/+11
| | | | | | | | | | | | | | | | | | | | # Conflicts: # src/audio/AudioManager.h
* | | | Fix yet another DirectlyEnqueueSampleSergeanur2021-08-301-0/+4
| | | |
* | | | Ferry sounds doneSergeanur2021-08-302-4/+100
| | | |
* | | | Add new tSound fieldSergeanur2021-08-302-2/+4
| |_|/ |/| |
* | | Fix bugs in cAudioManager::DirectlyEnqueueSampleSergeanur2021-08-291-5/+18
| | |
* | | cAudioManager::DirectlyEnqueueSampleSergeanur2021-08-294-4/+28
| | |
* | | Fix tabs after mergeSergeanur2021-08-291-52/+52
| | |
* | | Merge branch 'miami' into lcsSergeanur2021-08-291-2/+2
|\| |
| * | Fix Squalo render out polySergeanur2021-08-291-2/+2
| | |
* | | More original indicesSergeanur2021-08-291-9/+7
| | |
* | | Get original MI_SKIMMERSergeanur2021-08-291-1/+1
| | |
* | | Merge branch 'miami' into lcsSergeanur2021-08-2912-3256/+3379
|\| |
| * | Audio: fixing bugs, fixing types, making code more accurate to originalSergeanur2021-08-2912-3257/+3378
| | |
* | | Merge remote-tracking branch 'origin/miami' into lcsSergeanur2021-08-298-60/+79
|\| | | |/ |/| | | | | | | # Conflicts: # src/audio/AudioManager.cpp # src/core/Radar.cpp
| * fixNikolay2021-08-281-1/+1
| |
| * fix debug teleportNikolay Korolev2021-08-261-8/+9
| |
| * Merge remote-tracking branch 'upstream/miami' into miamiNikolay Korolev2021-08-262-3/+17
| |\
| | * Fix acceleration sound on exiting the vehicleSergeanur2021-08-261-0/+4
| | |
| | * Fix reflections with audio time scaleSergeanur2021-08-261-3/+13
| | |
| * | fixed debug teleportNikolay Korolev2021-08-262-3/+5
| |/
| * keep noinline only for broken vs versionsNikolay Korolev2021-08-261-0/+2
| |
| * Refactor cPedCommentsSergeanur2021-08-254-49/+49
| |
* | fixNikolay2021-08-271-1/+1
| |
* | cleanupNikolay Korolev2021-08-262-2/+2
| |
* | Onscreen timerNikolay Korolev2021-08-269-81/+226
| |
* | fixNikolay Korolev2021-08-251-3/+2
| |
* | Fix clockSergeanur2021-08-252-3/+3
| |
* | Merge branch 'miami' into lcsSergeanur2021-08-2512-268/+425
|\| | | | | | | | | | | | | # Conflicts: # premake5.lua # src/audio/AudioLogic.cpp # src/audio/AudioManager.cpp
| * Audio: refactoring, type fixes, renaming cAudioManager fieldsSergeanur2021-08-258-192/+189
| |
| * Audio: fix PS2 ifdefsSergeanur2021-08-242-1/+3
| |
| * Merge branch 'master' into miamiSergeanur2021-08-241-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # .github/workflows/build-switch.yml # .vscode/settings.json # CMakeLists.txt # README.md # cmake/nx/NXFunctions.cmake # gamefiles/TEXT/american.gxt # gamefiles/TEXT/french.gxt # gamefiles/TEXT/german.gxt # gamefiles/TEXT/italian.gxt # gamefiles/TEXT/polish.gxt # gamefiles/TEXT/russian.gxt # gamefiles/TEXT/spanish.gxt # gamefiles/models/frontend_nsw.txd # gamefiles/models/nswbtns.txd # res/images/logo.svg # res/images/logo_1024.png # res/images/logo_256.jpg # src/CMakeLists.txt # src/audio/AudioCollision.cpp # src/audio/AudioLogic.cpp # src/audio/AudioManager.cpp # src/audio/AudioManager.h # src/audio/MusicManager.cpp # src/audio/PolRadio.cpp # src/audio/PolRadio.h # src/audio/sampman_miles.cpp # src/audio/sampman_oal.cpp # src/control/CarCtrl.cpp # src/core/ControllerConfig.cpp # src/core/Frontend.cpp # src/core/Frontend.h # src/core/MenuScreens.cpp # src/core/MenuScreensCustom.cpp # src/core/common.h # src/core/config.h # src/peds/Ped.cpp # src/peds/PedAI.cpp # src/peds/PedFight.cpp # src/peds/PlayerPed.cpp # src/peds/PlayerPed.h # src/skel/crossplatform.cpp # src/skel/glfw/glfw.cpp # src/weapons/Weapon.cpp # utils/gxt/polish.txt # utils/gxt/russian.txt
| | * Audio enhancements:Sergeanur2021-08-245-48/+164
| | | | | | | | | | | | | | | | | | | | | * 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