Commit Graph

134 Commits (a18f3274b4c63d59c78a0ba57980962e2c94ce6c)

Author SHA1 Message Date
Jonathan G Rennison a18f3274b4 Rename close window functions to match upstream 9 months ago
Jonathan G Rennison c0598d34bf Merge branch 'master' into jgrpp
# Conflicts:
#	src/console.cpp
#	src/os/os2/os2.cpp
#	src/os/unix/font_unix.cpp
#	src/strgen/strgen.h
#	src/strgen/strgen_base.cpp
#	src/table/settings/gui_settings.ini
9 months ago
Jonathan G Rennison b0538a00e0 Add setting for whether to allow converting town road to non-house types
See: 51e22617
10 months ago
Jonathan G Rennison 8a14d8c246 Add setting to also limit acceleration when using realistic braking 10 months ago
Tyler Trahan 748ff13a6d Change: Enable "Forbid 90 degree turns" setting by default
(cherry picked from commit 4decd2aa48)
10 months ago
Daniel Hill 924b2ab9ec Add an optional "(City)" in Viewport labels 10 months ago
Jonathan G Rennison 11bf8e22d7 Add setting to show order number in vehicle view window 11 months ago
Jonathan G Rennison c6c69fa3da Add setting for long-term autosaves
A second set of autosaves for whenever the main set wraps around to 0
11 months ago
RoqueDeicide c57bfa479a [Feature] Added waypoint viewport tooltips. 11 months ago
Jonathan G Rennison 3e03cebad1 Simplify industry_tooltip_show_stockpiled setting
See: #564
11 months ago
RoqueDeicide 84e5aba1d7 [Change] Reworked stockpile settings into 1 dropdown. 11 months ago
RoqueDeicide 733f53dc9a Merge branch 'tooltip_extension' into jgrpp 11 months ago
Jonathan G Rennison ead18b2af2 Merge branch 'master' into jgrpp
# Conflicts:
#	CMakeLists.txt
#	src/3rdparty/md5/md5.h
#	src/3rdparty/squirrel/squirrel/squtils.h
#	src/animated_tile.cpp
#	src/console_func.h
#	src/core/CMakeLists.txt
#	src/core/container_func.hpp
#	src/core/smallstack_type.hpp
#	src/crashlog.cpp
#	src/crashlog.h
#	src/debug.h
#	src/economy.cpp
#	src/gamelog.cpp
#	src/industry_gui.cpp
#	src/lang/catalan.txt
#	src/misc_gui.cpp
#	src/network/network_content.h
#	src/newgrf.cpp
#	src/newgrf.h
#	src/newgrf_config.cpp
#	src/newgrf_config.h
#	src/newgrf_gui.cpp
#	src/os/unix/font_unix.cpp
#	src/os/windows/crashlog_win.cpp
#	src/rail_cmd.cpp
#	src/saveload/animated_tile_sl.cpp
#	src/script/api/script_tilelist.cpp
#	src/settings.cpp
#	src/settingsgen/settingsgen.cpp
#	src/sl/oldloader_sl.cpp
#	src/station.cpp
#	src/station_cmd.cpp
#	src/stdafx.h
#	src/strgen/strgen.cpp
#	src/strgen/strgen_base.cpp
#	src/table/settings/gui_settings.ini
#	src/train_gui.cpp
#	src/vehicle.cpp
#	src/vehicle_base.h
#	src/vehicle_cmd.cpp
#	src/vehicle_gui_base.h
#	src/viewport_sprite_sorter.h
11 months ago
RoqueDeicide 5af7be6d17 [Feature] Added station viewport tooltips. 11 months ago
RoqueDeicide 1071235aee [Feature] Added depot viewport tooltips. 11 months ago
Jonathan G Rennison 8fea927ed1 Add setting for whether to shade height in viewport map mode
See: #550
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
RoqueDeicide 33ee78f9ac [Feature] Extended functionality of industry viewport tooltips.
Added ability to turn them off or to show any combination of the following: name, required, stockpiled or produced cargoes.
11 months ago
RoqueDeicide 8eea01717f [Feature] A setting to allow town name tile tooltips to always or never be displayed. 11 months ago
RoqueDeicide d6041744ca [Change] Moved tooltip-related settings to a dedicated category. 11 months ago
Jonathan G Rennison 9a5df29648 Adjustments for PR #556
Setting text/condition, tooltip condition
12 months ago
RoqueDeicide 829db8e4f9 Feature: A setting to bring back old tile tooltip behavior.
If enabled, the setting allows tooltips for tiles, such as industries, to show instantly, when otherwise they would require a right-click.
12 months ago
Jonathan G Rennison d6787c4731 Fix f9f1cb21: Setting saveload type
See: #548
12 months ago
Jonathan G Rennison f9f1cb2190 Fix crash when changing AI interval setting
See: #548
12 months ago
Jonathan G Rennison ccdca8ae52 Add setting to increase size of main toolbar 1 year ago
Jonathan G Rennison d3fbe88a9c Add setting for departure boards duration when using minutes
Default to 24 hours
1 year ago
Jonathan G Rennison 57762ce9f6 Enable upstream load for build object limit settings 1 year ago
Jonathan G Rennison ec9766e691 Fix ai_developer_tools not being read before scanning for scripts
See: #528
1 year ago
Jonathan G Rennison 819b9fcdd9 Include 'perfect' mode in tree placer setting helptext 1 year ago
Jonathan G Rennison bac8f032da Re-add company shares 1 year ago
Jonathan G Rennison 02fe4af934 Merge branch 'master' into jgrpp
# Conflicts:
#	.github/workflows/release-windows.yml
#	src/company_base.h
#	src/company_cmd.cpp
#	src/company_gui.cpp
#	src/console_cmds.cpp
#	src/economy.cpp
#	src/economy_cmd.h
#	src/fios.h
#	src/goal.cpp
#	src/group_gui.cpp
#	src/network/core/config.h
#	src/network/network_admin.cpp
#	src/newgrf_config.cpp
#	src/os/windows/win32.cpp
#	src/saveload/afterload.cpp
#	src/saveload/company_sl.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload_error.hpp
#	src/settings_gui.cpp
#	src/ship_cmd.cpp
#	src/stdafx.h
#	src/story.cpp
#	src/story_base.h
#	src/string.cpp
#	src/table/settings/economy_settings.ini
#	src/tests/CMakeLists.txt
#	src/tests/math_func.cpp
1 year ago
Jonathan G Rennison fd4d4d341d Merge branch 'master' into jgrpp
# Conflicts:
#	src/animated_tile.cpp
#	src/cargopacket.h
#	src/cheat_gui.cpp
#	src/company_cmd.cpp
#	src/company_gui.cpp
#	src/date.cpp
#	src/disaster_vehicle.cpp
#	src/dock_gui.cpp
#	src/economy.cpp
#	src/engine.cpp
#	src/error_gui.cpp
#	src/fontcache/spritefontcache.cpp
#	src/game/game_gui.cpp
#	src/game/game_text.cpp
#	src/gfx.cpp
#	src/graph_gui.cpp
#	src/highscore_gui.cpp
#	src/industry_cmd.cpp
#	src/lang/dutch.txt
#	src/lang/english_AU.txt
#	src/lang/english_US.txt
#	src/lang/finnish.txt
#	src/lang/french.txt
#	src/lang/italian.txt
#	src/lang/portuguese.txt
#	src/lang/russian.txt
#	src/lang/turkish.txt
#	src/lang/vietnamese.txt
#	src/main_gui.cpp
#	src/misc_gui.cpp
#	src/network/network_gui.cpp
#	src/network/network_server.cpp
#	src/newgrf.cpp
#	src/newgrf.h
#	src/newgrf_generic.cpp
#	src/news_gui.cpp
#	src/openttd.cpp
#	src/os/unix/unix.cpp
#	src/os/windows/font_win32.cpp
#	src/os/windows/win32.cpp
#	src/rail_gui.cpp
#	src/road_gui.cpp
#	src/saveload/afterload.cpp
#	src/saveload/misc_sl.cpp
#	src/saveload/oldloader_sl.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
#	src/script/script_gui.cpp
#	src/settings_table.cpp
#	src/signs_gui.cpp
#	src/smallmap_gui.cpp
#	src/smallmap_gui.h
#	src/spritecache.cpp
#	src/spritecache.h
#	src/spriteloader/grf.cpp
#	src/station_cmd.cpp
#	src/statusbar_gui.cpp
#	src/stdafx.h
#	src/strgen/strgen_base.cpp
#	src/subsidy.cpp
#	src/table/settings/difficulty_settings.ini
#	src/texteff.cpp
#	src/timetable_cmd.cpp
#	src/timetable_gui.cpp
#	src/toolbar_gui.cpp
#	src/town_cmd.cpp
#	src/town_gui.cpp
#	src/townname.cpp
#	src/vehicle.cpp
#	src/waypoint_cmd.cpp
#	src/widgets/dropdown.cpp
#	src/window.cpp
1 year ago
Jonathan G Rennison 37b8b59c85 Merge branch 'master' into jgrpp
# Conflicts:
#	src/date_type.h
#	src/linkgraph/linkgraphjob.cpp
#	src/linkgraph/linkgraphschedule.cpp
#	src/saveload/saveload.h
#	src/table/settings/linkgraph_settings.ini
1 year ago
Jonathan G Rennison 9a4512f789 Remove linkgraph duration not day length scaled setting
Now always enabled
1 year ago
Jonathan G Rennison 5dd99fb046 Add setting for milliseconds per game tick mode 1 year ago
Jonathan G Rennison 3573571229 Allow changing tree placement algorithm setting in game 1 year ago
Jonathan G Rennison e26bea6ce4 Add setting to select cargo payment algorithm
See: #506
1 year ago
Jonathan G Rennison 6297012ad6 Fix save/load and GUI for locale.units_velocity_nautical setting 1 year ago
Jonathan G Rennison 82803b98e0 Merge branch 'master' into jgrpp
# Conflicts:
#	src/game/game_gui.cpp
#	src/graph_gui.cpp
#	src/linkgraph/linkgraph_gui.h
#	src/newgrf.cpp
#	src/order_gui.cpp
#	src/saveload/engine_sl.cpp
#	src/saveload/saveload.h
#	src/script/api/script_text.cpp
#	src/script/script_gui.cpp
#	src/settings_table.cpp
#	src/strings.cpp
#	src/table/settings/economy_settings.ini
#	src/table/settings/locale_settings.ini
#	src/timetable_gui.cpp
1 year ago
Jonathan G Rennison 1d05637d45 Add setting for rail depot maximum speed 1 year ago
Jonathan G Rennison 664c486fea Add "very reduced" mode to the vehicle breakdowns setting 1 year ago
Jonathan G Rennison 796924ec32 Change type of extended feature versions arrays 1 year ago
Jonathan G Rennison ae9b416684 Merge branch 'master' into jgrpp
# Conflicts:
#	src/ai/ai_core.cpp
#	src/ai/ai_gui.cpp
#	src/ai/ai_instance.cpp
#	src/console_cmds.cpp
#	src/engine_type.h
#	src/game/game_gui.cpp
#	src/game/game_instance.cpp
#	src/goal.cpp
#	src/goal_cmd.h
#	src/lang/english.txt
#	src/lang/estonian.txt
#	src/network/network_client.cpp
#	src/newgrf.cpp
#	src/newgrf_generic.h
#	src/openttd.cpp
#	src/saveload/saveload.h
#	src/script/api/script_log.cpp
#	src/script/api/script_town.cpp
#	src/settings_table.cpp
#	src/station_cmd.cpp
#	src/station_cmd.h
#	src/station_map.h
#	src/strings.cpp
#	src/table/settings/difficulty_settings.ini
#	src/table/settings/gui_settings.ini
#	src/tbtr_template_gui_main.h
#	src/timetable_cmd.cpp
#	src/timetable_cmd.h
#	src/timetable_gui.cpp
#	src/town_gui.cpp
#	src/train_gui.cpp
#	src/water_cmd.cpp
1 year ago
Jonathan G Rennison c80075b7cc Add setting and town override for whether towns can build bridges 1 year ago
Jonathan G Rennison 1f364c6b21 Fix the viewport map default display mode setting
Routes value was missing
Adjust strings

See: #475
1 year ago
Jonathan G Rennison 8c4c9a8c13 Enable loading game_creation.custom_industry_number from upstream saves 1 year ago
Jonathan G Rennison 3e33be7b10 Fix day length changes with scheduled dispatch and timetable start times
When time is in minutes

See: #472
1 year ago
Jonathan G Rennison b9dad1818b Add setting to disable NewGRF inflation flag 1 year ago
Jonathan G Rennison 14f4f6d104 Remove now unused vehicle.flip_direction_all_trains setting 1 year ago