Sergeanur
a13089cd2e
Port audio changes from master
2021-08-18 15:49:06 +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
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
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
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
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
4f8993e19b
Replace static_assert with #error
2021-08-12 11:39:34 +03:00
Sergeanur
ce78081a7f
Put more things under ifdef
2021-08-12 11:39:34 +03:00
Nikolay Korolev
b99edf9a6b
mission retry fix
2021-08-12 11:23:10 +03:00
Sergeanur
d7a28c4d2b
Fix a bunch of CModelInfo::GetModelInfo->GetColModel calls
2021-08-11 08:35:01 +03:00
Sergeanur
0544beb00d
Add sprite to the waypoint marker
2021-08-11 08:15:30 +03:00
Sergeanur
1f98f01dcb
Fix a bunch of CModelInfo::GetModelInfo->GetColModel calls
2021-08-09 18:14:19 +03:00
Sergeanur
8ea411e4c5
Add sprite to the waypoint marker
2021-08-09 18:07:42 +03:00
Sergeanur
76a22c0d13
Fix
2021-08-08 18:02:23 +03:00
Sergeanur
f887d515fa
Sync fix from miami
2021-08-08 17:53:01 +03:00
Nikolay Korolev
873840a6a5
merge
2021-08-08 17:19:49 +03:00
Nikolay Korolev
947f67dfb7
small fix
2021-08-08 17:17:20 +03:00
Nikolay Korolev
478bdcc1ca
merge
2021-08-08 17:14:21 +03:00
Nikolay Korolev
63046894b0
small refactoring
2021-08-08 16:57:37 +03:00
Nikolay Korolev
88b4c7b50b
merge
2021-08-08 15:34:02 +03:00
Nikolay Korolev
5999ddc76d
Merge remote-tracking branch 'upstream/miami' into miami
2021-08-03 21:44:18 +03:00
Sergeanur
865ce46fdb
Fix waypoint disappearing after each save
2021-08-02 14:26:00 +03:00
erorcun
418bf3ab69
Fix R* optimization that prevents peds to spawn
2021-08-01 13:56:24 +03:00
erorcun
192190769d
Add ped and car density slider to menu, remove dumb collision "optimization"
2021-08-01 13:56:09 +03:00
Nikolay Korolev
1479093d33
Merge remote-tracking branch 'upstream/miami' into miami
2021-08-01 12:54:20 +03:00
Nikolay Korolev
70080f1fdb
mission replay
2021-08-01 12:54:05 +03:00
Sergeanur
835fa4e74b
Make cars and peds to not despawn when you look away
...
# Conflicts:
# src/control/CarCtrl.cpp
# src/core/config.h
# src/peds/Population.cpp
2021-07-31 20:32:13 +03:00
Sergeanur
232b5a04ba
Merge pull request #1251 from Sergeanur/HigherDrawDist
...
Make cars and peds to not despawn when you look away
2021-07-31 20:07:29 +03:00
Sergeanur
9d25e7f315
Merge pull request #1248 from davicr/radar-cutscene-bugfix
...
Fix blip rendering during scripted sequences
2021-07-31 20:06:20 +03:00
aap
3c5bae164f
CVisibilityPlugins and CRenderer fixes
2021-07-29 19:43:47 +02:00
withmorten
d77ed4608f
fix
2021-07-26 20:25:36 +02:00
Sergeanur
f73dfa12e6
Make cars and peds to not despawn when you look away
2021-07-26 04:43:26 +03:00
Sergeanur
bf757fc960
Fix CPlayerInfo distance types
2021-07-24 00:59:19 +03:00
Davi
bd3c3849fe
Properly fix blip rendering during scripted sequences
...
Changes conditionals from "DrawBlips" and "ShowRadarTrace", "ShowRadarTraceWithHeight" to allow blips to be rendered during scripted sequences when "MENU_MAP" is enabled.
2021-07-22 16:10:15 -03:00
withmorten
a437d2bc26
fix garbage data written in garage save block
2021-07-19 23:43:51 +02:00
withmorten
c8cb1ed013
Merge pull request #1219 from withmorten/miami-ini
...
miami: switch out current ini_parser.hpp with pulzed/mINI
2021-07-15 18:56:14 +02:00
Sergeanur
780cd225e9
Make PS2 VB files work together with PC audio files
2021-07-15 18:06:12 +03:00
Sergeanur
2ce36a48b9
Make PS2 VB files work together with PC audio files
2021-07-15 18:06:02 +03:00
Sergeanur
02c4ada807
Remove stupid cast
2021-07-15 00:49:46 +03:00
Sergeanur
4f78733836
Remove stupid cast
2021-07-15 00:47:11 +03:00
