|
|
cb35f78511
|
lil fix
|
2021-08-12 01:30:26 +03:00 |
|
|
|
2c79080e1b
|
Merge branch 'miami' into lcs
# Conflicts:
# src/core/Radar.cpp
# src/core/Radar.h
|
2021-08-11 09:36:58 +03:00 |
|
|
|
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 |
|
|
|
463fdab6a4
|
Fix a bunch of CModelInfo::GetModelInfo->GetColModel calls, part 2
|
2021-08-11 08:42:26 +03:00 |
|
|
|
d7a28c4d2b
|
Fix a bunch of CModelInfo::GetModelInfo->GetColModel calls
|
2021-08-11 08:35:01 +03:00 |
|
|
|
1f98f01dcb
|
Fix a bunch of CModelInfo::GetModelInfo->GetColModel calls
|
2021-08-09 18:14:19 +03:00 |
|
|
|
4b7dc08bf5
|
debug func fix
|
2021-08-09 00:57:18 +03:00 |
|
|
|
c851d9a6ba
|
Merge branch 'miami' into lcs
|
2021-08-09 00:08:42 +03:00 |
|
|
|
2ee32abf84
|
fix bug in CCurves
|
2021-08-09 00:07:02 +03:00 |
|
|
|
c5af250959
|
debug func
|
2021-08-08 23:48:07 +03:00 |
|
|
|
729ef37040
|
merge
|
2021-08-08 17:44:38 +03:00 |
|
|
|
4673f509f6
|
Revert "small fix"
This reverts commit bd96584433.
|
2021-08-08 17:42:32 +03:00 |
|
|
|
35dd465c19
|
Revert "small fix"
This reverts commit bd96584433.
|
2021-08-08 17:41:35 +03:00 |
|
|
|
7b9d8c5a1f
|
merge
|
2021-08-08 17:36:08 +03:00 |
|
|
|
8d9508bda4
|
Merge branch 'master' into miami
|
2021-08-08 17:34:28 +03:00 |
|
|
|
bd96584433
|
small fix
|
2021-08-08 17:34:03 +03:00 |
|
|
|
68db861c45
|
merge
|
2021-08-08 17:29:57 +03:00 |
|
|
|
873840a6a5
|
merge
|
2021-08-08 17:19:49 +03:00 |
|
|
|
947f67dfb7
|
small fix
|
2021-08-08 17:17:20 +03:00 |
|
|
|
478bdcc1ca
|
merge
|
2021-08-08 17:14:21 +03:00 |
|
|
|
63046894b0
|
small refactoring
|
2021-08-08 16:57:37 +03:00 |
|
|
|
74f00c3c63
|
merge
|
2021-08-08 15:46:47 +03:00 |
|
|
|
88b4c7b50b
|
merge
|
2021-08-08 15:34:02 +03:00 |
|
|
|
9cc1201892
|
merge
|
2021-08-08 13:38:21 +03:00 |
|
|
|
e6b1a0691b
|
lcs bridge
|
2021-08-08 13:08:47 +03:00 |
|
|
|
0c4ab5b609
|
disable mission replay for lcs
|
2021-08-08 10:51:04 +03:00 |
|
|
|
2672504e8a
|
more cherry-pick fix
|
2021-08-07 20:40:27 +03:00 |
|
|
|
a7e86e0510
|
cherrypick fixes
|
2021-08-07 20:40:18 +03:00 |
|
|
|
827f0ffbb6
|
move debug
|
2021-08-07 20:35:01 +03:00 |
|
|
|
883e8390c9
|
move debug script stuff to a separate file
|
2021-08-07 20:26:33 +03:00 |
|
|
|
c69edce800
|
mission replay
|
2021-08-07 20:24:01 +03:00 |
|
|
|
80d00fe31a
|
more cherry-pick fix
|
2021-08-03 22:20:14 +03:00 |
|
|
|
6fbb7da82d
|
cherrypick fixes
|
2021-08-03 22:14:58 +03:00 |
|
|
|
5a22896197
|
move debug
|
2021-08-03 21:53:45 +03:00 |
|
|
|
8bcbee4ea7
|
move debug script stuff to a separate file
|
2021-08-03 21:53:42 +03:00 |
|
|
|
5999ddc76d
|
Merge remote-tracking branch 'upstream/miami' into miami
|
2021-08-03 21:44:18 +03:00 |
|
|
|
2b99f2634b
|
sync
|
2021-08-01 14:00:16 +03:00 |
|
|
|
6d7dec96af
|
move debug script stuff to a separate file
|
2021-08-01 13:58:15 +03:00 |
|
|
|
192190769d
|
Add ped and car density slider to menu, remove dumb collision "optimization"
|
2021-08-01 13:56:09 +03:00 |
|
|
|
1479093d33
|
Merge remote-tracking branch 'upstream/miami' into miami
|
2021-08-01 12:54:20 +03:00 |
|
|
|
70080f1fdb
|
mission replay
|
2021-08-01 12:54:05 +03:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
ec7d702185
|
Merge pull request #1255 from Nick007J/lcs
low effort save support
|
2021-07-27 20:59:08 +03:00 |
|
|
|
6dc8c5bd92
|
Merge branch 'miami' into lcs
|
2021-07-27 20:58:17 +03:00 |
|
|
|
0461a36a4e
|
fix
|
2021-07-26 21:59:56 +03:00 |
|
|
|
f73dfa12e6
|
Make cars and peds to not despawn when you look away
|
2021-07-26 04:43:26 +03:00 |
|
|
|
ed9c911a0e
|
Fix traffic light corona facing wrong side
|
2021-07-26 04:40:23 +03:00 |
|
|
|
c7d3b88cb7
|
Merge remote-tracking branch 'upstream/lcs' into lcs
|
2021-07-25 21:44:31 +03:00 |
|
|
|
bf4b39781b
|
low effort save support
|
2021-07-25 21:44:21 +03:00 |
|
