Commit Graph

19 Commits (c8817d7f4e10c79aaf3d6e34e50a9cbdc3feefe0)

Author SHA1 Message Date
Jonathan G Rennison c8817d7f4e Merge branch 'master' into jgrpp
# Conflicts:
#	os/macosx/notarize.sh
#	src/3rdparty/CMakeLists.txt
#	src/3rdparty/squirrel/squirrel/sqcompiler.cpp
#	src/3rdparty/squirrel/squirrel/sqdebug.cpp
#	src/3rdparty/squirrel/squirrel/sqvm.cpp
#	src/console_cmds.cpp
#	src/core/span_type.hpp
#	src/crashlog.cpp
#	src/currency.h
#	src/date_gui.cpp
#	src/driver.cpp
#	src/fios.cpp
#	src/genworld_gui.cpp
#	src/hotkeys.cpp
#	src/misc_gui.cpp
#	src/music/os2_m.cpp
#	src/network/core/os_abstraction.h
#	src/network/network_server.cpp
#	src/newgrf.cpp
#	src/newgrf_config.h
#	src/newgrf_text.cpp
#	src/openttd.cpp
#	src/os/macosx/font_osx.cpp
#	src/os/macosx/misc_osx.cpp
#	src/os/os2/CMakeLists.txt
#	src/os/os2/os2.cpp
#	src/os/unix/CMakeLists.txt
#	src/os/windows/font_win32.cpp
#	src/os/windows/win32_main.cpp
#	src/saveload/saveload.cpp
#	src/script/api/script_text.cpp
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/stdafx.h
#	src/strings.cpp
#	src/timetable_gui.cpp
#	src/town_gui.cpp
#	src/train_cmd.cpp
#	src/video/dedicated_v.cpp
#	src/video/video_driver.cpp
#	src/video/win32_v.cpp
#	src/viewport.cpp
#	src/waypoint_gui.cpp
#	src/widgets/dropdown_type.h
#	src/window.cpp
#	src/window_gui.h
9 months ago
Jonathan G Rennison 02aecca5ae Conditional order: Replace "next station" with manually set station 9 months ago
Jonathan G Rennison 0f8d8ca485 TBTR: Fix layout of top panel in RTL languages 9 months ago
Jonathan G Rennison 3b8d8aeb6a TBTR: Adjust config buttons/text in main window
Clarify refit and depot options
Adjust layout
9 months ago
Jonathan G Rennison 4c88256183 De-duplicate string IDs used for viewport town labels 10 months ago
Jonathan G Rennison 5f385a5573 De-duplicate string IDs used for station rating tooltips 10 months ago
Jonathan G Rennison 7744ccf3f3 Extra strings: Move "JUST" strings to a no-translate section 10 months ago
Jonathan G Rennison 73b9028bcc Merge PR #574 into jgrpp 11 months ago
JakMel 83575b6a3e Update: Czech translation, fixes to commit 8f887b7 11 months ago
JakMel 8f887b7487 Update: Czech translation up to 0.54.4. 11 months ago
Jonathan G Rennison 99b883298e Add help text for the various viewport map settings 11 months ago
Jonathan G Rennison 05be624294 Remove gui.viewport_map_scan_surroundings setting, now always enabled 11 months ago
Jonathan G Rennison 326d0c329c Remove some unnecessary colour strings 1 year ago
Jonathan G Rennison bac8f032da Re-add company shares 1 year ago
Jonathan G Rennison 6091d7470c Merge branch 'master' into jgrpp
# Conflicts:
#	.github/workflows/release-macos.yml
#	src/company_gui.cpp
#	src/linkgraph/linkgraph.cpp
#	src/newgrf_debug_gui.cpp
#	src/strgen/strgen_base.cpp
#	src/timetable_gui.cpp
1 year ago
Jonathan G Rennison 9a4512f789 Remove linkgraph duration not day length scaled setting
Now always enabled
1 year ago
Jonathan G Rennison 84914129a5 Fix wrong string order for about menu dropdown texts 1 year ago
Jonathan G Rennison 86aeb16f55 Fix wrong string ordering for town growth setting 1 year ago
Jonathan G Rennison 2829a6fdf7 strgen: Split non-upstream translated strings into separate file 1 year ago