Commit graph

34 commits

Author SHA1 Message Date
Sergeanur
7c2b9478d5 Merge branch 'master' into miami
# Conflicts:
#	src/control/Garages.cpp
#	src/core/FileLoader.cpp
#	src/core/Streaming.cpp
#	src/core/Zones.cpp
#	src/core/Zones.h
#	src/render/Renderer.cpp
#	src/rw/VisibilityPlugins.cpp
2020-05-13 00:55:52 +03:00
Filip Gawin
c2ac6b3759 Fix linux warnings 2020-05-12 23:18:54 +02:00
Nikolay Korolev
7e753c2596 CCarCtrl::GenerateOneRandomCar 2020-05-08 23:29:43 +03:00
Nikolay Korolev
918d6dbf56 some more miami 2020-05-05 20:22:13 +03:00
Nikolay Korolev
6b4b708fa7 skipped one def 2020-05-05 19:06:24 +03:00
Nikolay Korolev
edeb8736f1 remove ifdefs 2020-05-05 18:20:10 +03:00
Sergeanur
cb8ffbac73 Revert "Remove #endif"
This reverts commit 7200a783ee.
2020-05-05 18:07:43 +03:00
Sergeanur
74b522af71 Merge branch 'master' into miami 2020-05-05 18:07:33 +03:00
Sergeanur
7200a783ee Remove #endif 2020-05-05 18:07:08 +03:00
Sergeanur
c2b9ddc5b8 Revert "Remove Miami stuff"
This reverts commit 9960c41193.
2020-05-05 18:04:43 +03:00
Sergeanur
9960c41193 Remove Miami stuff 2020-05-05 18:04:18 +03:00
Nikolay Korolev
ae0c83fa01 CAutoPilot + CCarAI + fixes 2020-05-05 14:40:35 +03:00
Sergeanur
7d758f3a9f Adding getters and setters for type and status 2020-04-30 16:45:45 +03:00
Filip Gawin
370c4e48cd Try to build with mingw 2020-04-20 18:18:46 +02:00
Sergeanur
599164006a Remove patches 2020-04-17 16:31:11 +03:00
Fire-Head
a4922d5cb7 rem refs 2020-04-17 08:54:14 +03:00
eray orçunus
112685ebac CCopPed done and #include cleanup 2020-03-28 18:52:25 +03:00
Nikolay Korolev
85d815cf9d bug fixes 2020-02-15 23:30:51 +03:00
Nikolay Korolev
76b8e09de5 fix ai bug (2) 2020-02-02 12:28:23 +03:00
Sergeanur
bbc68ffb1c AccidentManager 2020-01-11 15:14:02 +02:00
Filip Gawin
8808e6fdfe Fixes for aap review (audio8) 2019-10-26 13:05:00 +02:00
Filip Gawin
43866a4f70 Fix rebasing 2019-10-26 13:05:00 +02:00
Sergeanur
5b1ffb0912 Some CPool and CPools funcs, restoring original logic of pool lookup loops 2019-10-17 00:53:25 +03:00
Nikolay Korolev
545bd3322c
quick fix 2019-10-13 20:13:39 +03:00
Sergeanur
7c6c649823 Fix typo in CCarAI::GetCarToGoToCoors 2019-10-12 12:16:39 +03:00
Nikolay Korolev
803412f33b CCarAI + bugfixes 2019-10-11 00:02:55 +03:00
Nikolay Korolev
4b4e5abffd fixed bugs 2019-10-08 23:57:21 +03:00
Nikolay Korolev
26f7691031 car AI 2019-10-06 14:25:13 +03:00
Nikolay Korolev
368ce0d4e5 CCarCtrl 2019-09-15 02:28:07 +03:00
Nikolay Korolev
57f24ad533 more CCarCtrl 2019-09-14 20:53:04 +03:00
Nikolay Korolev
14b945ba08 more CCarCtrl 2019-08-11 20:11:54 +03:00
Nikolay Korolev
4ae4bc94c6 CCarCtrl::GenerateOneRandomVehicle! 2019-08-07 00:32:19 +03:00
aap
fd01f9b25c CAutomobile::ProcessControl done 2019-07-18 15:41:09 +02:00
aap
0f1fbf5e9a renamed some variables and added files; more CAutomobile::ProcessControl 2019-07-17 13:19:20 +02:00