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

Browse Source

# 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

...

This commit is contained in:

Sergeanur

2021-01-22 15:04:09 +02:00

parent 8dab92d158 feb993e751

commit cea6b20c09

130 changed files with 92 additions and 669 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

181

src/peds/Ped.cpp

File diff suppressed because it is too large Load Diff