Sergeanur de8759eabd Merge branch 'master' into miami ...

# Conflicts:
#	src/control/Record.cpp
#	src/vehicles/Automobile.cpp

2020-07-17 13:53:11 +03:00

..

animation

VC fighting, Peds, many fixes including ghost bikes

2020-07-09 17:01:07 +03:00

audio

Merge branch 'master' into miami

2020-07-17 13:53:11 +03:00

control

Add audio cache for faster initialization

2020-07-17 13:48:25 +03:00

core

Merge branch 'master' into miami

2020-07-17 13:53:11 +03:00

entities

Merge branch 'master' into miami

2020-07-13 18:10:17 +03:00

extras

Bettah car enter canceling, fix CFO crash, ped objs. renaming

2020-07-03 16:51:33 +03:00

fakerw

CCamera done

2020-06-20 14:54:11 +02:00

math

fixes to CBoat

2020-07-01 18:03:59 +02:00

modelinfo

make game load all platform dffs

2020-07-16 13:36:25 +02:00

objects

Merge pull request #647 from Fire-Head/miami

2020-07-04 21:24:17 +02:00

peds

Merge branch 'master' into miami

2020-07-13 18:10:17 +03:00

render

Merge branch 'master' into miami

2020-07-13 18:10:17 +03:00

rw

make game load all platform dffs

2020-07-16 13:36:25 +02:00

save

Merge branch 'master' into miami

2020-07-13 18:10:17 +03:00

skel

Merge branch 'master' into miami

2020-07-13 18:10:17 +03:00

text

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

2020-06-29 12:56:50 +03:00

vehicles

Fix wheel water splash with PC_PARTICLE

2020-07-17 12:57:47 +03:00

weapons

Restored beta police system(disabled), fixes from miami, debug info for CFO crash (#639)

2020-07-01 15:28:43 +03:00