Sergeanur 55d30a11ec Merge branch 'miami' into lcs ...

# 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/AudioManager.h
#	src/control/Garages.cpp
#	src/control/Garages.h
#	src/control/Script5.cpp
#	src/core/config.h
#	utils/gxt/american.txt
#	utils/gxt/spanish.txt

2021-07-12 04:13:22 +03:00

..

glfw

Merge branch 'miami' into lcs

2021-07-03 16:39:22 +03:00

win

Merge branch 'miami' into lcs

2021-07-03 16:39:22 +03:00

crossplatform.cpp

finish COMPATIBLE_SAVES and FIX_INCOMPATIBLE_SAVES

2021-07-10 02:06:43 +02:00

crossplatform.h

finish COMPATIBLE_SAVES and FIX_INCOMPATIBLE_SAVES

2021-07-10 02:06:43 +02:00

events.cpp

get rid of most --MIAMI comments

2021-01-22 11:43:29 +01:00

events.h

rw skeleton

2019-05-31 20:02:26 +03:00

platform.h

Merge branch 'master' into miami

2020-08-15 15:13:46 +03:00

skeleton.cpp

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

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

skeleton.h

AnimViewer fixes, commentary from miami

2020-12-09 05:10:57 +03:00