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
|
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
|
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
|
ab03fbb6c8
|
Make UpdateReflections a bit more binary exact + small code changes to sync with miami
|
2021-08-16 09:59:08 +03:00 |
|
Sergeanur
|
9ed94f310a
|
Fix CW build
|
2021-08-16 09:57:40 +03:00 |
|
aap
|
77f692c669
|
some CAutomobile fixes
|
2021-08-16 00:26:01 +02:00 |
|
aap
|
97aeb85d84
|
some CAutomobile fixes
|
2021-08-16 00:25:47 +02:00 |
|
Nikolay Korolev
|
7d1cfe50af
|
Merge remote-tracking branch 'upstream/miami' into miami
|
2021-08-15 23:30:52 +03:00 |
|
Nikolay Korolev
|
dec09bde1c
|
fix
|
2021-08-15 23:30:25 +03:00 |
|
erorcun
|
9deabc7b60
|
Merge pull request #1295 from erorcun/miami
Fix impossible bullets
|
2021-08-15 18:44:30 +03:00 |
|
Nikolay Korolev
|
6bdfb0d386
|
merged correct switch
|
2021-08-15 18:41:59 +03:00 |
|
Nikolay Korolev
|
26e5a7eed1
|
bruh
|
2021-08-15 18:41:19 +03:00 |
|
Nikolay Korolev
|
4b4aefe339
|
bruh
|
2021-08-15 18:40:38 +03:00 |
|
Nikolay Korolev
|
042284de8b
|
actual fix
|
2021-08-15 18:36:48 +03:00 |
|
Nikolay Korolev
|
c48f6e9bda
|
actual fix
|
2021-08-15 18:35:47 +03:00 |
|
erorcun
|
435b8fe52e
|
Fix impossible bullets
|
2021-08-15 18:34:43 +03:00 |
|
Nikolay Korolev
|
3441714a13
|
lil fix
|
2021-08-15 18:28:34 +03:00 |
|
Nikolay Korolev
|
5fe04940be
|
lil fix
|
2021-08-15 18:27:30 +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
|
886650a887
|
Fix CW build
|
2021-08-15 13:12:10 +03:00 |
|
erorcun
|
747ae04279
|
Fix premature .ini saving leading to missing bindings
|
2021-08-15 04:07:48 +03:00 |
|
erorcun
|
f4e723e690
|
Fix .ini fix for glfw
|
2021-08-15 03:59:12 +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 |
|
Nikolay Korolev
|
eadf0496bf
|
fixed heli buoyancy
|
2021-08-14 23:31:32 +03:00 |
|
erorcun
|
4a5f7464c1
|
Switch PR & remove X11 part from CMakeLists
|
2021-08-14 18:09:07 +03:00 |
|
Nikolay Korolev
|
958e2f36bb
|
ginput script
|
2021-08-14 16:44:09 +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
|
0a2df3ca4c
|
Fix sampman_null
|
2021-08-12 15:03:38 +03:00 |
|
Sergeanur
|
8759c2edf0
|
Sync fixes from miami
|
2021-08-12 15:01:58 +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
|
f1545daeae
|
Rename unused audio member
|
2021-08-12 11:46:10 +03:00 |
|
Sergeanur
|
4f8993e19b
|
Replace static_assert with #error
|
2021-08-12 11:39:34 +03:00 |
|
Sergeanur
|
2ef43e8d1a
|
Fix sampman_null
|
2021-08-12 11:39:34 +03:00 |
|
Sergeanur
|
ce78081a7f
|
Put more things under ifdef
|
2021-08-12 11:39:34 +03:00 |
|
Sergeanur
|
6c2d179aad
|
Add define to enable/disable external 3d audio simulation
|
2021-08-12 11:39:34 +03:00 |
|
Nikolay Korolev
|
b99edf9a6b
|
mission retry fix
|
2021-08-12 11:23:10 +03:00 |
|
Sergeanur
|
2eb0390dc9
|
Fix unset emitting volume for sawmill
|
2021-08-11 13:35:50 +03:00 |
|
Sergeanur
|
f131f70761
|
Fix unset emitting volume for moan sound
|
2021-08-11 12:10:48 +03:00 |
|
Sergeanur
|
75f812cfcd
|
Merge branch 'master' into miami
# Conflicts:
# src/control/CarCtrl.cpp
# src/control/RoadBlocks.cpp
# src/core/Radar.cpp
# src/core/Radar.h
# src/peds/Ped.cpp
# src/peds/Population.cpp
# src/renderer/Renderer.cpp
# src/vehicles/CarGen.cpp
|
2021-08-11 09:32:59 +03:00 |
|
Sergeanur
|
463fdab6a4
|
Fix a bunch of CModelInfo::GetModelInfo->GetColModel calls, part 2
|
2021-08-11 08:42:26 +03:00 |
|
Sergeanur
|
d7a28c4d2b
|
Fix a bunch of CModelInfo::GetModelInfo->GetColModel calls
|
2021-08-11 08:35:01 +03:00 |
|