Commit graph

22 commits

Author SHA1 Message Date
Sergeanur
0aa7f13c32 Merge branch 'master' into miami
# Conflicts:
#	src/animation/AnimBlendAssociation.h
#	src/animation/AnimBlendClumpData.h
#	src/animation/AnimManager.h
#	src/animation/FrameUpdate.cpp
#	src/control/AutoPilot.h
#	src/control/PathFind.h
#	src/core/PlayerInfo.h
#	src/entities/Building.h
#	src/entities/Dummy.h
#	src/entities/Entity.h
#	src/entities/Physical.h
#	src/entities/Treadable.h
#	src/modelinfo/BaseModelInfo.h
#	src/modelinfo/ClumpModelInfo.cpp
#	src/modelinfo/ClumpModelInfo.h
#	src/modelinfo/PedModelInfo.h
#	src/modelinfo/SimpleModelInfo.h
#	src/modelinfo/TimeModelInfo.h
#	src/modelinfo/VehicleModelInfo.h
#	src/objects/CutsceneHead.h
#	src/objects/CutsceneObject.h
#	src/objects/DummyObject.h
#	src/objects/Object.h
#	src/peds/DummyPed.h
#	src/peds/PedIK.cpp
#	src/rw/VisibilityPlugins.cpp
#	src/vehicles/Automobile.h
#	src/vehicles/Boat.h
#	src/vehicles/Heli.h
#	src/vehicles/Plane.h
#	src/vehicles/Train.h
#	src/vehicles/Vehicle.h
2020-05-11 21:07:12 +03:00
bigbossbro08
c798e1bacd Fixed typos and made all assert functions optional 2020-05-10 21:49:33 +06:00
bigbossbro08
af6e132b37 defined out asserts. 2020-05-10 19:54:37 +06:00
Nikolay Korolev
a55e738dfa ccarctrl big fix 2020-05-09 20:21:13 +03:00
Nikolay Korolev
edeb8736f1 remove ifdefs 2020-05-05 18:20:10 +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
Nikolay Korolev
f372ce156d changed saving compatibility 2020-05-02 18:02:17 +03:00
Nikolay Korolev
a34870645a blunder 2019-10-12 13:42:34 +03:00
Nikolay Korolev
26f7691031 car AI 2019-10-06 14:25:13 +03:00
Nikolay Korolev
05b01c5ff5 ccarctrl 2019-09-11 21:42:34 +03:00
Nikolay Korolev
b2236d8951 More CCarCtrl 2019-09-02 19:04:09 +03:00
Nikolay Korolev
64cef333c8 more CCarCtrl 2019-08-25 16:47:22 +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
Nikolay Korolev
5d90821a8e fix 2019-07-15 12:11:49 +03:00
Nikolay Korolev
b77a9ce955 RunningScript 2. So far with bugs (cops not caring, errors in arithmetical opcodes) 2019-07-14 14:49:27 +03:00
aap
702cd00765 more CVehicle 2019-07-09 23:49:44 +02:00
aap
74fcbc8c0a more CAutomobile 2019-07-09 09:57:44 +02:00
aap
00461224a9 some work on vehicles 2019-07-06 19:44:00 +02:00
eray orçunus
0e7a471b82 CPed...
Signed-off-by: eray orçunus <erayorcunus@gmail.com>
2019-07-06 01:44:49 +03:00