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 |
|
Jonathan G Rennison
|
cd091e04f5
|
Add settings filter to only show non-vanilla settings
|
8 months ago |
|
Jonathan G Rennison
|
0620026d56
|
Tracerestrict: Add long reserve (unless stopping) mode
Requires realistic braking
|
8 months ago |
|
Jonathan G Rennison
|
8a0fab1d4c
|
Add setting for whether water floods from map edges
|
8 months ago |
|
Jonathan G Rennison
|
ad3980e596
|
Add setting for whether non-leading train engines keep custom names
|
8 months ago |
|
Jonathan G Rennison
|
59ea48c541
|
Scheduled dispatch: Allow moving dispatch schedules in schedule list
|
8 months ago |
|
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
|
5f8bfb176c
|
Support articulated engines with multiple cargoes in engine news messages
|
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 |
Daniel Hill
|
924b2ab9ec
|
Add an optional "(City)" in Viewport labels
|
10 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
|
11bf8e22d7
|
Add setting to show order number in vehicle view window
|
11 months ago |
|
Jonathan G Rennison
|
5ce863d165
|
Show distance information in linkgraph tooltip when ctrl pressed
|
11 months ago |
|
Jonathan G Rennison
|
7ffc9c9339
|
Merge PR #568 into jgrpp
|
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 |
|
Jonathan G Rennison
|
5d7721a2d4
|
Fix handling of free wagons in depot tooltip
See: #564
|
11 months ago |
|
Jonathan G Rennison
|
359ba9de68
|
String handling adjustments for PR #564
|
11 months ago |
|
RoqueDeicide
|
84e5aba1d7
|
[Change] Reworked stockpile settings into 1 dropdown.
|
11 months ago |
|
RoqueDeicide
|
cadb2f3afc
|
[Change] Added ability for detailed depot viewport tooltips to show single lines, if possible. Made some suggested adjustments.
|
11 months ago |
|
RoqueDeicide
|
733f53dc9a
|
Merge branch 'tooltip_extension' into jgrpp
|
11 months ago |
|
RoqueDeicide
|
736c650b6c
|
[Change] Make town viewport tooltips functionally equivalent to town labels.
|
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 |