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
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
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
e17504a36a
Merge branch 'master' into miami
2021-08-08 17:43:07 +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
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
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
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
e947081622
Merge pull request #1266 from Nick007J/miami
...
Mission replay
2021-08-07 18:47:28 +03: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
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
erorcun
ae1deb2209
Merge pull request #1267 from erorcun/miami
...
Add ped&car density sliders, fix peds don't spawn
2021-08-02 18:23:06 +03: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
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
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