Commit Graph

1358 Commits

Author SHA1 Message Date
Nikolay Korolev a1c241af37 script revision p2 2021-08-30 02:46:28 +03:00
Nikolay Korolev 453f8c05a4 script revision p1 2021-08-29 19:32:22 +03:00
Nikolay e865e65955 fix 2021-08-28 14:22:52 +03:00
Nikolay 2a69f34f93
fix 2021-08-27 19:53:51 +03:00
Nikolay Korolev cc9398df14 cleanup 2021-08-26 00:38:00 +03:00
Nikolay Korolev 9187873396 Onscreen timer 2021-08-26 00:34:31 +03:00
Nikolay Korolev 381d0b4e3e revision 2021-08-23 11:00:09 +03:00
Nikolay Korolev 5cb1c8580d activate command 2021-08-22 13:22:31 +03:00
Nikolay Korolev 6b958b957e car ctrl fixes 2021-08-20 20:50:59 +03:00
Nikolay Korolev fe1e1ec8c7 fix 2021-08-20 20:40:40 +03:00
Nikolay Korolev 811729ab41 small refactoring 2021-08-20 17:56:48 +03:00
Nikolay Korolev 8e2ed40f66 small revision 2021-08-16 01:03:08 +03:00
Nikolay Korolev 9ba2f7d43c fix 2021-08-15 23:32:10 +03:00
Nikolay Korolev 495a447c8a merged correct switch 2021-08-15 18:43:30 +03:00
Nikolay Korolev 25075decb2 bruh 2021-08-15 18:43:26 +03:00
Nikolay Korolev 1b178a55d7 actual fix 2021-08-15 18:43:22 +03:00
Nikolay Korolev e30e1ccccd lil fix 2021-08-15 18:43:19 +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
Sergeanur 9a1b826021 Merge remote-tracking branch 'origin/miami' into lcs 2021-08-12 11:43:17 +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 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 1f98f01dcb Fix a bunch of CModelInfo::GetModelInfo->GetColModel calls 2021-08-09 18:14:19 +03: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 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
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 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