Merge branch 'miami' into lcs

Browse Source

# Conflicts:
#	README.md
#	gamefiles/TEXT/american.gxt
#	gamefiles/TEXT/french.gxt
#	gamefiles/TEXT/german.gxt
#	gamefiles/TEXT/italian.gxt
#	gamefiles/TEXT/spanish.gxt
#	src/audio/AudioLogic.cpp
#	src/core/config.h
#	src/vehicles/Automobile.cpp
#	utils/gxt/american.txt
#	utils/gxt/french.txt
#	utils/gxt/german.txt
#	utils/gxt/italian.txt
#	utils/gxt/spanish.txt

...

This commit is contained in:

Sergeanur

2021-08-16 10:09:39 +03:00

parent f4894952fc d6fbf9fbe7

commit d7e764d519

34 changed files with 1071 additions and 438 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

BIN

gamefiles/models/frontend_nsw.txd Normal file

Binary file not shown.

BIN

gamefiles/models/nswbtns.txd Normal file

Binary file not shown.