Jonathan G Rennison
|
df2d4bd83c
|
Scheduled dispatch: Do not allow enabling if unbunching is present
Check for auto-separation/unbunching in enable command
Show in enable button tooltip and summary text
|
3 months ago |
Jonathan G Rennison
|
fdd666f66a
|
Merge tag '14.0-beta1' into jgrpp
# Conflicts:
# src/3rdparty/squirrel/squirrel/sqcompiler.cpp
# src/aircraft.h
# src/animated_tile.h
# src/base_consist.h
# src/cargotype.h
# src/company_gui.cpp
# src/console_cmds.cpp
# src/core/overflowsafe_type.hpp
# src/engine_gui.cpp
# src/industry_gui.cpp
# src/lang/english.txt
# src/music/extmidi.cpp
# src/network/core/network_game_info.cpp
# src/network/network_server.cpp
# src/newgrf.cpp
# src/newgrf_industries.cpp
# src/order_base.h
# src/order_cmd.cpp
# src/order_gui.cpp
# src/order_type.h
# src/os/macosx/misc_osx.cpp
# src/os/windows/crashlog_win.cpp
# src/rail_gui.cpp
# src/rail_gui.h
# src/roadveh.h
# src/roadveh_cmd.cpp
# src/saveload/afterload.cpp
# src/saveload/company_sl.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/saveload/saveload_error.hpp
# src/script/api/script_town.cpp
# src/settingsgen/settingsgen.cpp
# src/ship.h
# src/ship_cmd.cpp
# src/smallmap_gui.cpp
# src/spritecache.cpp
# src/stdafx.h
# src/strgen/strgen.cpp
# src/strgen/strgen.h
# src/table/settings/script_settings.ini
# src/timetable_cmd.cpp
# src/timetable_gui.cpp
# src/town.h
# src/town_cmd.cpp
# src/town_cmd.h
# src/town_gui.cpp
# src/train.h
# src/train_cmd.cpp
# src/tree_cmd.cpp
# src/vehicle.cpp
# src/vehicle_base.h
# src/vehicle_cmd.cpp
# src/vehicle_gui.cpp
# src/vehiclelist.cpp
# src/waypoint_base.h
# src/widget.cpp
|
3 months ago |
Jonathan G Rennison
|
b940fa9466
|
Do not scale shown running costs by the day length factor
Show in original years
|
4 months ago |
Jonathan G Rennison
|
bd74340416
|
Disable settings inapplicable for the current timekeeping mode
|
4 months ago |
Jonathan G Rennison
|
b13b2781bd
|
Add string codes for upstream wallclock mode, add upstream language changes
|
4 months ago |
Jonathan G Rennison
|
e98d9a1d1d
|
Strings: Remove DATE_WALLCLOCK_* string codes, add TT_TIME
|
4 months ago |
Jonathan G Rennison
|
0f7eb3d8d5
|
Add road vehicle direction to order window manage order dropdown
|
4 months ago |
Jonathan G Rennison
|
9bea1e3cc3
|
Scheduled dispatch: Allow tagging departure slots, add to conditional order
|
4 months ago |
Jonathan G Rennison
|
0a16ba1bd7
|
Scheduled dispatch: Add dispatch slot tooltip
|
4 months ago |
Jonathan G Rennison
|
6c329871f1
|
Scheduled dispatch: Add per dispatch slot flags field
Add flag for slot re-use
|
4 months ago |
Jonathan G Rennison
|
3a4623c027
|
Scheduled dispatch: Add slot remove mode, label last/next slots otherwise
|
4 months ago |
Jonathan G Rennison
|
628106d182
|
Scheduled dispatch: Show start date button as start time when using minutes
|
4 months ago |
Jonathan G Rennison
|
ea3795201d
|
Scheduled dispatch: Show warnings for shown times >= 23 hours in the past
Adjust line layout
|
4 months ago |
Jonathan G Rennison
|
9be3dfa69c
|
Scheduled dispatch: Use an invalid value for no last dispatch, not 0
|
4 months ago |
Jonathan G Rennison
|
5b7689a0aa
|
Scheduled dispatch: Add flag to re-use all dispatch slots
|
4 months ago |
Jonathan G Rennison
|
876bce431f
|
Tracerestrict: Add release slot on reserve slot op subtype
|
4 months ago |
Jonathan G Rennison
|
d62ae41e03
|
Tracerestrict: Remove TRSCOF_ACQUIRE_TRY_ON_RESERVE, same as TRSCOF_ACQUIRE_TRY
|
4 months ago |
Jonathan G Rennison
|
3ab31f5518
|
Add settings for town/industry cargo production scaling modes
|
5 months ago |
Jonathan G Rennison
|
1e0bb019a7
|
Change cargo scaling settings to be linear instead of logarithmic
|
5 months ago |
Jonathan G Rennison
|
a0a09c18fb
|
Scheduled dispatch: Warn when last departure is >= 23 hours in future
When showing time in minutes
|
5 months ago |
Jonathan G Rennison
|
78e08d5711
|
Add setting text/warnings about why YAPF is recommended for trains
|
5 months ago |
Jonathan G Rennison
|
041f36d565
|
Add try to acquire slot order subtype
|
5 months ago |
Jonathan G Rennison
|
c488dae9c8
|
Fix strings for amount of rivers setting in settings window
|
5 months ago |
Jonathan G Rennison
|
55d78a23be
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/3rdparty/squirrel/include/squirrel.h
# src/blitter/32bpp_sse_func.hpp
# src/bridge_map.h
# src/clear_map.h
# src/company_manager_face.h
# src/console_func.h
# src/core/bitmath_func.hpp
# src/core/endian_func.hpp
# src/core/random_func.hpp
# src/depot_map.h
# src/elrail_func.h
# src/fontcache.h
# src/industry_map.h
# src/map_func.h
# src/newgrf_spritegroup.h
# src/object_map.h
# src/rail.h
# src/rail_map.h
# src/road_func.h
# src/road_map.h
# src/saveload/saveload.h
# src/saveload/saveload_error.hpp
# src/settings_gui.cpp
# src/sl/oldloader.h
# src/sprite.h
# src/spritecache.h
# src/station_func.h
# src/station_map.h
# src/story_base.h
# src/strings_func.h
# src/tile_cmd.h
# src/tile_map.h
# src/tile_type.h
# src/town.h
# src/town_map.h
# src/tree_map.h
# src/tunnel_map.h
# src/tunnelbridge_map.h
# src/vehicle_func.h
# src/viewport_func.h
# src/void_map.h
# src/water.h
# src/water_map.h
# src/widget_type.h
|
5 months ago |
Jonathan G Rennison
|
592c038e42
|
Add setting for whether to show rail polyline tool
|
5 months ago |
Jonathan G Rennison
|
f6a1f64efb
|
Adjust chunnel water distance limits and associated texts
|
5 months ago |
Jonathan G Rennison
|
ebbf3425d5
|
Debug: Add debug windows for routing restriction programs
|
5 months ago |
Jonathan G Rennison
|
6edde70b04
|
Scheduled dispatch: Add company setting to set default schedule duration
|
5 months ago |
Jonathan G Rennison
|
821a7c73ef
|
Lang: Add default-translation tag for "Default" texts
|
5 months ago |
Jonathan G Rennison
|
4cc2653035
|
Debug: Add options to mark sprite groups, clear highlight/markings
Adjust tooltip strings
|
5 months ago |
Jonathan G Rennison
|
117deb0c62
|
Debug: Move sprite dump more details from misc_debug to a dropdown
Use goto sprite slot as dropdown button
|
5 months ago |
Jonathan G Rennison
|
d5a7a67b8c
|
Merge branch 'master' into jgrpp
# Conflicts:
# .github/workflows/ci-build.yml
# src/ai/ai_gui.cpp
# src/blitter/32bpp_optimized.cpp
# src/blitter/32bpp_simple.cpp
# src/blitter/32bpp_sse2.cpp
# src/blitter/8bpp_optimized.cpp
# src/blitter/8bpp_simple.cpp
# src/blitter/null.cpp
# src/blitter/null.hpp
# src/company_gui.cpp
# src/game/game_gui.cpp
# src/genworld_gui.cpp
# src/gfx.cpp
# src/gfx_func.h
# src/graph_gui.cpp
# src/industry_gui.cpp
# src/linkgraph/linkgraphjob.cpp
# src/network/network_gui.cpp
# src/newgrf_debug_gui.cpp
# src/openttd.cpp
# src/pathfinder/npf/aystar.h
# src/road_gui.cpp
# src/saveload/order_sl.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/script/api/script_log.cpp
# src/script/api/script_town.cpp
# src/script/script_gui.cpp
# src/settings.cpp
# src/settings_gui.cpp
# src/settings_table.cpp
# src/settings_type.h
# src/smallmap_gui.cpp
# src/sortlist_type.h
# src/spritecache.cpp
# src/spriteloader/grf.cpp
# src/spriteloader/grf.hpp
# src/spriteloader/spriteloader.hpp
# src/station_cmd.cpp
# src/station_cmd.h
# src/station_gui.cpp
# src/strings.cpp
# src/toolbar_gui.cpp
# src/town_cmd.cpp
# src/town_gui.cpp
# src/vehicle_gui.cpp
# src/vehicle_gui_base.h
# src/video/opengl.cpp
# src/video/opengl.h
# src/widgets/dropdown.cpp
# src/widgets/dropdown_type.h
# src/window_gui.h
|
5 months ago |
Jonathan G Rennison
|
378a545dd4
|
Add setting for map edge behaviour, and how to display area outside map
|
5 months ago |
Jonathan G Rennison
|
540cec2af5
|
Add setting to allow auto-fill signal dragging to skip over stations/waypoints
|
5 months ago |
Jonathan G Rennison
|
2267badd28
|
Remove "Show cargo type filter in vehicle lists" setting
|
6 months ago |
Jonathan G Rennison
|
48cc6a686b
|
Change settings for using default signal graphics and signal recolouring
|
6 months ago |
Jonathan G Rennison
|
7d17c9ba9b
|
Link graph: Also show lower of usage/planned in tooltips when ctrl pressed
|
6 months ago |
Jonathan G Rennison
|
21b49a213e
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/cheat_gui.cpp
# src/main_gui.cpp
# src/network/network_gui.cpp
# src/saveload/saveload.h
# src/smallmap_gui.cpp
# src/station_cmd.cpp
# src/timetable_cmd.cpp
# src/toolbar_gui.cpp
# src/widget.cpp
# src/widget_type.h
# src/widgets/dropdown_type.h
|
6 months ago |
Jonathan G Rennison
|
0d4d4a9cac
|
Merge branch 'master' into jgrpp
# Conflicts:
# cmake/CompileFlags.cmake
# src/3rdparty/squirrel/squirrel/sqclosure.h
# src/3rdparty/squirrel/squirrel/sqobject.h
# src/3rdparty/squirrel/squirrel/sqvm.h
# src/aircraft.h
# src/airport_gui.cpp
# src/blitter/32bpp_sse_func.hpp
# src/blitter/null.hpp
# src/bridge_gui.cpp
# src/build_vehicle_gui.cpp
# src/cargotype.h
# src/cheat_gui.cpp
# src/command.cpp
# src/command_func.h
# src/company_gui.cpp
# src/console_gui.cpp
# src/date_gui.cpp
# src/depot_gui.cpp
# src/dock_gui.cpp
# src/economy.cpp
# src/error_gui.cpp
# src/fileio.cpp
# src/fios.cpp
# src/fios_gui.cpp
# src/fontcache/spritefontcache.h
# src/framerate_gui.cpp
# src/game/game_text.cpp
# src/gamelog.cpp
# src/genworld_gui.cpp
# src/gfx_layout_fallback.cpp
# src/group_gui.cpp
# src/highscore_gui.cpp
# src/hotkeys.cpp
# src/industry_cmd.cpp
# src/industry_gui.cpp
# src/landscape.cpp
# src/main_gui.cpp
# src/misc_cmd.cpp
# src/misc_gui.cpp
# src/network/core/tcp_game.cpp
# src/network/core/udp.cpp
# src/network/network_chat_gui.cpp
# src/network/network_content_gui.cpp
# src/network/network_gui.cpp
# src/network/network_server.cpp
# src/network/network_server.h
# src/newgrf_airport.cpp
# src/newgrf_airport.h
# src/newgrf_airporttiles.cpp
# src/newgrf_airporttiles.h
# src/newgrf_animation_base.h
# src/newgrf_canal.cpp
# src/newgrf_commons.h
# src/newgrf_config.cpp
# src/newgrf_debug_gui.cpp
# src/newgrf_engine.cpp
# src/newgrf_engine.h
# src/newgrf_generic.cpp
# src/newgrf_gui.cpp
# src/newgrf_house.cpp
# src/newgrf_house.h
# src/newgrf_industries.cpp
# src/newgrf_industries.h
# src/newgrf_industrytiles.cpp
# src/newgrf_industrytiles.h
# src/newgrf_object.cpp
# src/newgrf_object.h
# src/newgrf_railtype.cpp
# src/newgrf_railtype.h
# src/newgrf_roadstop.cpp
# src/newgrf_roadstop.h
# src/newgrf_roadtype.cpp
# src/newgrf_roadtype.h
# src/newgrf_spritegroup.cpp
# src/newgrf_spritegroup.h
# src/newgrf_station.cpp
# src/newgrf_station.h
# src/newgrf_town.cpp
# src/newgrf_town.h
# src/news_gui.cpp
# src/object_gui.cpp
# src/order_gui.cpp
# src/os/macosx/crashlog_osx.cpp
# src/os/unix/crashlog_unix.cpp
# src/os/windows/crashlog_win.cpp
# src/os/windows/win32.cpp
# src/os/windows/win32_main.cpp
# src/pathfinder/npf/npf.cpp
# src/pathfinder/npf/queue.cpp
# src/rail_cmd.cpp
# src/rail_gui.cpp
# src/road_gui.cpp
# src/roadveh.h
# src/saveload/saveload.cpp
# src/screenshot.cpp
# src/script/api/script_text.hpp
# src/settings.cpp
# src/settings_gui.cpp
# src/settings_internal.h
# src/settings_table.cpp
# src/signs_cmd.cpp
# src/signs_gui.cpp
# src/smallmap_gui.cpp
# src/smallmap_gui.h
# src/spriteloader/grf.hpp
# src/station_cmd.cpp
# src/station_gui.cpp
# src/station_map.h
# src/statusbar_gui.cpp
# src/stdafx.h
# src/strgen/strgen.cpp
# src/table/newgrf_debug_data.h
# src/terraform_gui.cpp
# src/timer/timer_game_calendar.cpp
# src/timer/timer_window.cpp
# src/town.h
# src/town_cmd.cpp
# src/town_gui.cpp
# src/train_gui.cpp
# src/transparency_gui.cpp
# src/vehicle_gui.cpp
# src/water_cmd.cpp
# src/waypoint_cmd.cpp
# src/widget.cpp
# src/widget_type.h
# src/widgets/dropdown.cpp
# src/widgets/rail_widget.h
# src/widgets/terraform_widget.h
# src/window.cpp
# src/window_gui.h
|
6 months ago |
Jonathan G Rennison
|
c929f7075e
|
Merge branch 'master' into jgrpp
# Conflicts:
# cmake/SourceList.cmake
# src/build_vehicle_gui.cpp
# src/company_gui.cpp
# src/console_cmds.cpp
# src/depot_base.h
# src/elrail.cpp
# src/network/core/udp.cpp
# src/network/network_admin.cpp
# src/network/network_chat_gui.cpp
# src/network/network_gui.cpp
# src/network/network_server.cpp
# src/newgrf.cpp
# src/newgrf_engine.cpp
# src/newgrf_railtype.cpp
# src/newgrf_railtype.h
# src/newgrf_storage.h
# src/os/unix/crashlog_unix.cpp
# src/rail.h
# src/rail_cmd.cpp
# src/rail_gui.cpp
# src/road_cmd.cpp
# src/road_map.h
# src/saveload/labelmaps_sl.cpp
# src/settings_gui.cpp
# src/settings_type.h
# src/sl/oldloader_sl.cpp
# src/station_cmd.cpp
# src/station_gui.cpp
# src/table/settings/world_settings.ini
# src/tests/test_script_admin.cpp
# src/textfile_gui.cpp
# src/toolbar_gui.cpp
# src/train_cmd.cpp
# src/tunnelbridge_cmd.cpp
# src/vehicle_gui.cpp
# src/widget.cpp
# src/window.cpp
# src/window_gui.h
# src/window_type.h
|
7 months ago |
Jonathan G Rennison
|
d931382fb2
|
Improve text for rename station extra functionality tooltip
|
7 months ago |
Jonathan G Rennison
|
d4f39ea6c2
|
Remove "Show order management button" setting
Now always enabled
|
7 months ago |
Jonathan G Rennison
|
86fff56c14
|
Add setting for whether to hide default stop location
|
7 months ago |
Jonathan G Rennison
|
fc1c47cbd2
|
Merge branch 'master' into jgrpp
# Conflicts:
# cmake/CompileFlags.cmake
# src/crashlog.cpp
# src/crashlog.h
# src/date_type.h
# src/depot_type.h
# src/landscape.cpp
# src/openttd.cpp
# src/order_cmd.cpp
# src/order_gui.cpp
# src/os/macosx/crashlog_osx.cpp
# src/os/unix/crashlog_unix.cpp
# src/os/windows/crashlog_win.cpp
# src/pathfinder/npf/npf.cpp
# src/road_cmd.cpp
# src/script/api/script_infrastructure.cpp
# src/stdafx.h
# src/table/settings/gui_settings.ini
# src/table/settings/pathfinding_settings.ini
# src/tests/CMakeLists.txt
|
7 months ago |
Jonathan G Rennison
|
cb9e088399
|
Add setting to control autosave interval mode
|
7 months ago |
Jonathan G Rennison
|
524af62b8e
|
Remove now-unused autosave strings
|
7 months ago |
Jonathan G Rennison
|
4bfa8b7b7b
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/openttd.cpp
# src/settings_gui.cpp
# src/settings_type.h
# src/table/settings/gameopt_settings.ini
# src/table/settings/gui_settings.ini
|
7 months ago |
Jonathan G Rennison
|
fe57f3a089
|
Fix typo in help text for limit train acceleration setting
|
7 months ago |
Jonathan G Rennison
|
607690cef7
|
Fix string codes for various setting labels
|
7 months ago |
Jonathan G Rennison
|
e3ccc54670
|
Adjust setting text for departure board conditional order handling
|
8 months ago |