Jonathan G Rennison 4042480806 Merge branch 'jgrpp' into jgrpp-beta ...

# Conflicts:
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/settings_internal.h
#	src/table/company_settings.ini
#	src/table/currency_settings.ini
#	src/table/gameopt_settings.ini
#	src/table/misc_settings.ini
#	src/table/settings.h.preamble
#	src/table/settings.ini
#	src/table/win32_settings.ini
#	src/table/window_settings.ini

2021-10-08 18:12:04 +01:00

..

CMakeLists.txt

Codechange: [Win32] Move Win32-specific font code to a seperate file.

2021-02-13 20:09:14 +01:00

crashlog_win.cpp

Add CheckCaches mode to emit a log/save/screenshot on detected issue

2021-10-03 23:57:27 +01:00

font_win32.cpp

Merge branch 'master' into jgrpp-beta

2021-09-27 22:47:23 +01:00

font_win32.h

Fix #8713: Change OTTD2FS and FS2OTTD to return string objects instead of static buffers

2021-04-07 09:31:47 +02:00

ottdres.rc.in

Fix: [CMake] Auto-fill version details in rev.cpp and ottres.rc (#9066)

2021-04-20 21:38:46 +02:00

string_uniscribe.cpp

Codechange: Make OS font handle of the FontCache read-only.

2021-02-13 20:09:14 +01:00

string_uniscribe.h

Codechange: remove #ifdef from .cpp files to exclude features

2020-06-05 19:36:05 +02:00

win32.cpp

Thread: Adjust checks for whether current thread is the game thread

2021-06-20 10:00:36 +01:00

win32.h

Merge branch 'master' into jgrpp

2021-04-11 03:05:08 +01:00