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

..

Messages.cpp

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

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

Messages.h

CMessages::GetTokenPadKeyString

2021-01-22 05:49:17 +02:00

Pager.cpp

Struct cleanup, various fixes, enable PS2 rand

2020-04-19 16:44:35 +03:00

Pager.h

Struct cleanup, various fixes, enable PS2 rand

2020-04-19 16:44:35 +03:00

Text.cpp

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

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

Text.h

Merge branch 'miami' into lcs

2021-01-13 14:56:25 +02:00