Commit Graph

20 Commits

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
2023-05-31 23:21:38 +01:00
Jonathan G Rennison
bac8f032da Re-add company shares 2023-05-30 18:57:42 +01:00
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
2023-05-28 10:20:52 +01:00
Jonathan G Rennison
9a4512f789 Remove linkgraph duration not day length scaled setting
Now always enabled
2023-05-22 19:38:52 +01:00
Jonathan G Rennison
4c18a193e7 Simplify timetable long duration hours and minutes suffix string 2023-05-10 19:10:56 +01:00
Jonathan G Rennison
7941eb5187 Simplify timetable leftover ticks string 2023-05-10 18:55:29 +01:00
Jonathan G Rennison
e7f7cd06bd Simplify timetable time/duration string management 2023-05-10 18:51:49 +01:00
Jonathan G Rennison
8f92668e22 Scheduled dispatch: Add menu item to append schedules from another vehicle 2023-05-07 20:06:47 +01:00
Jonathan G Rennison
62ecad1b63 Scheduled dispatch: Add menu item to duplicate current schedule 2023-05-07 14:02:37 +01:00
Jonathan G Rennison
e8c1920e7f Departure board: Add support for dual via 2023-04-11 00:29:58 +01:00
Jonathan G Rennison
9c830aadcc Departure board: Refactor string handling 2023-04-11 00:29:58 +01:00
Jonathan G Rennison
06e0f39aff Add text label and departure board via orders 2023-04-09 12:48:50 +01:00
Jonathan G Rennison
1d05637d45 Add setting for rail depot maximum speed 2023-04-06 01:30:14 +01:00
Jonathan G Rennison
062d57eadb Merge branch 'master' into jgrpp
# Conflicts:
#	src/openttd.cpp
#	src/video/dedicated_v.cpp
2023-03-16 20:43:11 +00:00
Jonathan G Rennison
205cb2d3ea Fix autosave setting dropdown strings
See: #496
2023-03-11 10:02:02 +00:00
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
2023-03-04 16:45:05 +00:00
Jonathan G Rennison
84914129a5 Fix wrong string order for about menu dropdown texts 2023-02-25 22:14:22 +00:00
Jonathan G Rennison
86aeb16f55 Fix wrong string ordering for town growth setting 2023-02-24 16:42:38 +00:00
Jonathan G Rennison
50a48b1264 strgen: Allow inserting strings before as well as after
Use for viewport town label strings
2023-02-16 01:30:21 +00:00
Jonathan G Rennison
2829a6fdf7 strgen: Split non-upstream translated strings into separate file 2023-02-16 00:35:44 +00:00