Commit graph

11 commits

Author SHA1 Message Date
Sergeanur
cea6b20c09 Merge remote-tracking branch 'origin/miami' into lcs
# Conflicts:
#	src/animation/CutsceneMgr.cpp
#	src/control/CarCtrl.cpp
#	src/control/Script.cpp
#	src/control/Script2.cpp
#	src/core/Frontend.cpp
#	src/core/main.cpp
#	src/entities/Physical.cpp
#	src/peds/Ped.cpp
#	src/peds/PedAI.cpp
#	src/text/Messages.cpp
#	src/vehicles/Cranes.cpp
#	src/vehicles/Transmission.cpp
2021-01-22 15:04:09 +02:00
withmorten
d1317f8fa6 m_nWantedLevel -> GetWantedLevel() 2021-01-22 00:20:51 +01:00
Nikolay Korolev
4f36a1fb77 sync 2021-01-18 22:20:44 +03:00
Nikolay Korolev
c00ebef329 incoming "fuck" commit 2021-01-14 23:21:17 +03:00
Nikolay Korolev
0b0d286f5c incoming "fuck" commit 2021-01-14 23:15:12 +03:00
Nikolay Korolev
625376f0d3 500-599 2021-01-11 17:14:56 +03:00
Nikolay Korolev
53a99cb9ee script2 2021-01-11 02:35:03 +03:00
Nikolay Korolev
a9559f03b0 lcs script mode 2021-01-09 00:20:09 +03:00
Nikolay Korolev
db1bdfd62d minor refactoring 2021-01-07 18:30:35 +03:00
Nikolay Korolev
6fa081e004 fix 2021-01-05 00:48:25 +03:00
Sergeanur
a35b3b4602 Script commands split to original files 2020-11-24 14:06:48 +02:00