Commit Graph

6 Commits

Author SHA1 Message Date
Sergeanur
4b4f59a5d4 Add texts 2020-12-07 17:09:31 +02:00
Sergeanur
827b240078 Merge branch 'master' into miami
# Conflicts:
#	gamefiles/TEXT/american.gxt
#	src/control/Garages.cpp
#	src/control/Record.cpp
#	src/control/Script.cpp
#	src/core/Collision.cpp
#	src/core/Frontend.cpp
#	src/core/Frontend.h
#	src/core/Game.cpp
#	src/core/MenuScreens.cpp
#	src/core/Streaming.cpp
#	src/core/config.h
#	src/core/re3.cpp
#	src/modelinfo/ModelInfo.cpp
#	src/render/Renderer.cpp
#	src/save/GenericGameStorage.cpp
#	utils/gxt/american.txt
2020-08-19 23:34:33 +03:00
Sergeanur
732681db08 Island loading and PS2 alpha test added to options 2020-08-16 17:26:44 +03:00
Sergeanur
a728a542be Graphics menu + MSAA 2020-08-16 01:37:09 +03:00
Sergeanur
56388472cb Remove III files 2020-08-14 15:25:02 +03:00
Sergeanur
3a536f18b1 Add GXT util 2020-05-05 15:47:18 +03:00