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

..

AutoPilot.cpp

Revert "Remove Miami stuff"

2020-05-05 18:04:43 +03:00

AutoPilot.h

Merge branch 'master' into miami

2020-05-11 21:07:12 +03:00

Bridge.cpp

Revert "Remove GTA_TRAIN, GTA_BRIDGE, GTA_ZONECULL"

2020-05-05 18:34:46 +03:00

Bridge.h

Some refs removed, little fixes and teleport

2020-04-16 22:19:56 +03:00

CarAI.cpp

CCarCtrl::GenerateOneRandomCar

2020-05-08 23:29:43 +03:00

CarAI.h

remove ifdefs

2020-05-05 18:20:10 +03:00

CarCtrl.cpp

some updates for script

2020-05-10 17:54:13 +03:00

CarCtrl.h

more car control

2020-05-10 12:25:30 +03:00

Curves.cpp

Small unification

2020-05-10 01:14:00 +03:00

Curves.h

CCarCtrl::GenerateOneRandomVehicle!

2019-08-07 00:32:19 +03:00

Darkel.cpp

Try to build with mingw

2020-04-20 18:18:46 +02:00

Darkel.h

Try to build with mingw

2020-04-20 18:18:46 +02:00

GameLogic.cpp

Adding getters and setters for type and status

2020-04-30 16:45:45 +03:00

GameLogic.h

normalized line endings to LF

2020-04-09 20:50:24 +02:00

Garages.cpp

some updates for script

2020-05-10 17:54:13 +03:00

Garages.h

Merge branch 'master' into miami

2020-05-11 21:07:12 +03:00

OnscreenTimer.cpp

Remove patches

2020-04-17 16:31:11 +03:00

OnscreenTimer.h

Fixed typos and made all assert functions optional

2020-05-10 21:49:33 +06:00

PathFind.cpp

CCarCtrl::GenerateOneRandomCar

2020-05-08 23:29:43 +03:00

PathFind.h

Merge branch 'master' into miami

2020-05-11 21:07:12 +03:00

Phones.cpp

More use of GetModelIndex

2020-05-05 14:48:35 +03:00

Phones.h

Fixed typos and made all assert functions optional

2020-05-10 21:49:33 +06:00

Pickups.cpp

More use of GetModelIndex

2020-05-05 14:48:35 +03:00

Pickups.h

Merge branch 'master' into miami

2020-05-11 21:07:12 +03:00

PowerPoints.cpp

normalized line endings to LF

2020-04-09 20:50:24 +02:00

PowerPoints.h

normalized line endings to LF

2020-04-09 20:50:24 +02:00

Record.cpp

getting the vice city map to work

2020-05-05 23:27:43 +02:00

Record.h

rem refs

2020-04-17 08:54:14 +03:00

Remote.cpp

SetPosition, part 1

2020-05-02 15:13:09 +03:00

Remote.h

fixed remote

2019-07-26 10:44:56 +03:00

Replay.cpp

removed cutscene heads

2020-05-09 13:00:39 +02:00

Replay.h

Merge branch 'master' into miami

2020-05-11 21:07:12 +03:00

Restart.cpp

new zone stuff

2020-05-06 12:23:57 +02:00

Restart.h

rem refs

2020-04-17 08:54:14 +03:00

RoadBlocks.cpp

Merge remote-tracking branch 'origin/master' into miami

2020-05-07 13:42:50 +03:00

RoadBlocks.h

Revert "Remove Miami stuff"

2020-05-05 18:04:43 +03:00

SceneEdit.cpp

Merge branch 'master' into miami

2020-05-11 21:07:12 +03:00

SceneEdit.h

scene edit

2020-04-13 21:50:56 +03:00

Script.cpp

Merge branch 'master' into miami

2020-05-11 21:07:12 +03:00

Script.h

Merge branch 'master' into miami

2020-05-11 21:07:12 +03:00

ScriptCommands.h

script stubs + REQUEST_COLLISION

2020-05-06 21:15:58 +03:00

TrafficLights.cpp

Revert "Remove GTA_TRAIN, GTA_BRIDGE, GTA_ZONECULL"

2020-05-05 18:34:46 +03:00

TrafficLights.h

implemented CTrafficLights

2020-04-10 18:36:39 +02:00