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