Jonathan G Rennison
|
a18f3274b4
|
Rename close window functions to match upstream
|
9 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
|
672382f960
|
Tracrestrict: Fix non-train slot windows allowing unusable sort modes
|
9 months ago |
|
Jonathan G Rennison
|
a29c01493d
|
Tracerestrict: Fix train texts used in non-train slots windows
See: #593
|
9 months ago |
|
Jonathan G Rennison
|
e377535ea6
|
Routing restrictions: Fix instruction indent in RTL mode
|
9 months ago |
|
Jonathan G Rennison
|
5a28405ced
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/company_gui.cpp
# src/group_gui.cpp
# src/newgrf.cpp
# src/newgrf_debug_gui.cpp
# src/saveload/saveload.cpp
|
10 months ago |
|
Jonathan G Rennison
|
fac21f3429
|
Fix missing/incorrect command error texts
|
10 months ago |
|
Jonathan G Rennison
|
02549c5224
|
Merge branch 'master' into jgrpp
# Conflicts:
# cmake/CompileFlags.cmake
# src/cargomonitor.cpp
# src/core/CMakeLists.txt
# src/economy.cpp
# src/landscape.cpp
# src/linkgraph/flowmapper.cpp
# src/linkgraph/linkgraph_gui.cpp
# src/linkgraph/linkgraphschedule.cpp
# src/misc_gui.cpp
# src/newgrf_generic.cpp
# src/newgrf_storage.cpp
# src/rail_gui.cpp
# src/saveload/afterload.cpp
# src/saveload/station_sl.cpp
# src/script/script_gui.cpp
# src/station_cmd.cpp
# src/station_gui.cpp
# src/string_func.h
# src/terraform_cmd.cpp
|
12 months ago |
|
Jonathan G Rennison
|
2450705aa0
|
Use btree map for tracerestrict GUI drop down list mapping
|
1 year ago |
|
Jonathan G Rennison
|
326d0c329c
|
Remove some unnecessary colour strings
|
1 year ago |
|
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
|
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
|
29495b4e3d
|
Tracerestrict: Fix default state of copy/share button planes
|
1 year ago |
|
Jonathan G Rennison
|
731f2fb46e
|
Tracerestrict: Add button to share program onto other signals
|
1 year ago |
|
Jonathan G Rennison
|
9f89f1fb42
|
Tracerestrict: Do not change copy button selection plane when active
|
1 year ago |
|
Jonathan G Rennison
|
1bee438aff
|
Re-add vertical spacer in slots window right panel
See: #515
|
1 year ago |
|
Jonathan G Rennison
|
d5c651dc0b
|
Fix width of left panel in slots window when using UI scaling
See: #515
|
1 year ago |
|
Jonathan G Rennison
|
a6ba3de7e9
|
Fix slots window not being horizontally resizable
See: #515
|
1 year ago |
|
Jonathan G Rennison
|
65cc6623dd
|
Tracerestrict: Add button to duplicate instruction/block
|
1 year ago |
|
Jonathan G Rennison
|
7da25820ea
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/widgets/dropdown.cpp
# src/widgets/dropdown_type.h
|
1 year ago |
|
Jonathan G Rennison
|
55f11129c8
|
Tracerestrict: Add status test for if train is stopping at order destination
Station/waypoint of current order
|
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
|
ef95af6987
|
Tracerestrict: Warn when reserved tiles ahead used without realistic braking
|
1 year ago |
|
Jonathan G Rennison
|
fd144369a9
|
Tracerestrict: Re-order action/condition type dropdown
Refactor lists to simplify hide conditions
|
1 year ago |
|
Jonathan G Rennison
|
4ec6a99dd8
|
Add GetTileTrackStatus wrapper for when red signals part is not needed
|
1 year ago |
|
Jonathan G Rennison
|
3e7a625e0e
|
Fix function locals shadowing parameters
|
1 year ago |
|
Jonathan G Rennison
|
07b7cc5652
|
Tracerestrict: Add condition whether reservation passes through tile
|
1 year ago |
|
Jonathan G Rennison
|
c457dc680b
|
Adjust height of vehicle list items in vehicle lists
|
2 years ago |
|
Jonathan G Rennison
|
6d4474b84e
|
Merge tag '13.0-beta2' into jgrpp
# Conflicts:
# src/cheat_gui.cpp
# src/company_gui.cpp
# src/console_gui.cpp
# src/depot_gui.cpp
# src/error_gui.cpp
# src/gfx.cpp
# src/graph_gui.cpp
# src/group_gui.cpp
# src/lang/english.txt
# src/lang/korean.txt
# src/lang/polish.txt
# src/misc_gui.cpp
# src/network/network_content_gui.h
# src/newgrf_debug_gui.cpp
# src/order_gui.cpp
# src/rail_gui.cpp
# src/road_gui.cpp
# src/settings_gui.cpp
# src/settings_type.h
# src/station_gui.cpp
# src/subsidy_gui.cpp
# src/table/settings/gui_settings.ini
# src/timetable_gui.cpp
# src/town_gui.cpp
# src/train_cmd.cpp
# src/vehicle_gui.cpp
# src/viewport.cpp
# src/water_cmd.cpp
# src/widgets/dropdown.cpp
# src/window_gui.h
|
2 years ago |
|
Jonathan G Rennison
|
7167175aa5
|
Simplify strings for tracerestrict change counter action
|
2 years ago |
|
Jonathan G Rennison
|
7c4c75d181
|
Add tracerestrict conditional on direction of order target from signal
|
2 years ago |
|
Jonathan G Rennison
|
d48912aa15
|
Add setting to show full group hierarchy in group names
|
2 years ago |
|
Jonathan G Rennison
|
6a69a5495f
|
Add tracerestrict action to set combined normal/shunt signal mode
Add associated conditional to get reservation end tile
|
2 years ago |
|
Jonathan G Rennison
|
52f28eb5c1
|
Tracerestrict GUI: Refactor string handling for realistic braking warning
|
2 years ago |
|
Jonathan G Rennison
|
28724d651d
|
Tracerestrict: Add button to highlight all signals using program
|
2 years ago |
|
Jonathan G Rennison
|
221120090e
|
Fix wrong prefix in trace restrict enum
TRSACF_REMOVE_SPEED_ADAPT_EXEMPT in
TraceRestrictSpeedAdaptationControlField
|
2 years ago |
|
Jonathan G Rennison
|
92142e5684
|
Add routing restriction action to make exempt from speed adaptation
|
2 years ago |
|
Jonathan G Rennison
|
904ff6757d
|
Add slot support to road vehicles, ships and aircraft
|
2 years ago |
|
Jonathan G Rennison
|
644bd0a325
|
Fix input/display of speeds in tracerestrict window in tiles/day mode
|
2 years ago |
|
Jonathan G Rennison
|
b259d04339
|
Add tunnel/bridge entrance/exit values to entry direction conditional
|
3 years ago |
|
Jonathan G Rennison
|
74bfe4e6d2
|
Allow placing routing restrictions on tunnel/bridge entrance/exit signals
No reserve through support
|
3 years ago |
|
Jonathan G Rennison
|
f54d69a60a
|
Merge branch 'master' into jgrpp-beta
# Conflicts:
# src/economy.cpp
# src/elrail.cpp
# src/graph_gui.cpp
# src/linkgraph/linkgraph_gui.cpp
# src/network/core/game_info.cpp
# src/newgrf_station.cpp
# src/saveload/saveload.cpp
# src/settings.cpp
# src/station_cmd.cpp
# src/station_gui.cpp
# src/strings_func.h
# src/table/settings/network_settings.ini
# src/table/settings/settings.ini
|
3 years ago |
|
Jonathan G Rennison
|
61cc60099a
|
Merge branch 'jgrpp' into jgrpp-beta
# Conflicts:
# src/network/core/packet.cpp
# src/network/core/udp.cpp
|
3 years ago |
|
Jonathan G Rennison
|
53139c2405
|
Add current day/month to tracerestrict and conditional order conditionals
|
3 years ago |
|
Jonathan G Rennison
|
fd605e3cf3
|
Merge branch 'master' into jgrpp-beta
# Conflicts:
# .github/workflows/commit-checker.yml
# src/company_cmd.cpp
# src/console_cmds.cpp
# src/crashlog.cpp
# src/lang/english.txt
# src/lang/german.txt
# src/lang/indonesian.txt
# src/lang/japanese.txt
# src/lang/korean.txt
# src/lang/swedish.txt
# src/linkgraph/linkgraphjob.cpp
# src/linkgraph/mcf.cpp
# src/network/core/tcp.cpp
# src/network/core/tcp.h
# src/network/core/tcp_game.h
# src/network/core/udp.h
# src/network/network.cpp
# src/network/network_admin.cpp
# src/network/network_admin.h
# src/network/network_chat_gui.cpp
# src/network/network_client.cpp
# src/network/network_client.h
# src/network/network_func.h
# src/network/network_internal.h
# src/network/network_server.cpp
# src/network/network_server.h
# src/newgrf.cpp
# src/newgrf_station.cpp
# src/order_gui.cpp
# src/rail_cmd.cpp
# src/saveload/saveload.cpp
# src/settings.cpp
# src/settings_gui.cpp
# src/settings_internal.h
# src/settings_type.h
# src/station_cmd.cpp
# src/stdafx.h
# src/table/currency_settings.ini
# src/table/misc_settings.ini
# src/table/settings.h.preamble
# src/table/settings.ini
# src/terraform_cmd.cpp
# src/timetable_gui.cpp
# src/train_cmd.cpp
# src/tree_cmd.cpp
# src/water_cmd.cpp
|
3 years ago |
|
Jonathan G Rennison
|
b8d5113c5a
|
Tracerestrict: Add slot action mode, try to acquire (only on reserve)
|
3 years ago |
|
Jonathan G Rennison
|
906ee568d6
|
Use a lower resort interval in veh windows when sorting by timetable delay
|
3 years ago |
|
Jonathan G Rennison
|
1002c6d9d2
|
Fix various compiler warnings
See: #267
|
3 years ago |
|
Jonathan G Rennison
|
24783c3d26
|
Tracerestrict: Fix speed unit conversions in GUI
|
3 years ago |
|
Jonathan G Rennison
|
0579c8755c
|
Add tracerestrict action: No PBS signal back PF penalty
|
3 years ago |