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
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
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
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
ec22576e49
Merge remote-tracking branch 'aap/lcs' into lcs
...
# Conflicts:
# src/vehicles/Vehicle.cpp
# src/vehicles/Vehicle.h
2021-08-12 11:45:25 +03:00
Sergeanur
9a1b826021
Merge remote-tracking branch 'origin/miami' into lcs
2021-08-12 11:43:17 +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
Nikolay Korolev
cb35f78511
lil fix
2021-08-12 01:30:26 +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
68c37d2d88
Reverse miami vice ped comments
2021-08-11 10:55:00 +03:00
Sergeanur
80dc23621e
uncomment GetSpecialCharacterTalkSfx
2021-08-11 10:47:02 +03:00
Sergeanur
b289bb4edb
Reverse special characters' ped comments
2021-08-11 10:09:20 +03:00
Sergeanur
2c79080e1b
Merge branch 'miami' into lcs
...
# Conflicts:
# src/core/Radar.cpp
# src/core/Radar.h
2021-08-11 09:36:58 +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
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
withmorten
ab5965cc8d
fix steam saves
2021-08-09 16:36:15 +02:00
withmorten
858f913fac
small fix
2021-08-09 16:34:05 +02:00
Nikolay Korolev
4b7dc08bf5
debug func fix
2021-08-09 00:57:18 +03:00
Nikolay Korolev
c851d9a6ba
Merge branch 'miami' into lcs
2021-08-09 00:08:42 +03:00
Nikolay Korolev
3869369703
Merge remote-tracking branch 'upstream/miami' into miami
2021-08-09 00:07:50 +03:00
Nikolay Korolev
2ee32abf84
fix bug in CCurves
2021-08-09 00:07:02 +03:00
Nikolay Korolev
c5af250959
debug func
2021-08-08 23:48:07 +03:00
Barracuda6
42ad9c4378
Comment out text following #endif
2021-08-08 18:09:56 +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
729ef37040
merge
2021-08-08 17:44:38 +03:00
Nikolay Korolev
4673f509f6
Revert "small fix"
...
This reverts commit bd96584433
.
2021-08-08 17:42:32 +03:00
Nikolay Korolev
35dd465c19
Revert "small fix"
...
This reverts commit bd96584433
.
2021-08-08 17:41:35 +03:00
Nikolay Korolev
7b9d8c5a1f
merge
2021-08-08 17:36:08 +03:00
Nikolay Korolev
8d9508bda4
Merge branch 'master' into miami
2021-08-08 17:34:28 +03:00
Nikolay Korolev
bd96584433
small fix
2021-08-08 17:34:03 +03:00
Nikolay Korolev
68db861c45
merge
2021-08-08 17:29:57 +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
74f00c3c63
merge
2021-08-08 15:46:47 +03:00
Nikolay Korolev
668311a444
Merge branch 'master' into miami
2021-08-08 15:44:18 +03:00
Nikolay Korolev
15f770531c
fixed tab
2021-08-08 15:42:44 +03:00
Nikolay Korolev
88b4c7b50b
merge
2021-08-08 15:34:02 +03:00
Nikolay Korolev
9cc1201892
merge
2021-08-08 13:38:21 +03:00
Nikolay Korolev
e6b1a0691b
lcs bridge
2021-08-08 13:08:47 +03:00
Nikolay Korolev
0c4ab5b609
disable mission replay for lcs
2021-08-08 10:51:04 +03:00
Nikolay Korolev
2672504e8a
more cherry-pick fix
2021-08-07 20:40:27 +03:00
Nikolay Korolev
a7e86e0510
cherrypick fixes
2021-08-07 20:40:18 +03:00
Nikolay Korolev
827f0ffbb6
move debug
2021-08-07 20:35:01 +03:00
Nikolay Korolev
883e8390c9
move debug script stuff to a separate file
2021-08-07 20:26:33 +03:00
Nikolay Korolev
c69edce800
mission replay
2021-08-07 20:24:01 +03:00
Nikolay Korolev
747705d430
lcs specific hack
2021-08-07 20:03:45 +03:00
Nikolay
e947081622
Merge pull request #1266 from Nick007J/miami
...
Mission replay
2021-08-07 18:47:28 +03:00
aap
621f941ff7
CVehicle done
2021-08-04 13:56:29 +02:00
aap
bec1cbc1cb
CVehicle fixes and cleanup
2021-08-04 13:54:26 +02:00
aap
4f461bd7be
CVehicle fixes and cleanup
2021-08-04 13:54:04 +02:00
Nikolay Korolev
80d00fe31a
more cherry-pick fix
2021-08-03 22:20:14 +03:00
Nikolay Korolev
6fbb7da82d
cherrypick fixes
2021-08-03 22:14:58 +03:00
Nikolay Korolev
5a22896197
move debug
2021-08-03 21:53:45 +03:00
Nikolay Korolev
8bcbee4ea7
move debug script stuff to a separate file
2021-08-03 21:53:42 +03:00
Nikolay Korolev
5999ddc76d
Merge remote-tracking branch 'upstream/miami' into miami
2021-08-03 21:44:18 +03:00
aap
0338d4c393
CPhysical almost done
2021-08-02 20:05:39 +02:00
aap
4a047f56bc
CPhysical fixes and cleanup
2021-08-02 20:02:57 +02:00
aap
09748d094a
CPhysical fixes and cleanup
2021-08-02 20:02:35 +02:00
Sergeanur
cb5586e658
Merge pull request #1268 from Nick007J/master
...
move debug stuff to a separate file
2021-08-02 15:06:40 +03:00
Sergeanur
865ce46fdb
Fix waypoint disappearing after each save
2021-08-02 14:26:00 +03:00
Nikolay Korolev
2b99f2634b
sync
2021-08-01 14:00:16 +03:00
Nikolay Korolev
6d7dec96af
move debug script stuff to a separate file
2021-08-01 13:58:15 +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
erorcun
0542b1bd4d
Fix radio scroll when player controls disabled
2021-07-31 23:03:59 +03:00
erorcun
e80cbf8bb2
Fix radio scroll when player controls disabled
2021-07-31 22:57:54 +03:00
Sergeanur
a481b900b9
Merge branch 'miami' into lcs
...
# Conflicts:
# src/control/CarCtrl.cpp
# src/modelinfo/MloModelInfo.cpp
# src/modelinfo/MloModelInfo.h
# src/renderer/Renderer.cpp
# src/rw/VisibilityPlugins.cpp
# src/rw/VisibilityPlugins.h
2021-07-31 20:43:52 +03:00
Magnus Larsen
d923cd2f24
Allow sector ped count to exceed gap-list size
...
This solves the gnNumTempPedList assertion.
To prove this works, change gapTempPedList's length to 12, and visit the
Triad's basketball court.
# Conflicts:
# src/peds/Ped.cpp
2021-07-31 20:34:32 +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
aap
bf035b8167
Merge pull request #1259 from aap/lcs
...
CVisibilityPlugins, CRenderer, some fixes
2021-07-31 19:08:01 +02: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
Sergeanur
e8dcc8432d
Possible crashfix with wanted level
2021-07-30 20:36:07 +03:00
aap
3f3e258d77
CVisibilityPlugins, CRenderer, some fixes
2021-07-29 19:59:34 +02:00
aap
3c5bae164f
CVisibilityPlugins and CRenderer fixes
2021-07-29 19:43:47 +02:00
aap
30061396e8
CVisibilityPlugins and CRenderer fixes; pulled MLO back in
2021-07-29 19:43:06 +02:00
Sergeanur
b77d93ba4a
Merge branch 'miami' into lcs
...
# Conflicts:
# src/audio/AudioLogic.cpp
2021-07-29 01:59:20 +03:00
Sergeanur
7bacf3b6f4
Reverse unused audio functions
2021-07-29 01:52:49 +03:00
Sergeanur
cce97588fe
Reverse unused audio functions from mobile
...
# Conflicts:
# src/audio/AudioManager.h
2021-07-29 00:43:04 +03:00
Sergeanur
6cea1de9e6
Reverse unused audio functions from mobile
2021-07-29 00:40:32 +03:00
Sergeanur
81673ab304
Fix comments
2021-07-28 10:36:18 +03:00
Sergeanur
04126cd18a
Merge branch 'miami' into lcs
2021-07-28 10:32:58 +03:00
Sergeanur
2aa37813d2
cAudioManager declaration reordering
2021-07-28 10:32:43 +03:00
Sergeanur
92679555b9
Merge branch 'miami' into lcs
...
# Conflicts:
# src/audio/AudioLogic.cpp
# src/audio/MusicManager.cpp
2021-07-28 09:42:24 +03:00
Sergeanur
8960ffaf0b
Get rid of audio getters
2021-07-28 09:39:57 +03:00
Sergeanur
7adc85995f
Merge branch 'miami' into lcs
...
# Conflicts:
# src/audio/AudioLogic.cpp
# src/audio/AudioManager.h
2021-07-28 09:24:23 +03:00
Sergeanur
61176acbad
Ped comments ordering and type fix + vice function(s) fix
2021-07-28 09:17:38 +03:00
Sergeanur
98003d0d41
Merge branch 'miami' into lcs
...
# Conflicts:
# src/audio/AudioLogic.cpp
2021-07-28 00:56:42 +03:00
Sergeanur
49ee711c75
AudioLogic type fixes and reordering (after peds)
2021-07-28 00:55:22 +03:00
Sergeanur
029e315f0a
Merge branch 'miami' into lcs
...
# Conflicts:
# src/audio/AudioLogic.cpp
2021-07-28 00:42:18 +03:00
Sergeanur
16f892b667
AudioLogic type fixes and reordering (before peds)
2021-07-28 00:41:34 +03:00
Sergeanur
f82c3c8ea7
Merge branch 'miami' into lcs
2021-07-27 22:39:14 +03:00
Sergeanur
9dbaa7a77f
PolRadio type fixes
2021-07-27 22:38:57 +03:00
Sergeanur
d0666a8702
One more type fix
2021-07-27 22:38:35 +03:00
Sergeanur
16e2e3d091
Type fix
2021-07-27 22:32:47 +03:00
Sergeanur
fbb42085bd
Merge branch 'miami' into lcs
2021-07-27 22:30:45 +03:00
Sergeanur
7aa8d7c073
AudioManager.cpp reordering
2021-07-27 22:29:40 +03:00
Nikolay Korolev
c4f5cbce5e
fix
2021-07-27 22:27:13 +03:00
Nikolay Korolev
c26a57fb9f
fix
2021-07-27 22:18:24 +03:00
Sergeanur
ad2ccdb44a
Merge branch 'miami' into lcs
2021-07-27 22:02:45 +03:00
Sergeanur
782d38c6b7
Sort AudioCollision functions into original order
2021-07-27 22:02:25 +03:00
Sergeanur
5240dce018
cAudioManager::GetCollisionOneShotRatio cleanup
2021-07-27 22:01:17 +03:00
erorcun
1eedf7f0ae
Merge pull request #1257 from Nopey/fixbugs_pedgaplist
...
Fix bug triggering gnNumTempPedList assertion
2021-07-27 21:51:28 +03:00
Sergeanur
ec7d702185
Merge pull request #1255 from Nick007J/lcs
...
low effort save support
2021-07-27 20:59:08 +03:00
Sergeanur
6dc8c5bd92
Merge branch 'miami' into lcs
2021-07-27 20:58:17 +03:00
Magnus Larsen
55e83982c3
Remove static_assert from previous commit
2021-07-27 00:23:40 -07:00
Magnus Larsen
388dd5cb00
Allow sector ped count to exceed gap-list size
...
This solves the gnNumTempPedList assertion.
To prove this works, change gapTempPedList's length to 12, and visit the
Triad's basketball court.
2021-07-26 19:50:10 -07:00
Nikolay Korolev
0461a36a4e
fix
2021-07-26 21:59:56 +03:00
Nikolay Korolev
9e374491c5
Merge remote-tracking branch 'upstream/lcs' into lcs
2021-07-26 21:58:37 +03:00
withmorten
d77ed4608f
fix
2021-07-26 20:25:36 +02:00