diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2021-08-24 15:19:35 +0300 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2021-08-24 15:19:35 +0300 |
| commit | a5ec7a45dbc0b2c884644632aacf693d4595ef2e (patch) | |
| tree | e78cd1618a3dab0f9067e81fde5e2404a44ea1e8 | |
| parent | abbfb09a64e4d9188cb9ef17733693d43e9a51ce (diff) | |
| parent | 38f4ea7aa3773e5fa9ff99fa131b7db223117009 (diff) | |
Merge branch 'master' into miami
# 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
| -rw-r--r-- | src/core/config.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/config.h b/src/core/config.h index 55232f06..4e3691a0 100644 --- a/src/core/config.h +++ b/src/core/config.h @@ -449,7 +449,7 @@ static_assert(false, "SUPPORT_XBOX_SCRIPT and SUPPORT_MOBILE_SCRIPT are mutually //#define AUDIO_OAL_USE_SNDFILE // use libsndfile to decode WAVs instead of our internal decoder #define AUDIO_OAL_USE_MPG123 // use mpg123 to support mp3 files #define PAUSE_RADIO_IN_FRONTEND // pause radio when game is paused -#define ATTACH_RELEASING_SOUNDS_TO_ENTITIES // ped comments coordinates would update following ped entity +#define ATTACH_RELEASING_SOUNDS_TO_ENTITIES // sounds would follow ped and vehicles coordinates if not being queued otherwise #define USE_TIME_SCALE_FOR_AUDIO // slow down/speed up sounds according to the speed of the game #define MULTITHREADED_AUDIO // for streams. requires C++11 or later |