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
|
2023-06-08 00:01:38 +01:00 |
|
Jonathan G Rennison
|
2450705aa0
|
Use btree map for tracerestrict GUI drop down list mapping
|
2023-06-01 17:48:24 +01:00 |
|
Jonathan G Rennison
|
326d0c329c
|
Remove some unnecessary colour strings
|
2023-06-01 00:14:37 +01:00 |
|
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
|
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
|
2023-05-30 00:49:24 +01:00 |
|
Jonathan G Rennison
|
29495b4e3d
|
Tracerestrict: Fix default state of copy/share button planes
|
2023-05-16 23:13:55 +01:00 |
|
Jonathan G Rennison
|
731f2fb46e
|
Tracerestrict: Add button to share program onto other signals
|
2023-05-16 21:10:54 +01:00 |
|
Jonathan G Rennison
|
9f89f1fb42
|
Tracerestrict: Do not change copy button selection plane when active
|
2023-05-16 19:53:24 +01:00 |
|
Jonathan G Rennison
|
1bee438aff
|
Re-add vertical spacer in slots window right panel
See: #515
|
2023-05-13 17:07:33 +01:00 |
|
Jonathan G Rennison
|
d5c651dc0b
|
Fix width of left panel in slots window when using UI scaling
See: #515
|
2023-05-13 12:24:31 +01:00 |
|
Jonathan G Rennison
|
a6ba3de7e9
|
Fix slots window not being horizontally resizable
See: #515
|
2023-05-13 12:18:23 +01:00 |
|
Jonathan G Rennison
|
65cc6623dd
|
Tracerestrict: Add button to duplicate instruction/block
|
2023-05-05 23:34:48 +01:00 |
|
Jonathan G Rennison
|
7da25820ea
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/widgets/dropdown.cpp
# src/widgets/dropdown_type.h
|
2023-04-18 00:01:50 +01:00 |
|
Jonathan G Rennison
|
55f11129c8
|
Tracerestrict: Add status test for if train is stopping at order destination
Station/waypoint of current order
|
2023-04-11 22:01:51 +01:00 |
|
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
|
2023-04-10 15:11:53 +01:00 |
|
Jonathan G Rennison
|
ef95af6987
|
Tracerestrict: Warn when reserved tiles ahead used without realistic braking
|
2023-03-08 21:14:41 +00:00 |
|
Jonathan G Rennison
|
fd144369a9
|
Tracerestrict: Re-order action/condition type dropdown
Refactor lists to simplify hide conditions
|
2023-03-08 20:33:57 +00:00 |
|
Jonathan G Rennison
|
4ec6a99dd8
|
Add GetTileTrackStatus wrapper for when red signals part is not needed
|
2023-03-04 02:01:40 +00:00 |
|
Jonathan G Rennison
|
3e7a625e0e
|
Fix function locals shadowing parameters
|
2023-02-16 00:09:14 +00:00 |
|
Jonathan G Rennison
|
07b7cc5652
|
Tracerestrict: Add condition whether reservation passes through tile
|
2023-02-06 19:54:14 +00:00 |
|
Jonathan G Rennison
|
c457dc680b
|
Adjust height of vehicle list items in vehicle lists
|
2022-12-04 22:02:26 +00:00 |
|
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
|
2022-12-04 20:43:11 +00:00 |
|
Jonathan G Rennison
|
7167175aa5
|
Simplify strings for tracerestrict change counter action
|
2022-10-13 19:04:59 +01:00 |
|
Jonathan G Rennison
|
7c4c75d181
|
Add tracerestrict conditional on direction of order target from signal
|
2022-09-07 22:53:03 +01:00 |
|
Jonathan G Rennison
|
d48912aa15
|
Add setting to show full group hierarchy in group names
|
2022-06-28 17:41:09 +01:00 |
|
Jonathan G Rennison
|
6a69a5495f
|
Add tracerestrict action to set combined normal/shunt signal mode
Add associated conditional to get reservation end tile
|
2022-06-28 01:16:57 +01:00 |
|
Jonathan G Rennison
|
52f28eb5c1
|
Tracerestrict GUI: Refactor string handling for realistic braking warning
|
2022-06-28 00:52:55 +01:00 |
|
Jonathan G Rennison
|
28724d651d
|
Tracerestrict: Add button to highlight all signals using program
|
2022-06-11 23:29:37 +01:00 |
|
Jonathan G Rennison
|
221120090e
|
Fix wrong prefix in trace restrict enum
TRSACF_REMOVE_SPEED_ADAPT_EXEMPT in
TraceRestrictSpeedAdaptationControlField
|
2022-03-07 00:40:22 +00:00 |
|
Jonathan G Rennison
|
92142e5684
|
Add routing restriction action to make exempt from speed adaptation
|
2022-03-06 22:39:53 +00:00 |
|
Jonathan G Rennison
|
904ff6757d
|
Add slot support to road vehicles, ships and aircraft
|
2022-01-19 00:10:49 +00:00 |
|
Jonathan G Rennison
|
644bd0a325
|
Fix input/display of speeds in tracerestrict window in tiles/day mode
|
2022-01-11 21:38:19 +00:00 |
|
Jonathan G Rennison
|
b259d04339
|
Add tunnel/bridge entrance/exit values to entry direction conditional
|
2021-11-13 22:52:27 +00:00 |
|
Jonathan G Rennison
|
74bfe4e6d2
|
Allow placing routing restrictions on tunnel/bridge entrance/exit signals
No reserve through support
|
2021-11-13 22:28:14 +00:00 |
|
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
|
2021-11-01 21:18:24 +00:00 |
|
Jonathan G Rennison
|
61cc60099a
|
Merge branch 'jgrpp' into jgrpp-beta
# Conflicts:
# src/network/core/packet.cpp
# src/network/core/udp.cpp
|
2021-10-29 22:22:54 +01:00 |
|
Jonathan G Rennison
|
53139c2405
|
Add current day/month to tracerestrict and conditional order conditionals
|
2021-10-26 23:39:40 +01:00 |
|
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
|
2021-09-27 22:47:23 +01:00 |
|
Jonathan G Rennison
|
b8d5113c5a
|
Tracerestrict: Add slot action mode, try to acquire (only on reserve)
|
2021-08-15 22:39:52 +01:00 |
|
Jonathan G Rennison
|
906ee568d6
|
Use a lower resort interval in veh windows when sorting by timetable delay
|
2021-06-28 22:37:40 +01:00 |
|
Jonathan G Rennison
|
1002c6d9d2
|
Fix various compiler warnings
See: #267
|
2021-06-11 22:54:27 +01:00 |
|
Jonathan G Rennison
|
24783c3d26
|
Tracerestrict: Fix speed unit conversions in GUI
|
2021-06-11 00:39:24 +01:00 |
|
Jonathan G Rennison
|
0579c8755c
|
Add tracerestrict action: No PBS signal back PF penalty
|
2021-05-25 18:50:36 +01:00 |
|
Jonathan G Rennison
|
112b235b71
|
Fix name prefix of TraceRestrictNewsControlField enum values
|
2021-05-25 18:21:24 +01:00 |
|
Jonathan G Rennison
|
2e28bc8e6a
|
Tracerestrict: Add engine class conditional
|
2021-05-13 23:49:03 +01:00 |
|
Jonathan G Rennison
|
253772e9af
|
Merge branch 'master' into jgrpp
# Conflicts:
# CMakeLists.txt
# COMPILING.md
# src/console.cpp
# src/console_cmds.cpp
# src/console_internal.h
# src/rev.cpp.in
|
2021-04-25 02:14:58 +01:00 |
|
Jonathan G Rennison
|
7e62af94ee
|
Remove OVEERIDE macro
|
2021-03-02 23:45:08 +00:00 |
|
Jonathan G Rennison
|
60e64b3b20
|
Change tracerestrict PBS signal tile conditionals to be advanced in GUI
|
2021-02-13 03:50:33 +00:00 |
|
Jonathan G Rennison
|
aff89b61f5
|
Add tracerestrict reserved tiles ahead conditional
|
2021-02-13 03:29:35 +00:00 |
|
Jonathan G Rennison
|
35d720b0ad
|
Add tracerestrict PBS end signal conditional
This is for realistic braking long reserve
|
2021-02-13 02:12:16 +00:00 |
|