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
2be8fcfa64
Merge remote-tracking branch 'origin/miami' into lcs
...
# Conflicts:
# src/audio/AudioManager.cpp
# src/core/Radar.cpp
2021-08-29 08:58:54 +03:00
Nikolay Korolev
7a80acf6a1
fix debug teleport
2021-08-26 21:56:31 +03:00
Nikolay Korolev
915888d275
fixed debug teleport
2021-08-26 21:14:26 +03:00
Nikolay Korolev
d750a1101b
fix
2021-08-25 14:44:47 +03:00
Sergeanur
f87f14b432
Refactor cPedComments
2021-08-25 13:41:53 +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
aap
5f7de20cde
modelinfo bits
2021-08-24 19:16:17 +02:00
Sergeanur
a5ec7a45db
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
2021-08-24 15:19:35 +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
38f4ea7aa3
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 13:11:36 +03:00
erorcun
e9a61ca38c
Adjust plane free cam values for sparks to be visible in Dodo
2021-08-23 21:56:22 +03:00
Sergeanur
ef0ba763b9
Make ped comments update position and volume + fix cPedComments::Process
2021-08-23 11:16:53 +03:00
Sergeanur
ceb65eafa5
Make ped comments update position and volume
2021-08-23 11:15:03 +03:00
erorcun
09f693b9b9
Cam: Fix can't look to right on BEHINDCAR
2021-08-22 12:25:43 +03:00
erorcun
f86bdb2cdb
Fix map teleport Z coordinate
2021-08-21 17:15:30 +03:00
aap
aed313d81c
CAutomobile done
2021-08-20 10:33:02 +02: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
aap
c707f92d0a
disable movies by default; update librw
2021-08-17 23:22:36 +02:00
Sergeanur
16ff379ebe
Add AUDIO_REFLECTIONS define, fix a bunch of types, fix heli chatter intensity
2021-08-17 13:58:48 +03:00
erorcun
8641e9d0bb
Switch PR & remove X11 part from CMakeLists
2021-08-16 20:02:40 +03:00
Sergeanur
0c55f331cf
Merge branch 'miami' into lcs
2021-08-16 14:32:15 +03:00
Sergeanur
cd0a765f66
Merge branch 'master' into miami
...
# Conflicts:
# src/audio/AudioCollision.cpp
# src/audio/AudioLogic.cpp
# src/audio/AudioManager.cpp
# src/audio/AudioManager.h
# src/audio/sampman.h
# src/audio/sampman_miles.cpp
# src/core/Frontend.cpp
# src/core/MenuScreens.cpp
# src/core/MenuScreensCustom.cpp
# src/core/common.h
# src/core/config.h
# src/vehicles/Automobile.cpp
2021-08-16 14:13:31 +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
aap
f4894952fc
Merge branch 'lcs' of github.com:GTAmodding/re3 into lcs
2021-08-16 00:25:14 +02:00
aap
2f92ccecb1
work on CAutomobile
2021-08-16 00:19:09 +02:00
Nikolay Korolev
8e2ed40f66
small revision
2021-08-16 01:03:08 +03:00
erorcun
747ae04279
Fix premature .ini saving leading to missing bindings
2021-08-15 04:07:48 +03:00
erorcun
0db14d718c
All the sliders, unite
2021-08-15 03:39:38 +03:00
erorcun
fd52285074
Fix premature .ini saving leading to missing bindings
2021-08-15 03:29:49 +03:00
erorcun
4a5f7464c1
Switch PR & remove X11 part from CMakeLists
2021-08-14 18:09:07 +03:00
Nikolay Korolev
39d2c427e5
merge miami
2021-08-14 17:18:34 +03:00
Nikolay Korolev
958e2f36bb
ginput script
2021-08-14 16:44:09 +03:00
Nikolay Korolev
ba859dc3b5
fix
2021-08-14 16:31:34 +03:00
erorcun
3a95c77c9e
Revert "map memory usage high default"
...
This reverts commit 81c6c5e47a
.
2021-08-13 00:51:05 +03:00
erorcun
df89e5091e
Revert "map memory usage high default"
...
This reverts commit b7c7c883d7
.
2021-08-13 00:16:16 +03:00
withmorten
81c6c5e47a
map memory usage high default
2021-08-12 23:08:33 +02:00
withmorten
b7c7c883d7
map memory usage high default
2021-08-12 23:07:54 +02: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
43fbf297c8
Waypoint text fix
2021-08-12 14:15:49 +03:00
Sergeanur
033d89a9ab
Refactor cAudioManager::ProcessActiveQueues, fix doppler effect
2021-08-12 13:01:07 +03:00
Sergeanur
9a1b826021
Merge remote-tracking branch 'origin/miami' into lcs
2021-08-12 11:43:17 +03:00