Commit Graph

28 Commits (2ed248a61d9b2faf0498d4b06e180777cbf3dc19)

Author SHA1 Message Date
Jonathan G Rennison 2ed248a61d Merge branch 'master' into jgrpp
# Conflicts:
#	.github/workflows/ci-build.yml
#	.github/workflows/release-linux.yml
#	src/aircraft_cmd.cpp
#	src/airport_gui.cpp
#	src/articulated_vehicles.cpp
#	src/build_vehicle_gui.cpp
#	src/company_gui.cpp
#	src/genworld_gui.cpp
#	src/gfx_layout.cpp
#	src/misc_gui.cpp
#	src/newgrf.cpp
#	src/newgrf_config.h
#	src/newgrf_engine.cpp
#	src/news_gui.cpp
#	src/order_gui.cpp
#	src/roadveh_cmd.cpp
#	src/saveload/saveload.h
#	src/saveload/vehicle_sl.cpp
#	src/ship_cmd.cpp
#	src/statusbar_gui.cpp
#	src/table/settings/network_private_settings.ini
#	src/table/settings/network_settings.ini
#	src/toolbar_gui.cpp
#	src/train_cmd.cpp
#	src/vehicle_gui.cpp
12 months ago
Jonathan G Rennison bac8f032da Re-add company shares 12 months 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
12 months ago
Jonathan G Rennison 8bb23e07ba Merge PR #520 into jgrpp 1 year ago
Jonathan G Rennison 9a4512f789 Remove linkgraph duration not day length scaled setting
Now always enabled
1 year ago
TELK 6ec28479ea Update: Korean translation for 0.53.3 1 year ago
Jonathan G Rennison 4c18a193e7 Simplify timetable long duration hours and minutes suffix string 1 year ago
Jonathan G Rennison 7941eb5187 Simplify timetable leftover ticks string 1 year ago
Jonathan G Rennison e7f7cd06bd Simplify timetable time/duration string management 1 year ago
Jonathan G Rennison 8f92668e22 Scheduled dispatch: Add menu item to append schedules from another vehicle 1 year ago
Jonathan G Rennison 62ecad1b63 Scheduled dispatch: Add menu item to duplicate current schedule 1 year ago
Jonathan G Rennison b089b561a5 Add departure board via order subtype to remove via for prior terminus 1 year ago
TELK baaa5713a9 Update: Korean translation up to e26bea6 1 year ago
TELK a47f92d309 Update: Korean translation up to 9bf6a1d 1 year ago
Jonathan G Rennison 19a42a879f Fix e8c1920e: Incorrect string codes in translation
STR_DEPARTURES_TERMINUS_VIA* in Korean
1 year ago
Jonathan G Rennison e8c1920e7f Departure board: Add support for dual via 1 year ago
Jonathan G Rennison 9c830aadcc Departure board: Refactor string handling 1 year ago
Jonathan G Rennison 06e0f39aff Add text label and departure board via orders 1 year ago
Jonathan G Rennison 1d05637d45 Add setting for rail depot maximum speed 1 year ago
Jonathan G Rennison 205cb2d3ea Fix autosave setting dropdown strings
See: #496
1 year ago
TELK 2bc46cc9b7 Update: Korean translation according to splitting extra 1 year ago
Jonathan G Rennison d94e8d7b5c Merge branch 'master' into jgrpp
# Conflicts:
#	src/script/api/script_object.cpp
#	src/script/api/script_roadtypelist.cpp
1 year ago
Jonathan G Rennison 2ea1766677 Merge branch 'master' into jgrpp
# Conflicts:
#	.github/workflows/commit-checker.yml
#	src/industry_cmd.cpp
#	src/industry_gui.cpp
#	src/landscape.cpp
#	src/linkgraph/linkgraph_gui.cpp
#	src/order_base.h
#	src/order_cmd.cpp
#	src/order_gui.cpp
#	src/saveload/afterload.cpp
#	src/saveload/league_sl.cpp
#	src/saveload/saveload.h
#	src/script/api/script_object.hpp
#	src/script/squirrel_helper.hpp
#	src/settings_table.cpp
#	src/station_cmd.cpp
#	src/table/settings.h.preamble
#	src/tree_cmd.cpp
#	src/tree_map.h
#	src/vehicle.cpp
#	src/waypoint_cmd.cpp
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 50a48b1264 strgen: Allow inserting strings before as well as after
Use for viewport town label strings
1 year ago
Jonathan G Rennison ea589fca6e strgen: Allow using another string as a default translation source 1 year ago
Jonathan G Rennison 2829a6fdf7 strgen: Split non-upstream translated strings into separate file 1 year ago