Jonathan G Rennison
|
e3d167f9f0
|
Merge branch 'save_ext' into jgrpp
# Conflicts:
# config.lib
# src/misc_gui.cpp
# src/network/network_gui.cpp
# src/settings_type.h
# src/smallmap_gui.cpp
# src/smallmap_gui.h
# src/station_cmd.cpp
# src/toolbar_gui.cpp
# src/vehicle_gui.cpp
# src/window.cpp
|
6 years ago |
|
Jonathan G Rennison
|
8b1991983f
|
Make reverse behind signal tracerestrict action an advanced feature in GUI
|
6 years ago |
|
Jonathan G Rennison
|
cd41683b9b
|
Add tracerestrict feature reverse behind signal
|
6 years ago |
|
Jonathan G Rennison
|
a6596a6e34
|
Merge branch 'tracerestrict-sx' into jgrpp
|
6 years ago |
|
Jonathan G Rennison
|
7877b40699
|
Fix missing switch-case break in tracerestrict GUI
Fixes #66
|
6 years ago |
|
Jonathan G Rennison
|
3e50336079
|
Add trace restrict train status conditional
|
6 years ago |
|
Jonathan G Rennison
|
2586096ef6
|
Merge branch 'tracerestrict-sx' into jgrpp
# Conflicts:
# src/pbs.cpp
# src/saveload/extended_ver_sl.cpp
|
6 years ago |
|
Jonathan G Rennison
|
e9f5d80440
|
Trace restrict slots: Add support for slot operations at PBS end signal
|
6 years ago |
|
Jonathan G Rennison
|
1b4db7d86c
|
Trace restrict: Add wait at entrance PBS for reservation ending here
|
6 years ago |
keldorkatarn
|
78588d8ce5
|
First implementation of conditional order checking slot occupancy
(cherry picked from commit 524e3e56cb4a357ba60335f91dce1e00cb8d22f2)
Some code adjustments: serialisation/storage, formatting
See: #40
|
6 years ago |
|
Jonathan G Rennison
|
02328680a1
|
Merge branch 'tracerestrict-sx' into jgrpp
|
6 years ago |
|
keldorkatarn
|
f10840438e
|
TraceRestrictSlots: Fix highlighting behavior. Marking group ALL_SLOTS didn't reset the selected slot and dragging from ALL to ALL threw an unnecessary error.
(cherry picked from commit c76b560134bd8d9869ead872f7a434e61a5c5a48)
Fixes: #38
|
6 years ago |
|
Jonathan G Rennison
|
097cf9b0b1
|
Add UI setting to control whether cargo filter drop down is shown
|
7 years ago |
|
Jonathan G Rennison
|
f3c95dd9a7
|
Add cargo filter support to vehicle list and tracerestrict slot windows
Refactor out common code
|
7 years ago |
|
Jonathan G Rennison
|
1d1718c226
|
Merge branch 'tracerestrict-sx' into jgrpp
|
7 years ago |
|
Jonathan G Rennison
|
58a860c087
|
Fix selected item in dropdown for conditional to test slot occupancy state
|
7 years ago |
|
Jonathan G Rennison
|
64d9cdd6f0
|
Merge branch 'tracerestrict-sx' into jgrpp
|
7 years ago |
|
Jonathan G Rennison
|
b004c1998f
|
Merge branch 'tracerestrict' into tracerestrict-sx
|
7 years ago |
|
Jonathan G Rennison
|
7986367c1f
|
Tracerestrict: Add program append management action.
|
7 years ago |
|
Jonathan G Rennison
|
bfb8f6f32e
|
Merge branch 'tracerestrict-sx' into jgrpp
# Conflicts:
# src/saveload/extended_ver_sl.cpp
# src/tracerestrict.h
# src/tracerestrict_gui.cpp
|
7 years ago |
|
Jonathan G Rennison
|
c44141bad6
|
Add conditional to test slot occupancy state.
Bump tracerestrict version.
|
7 years ago |
|
Jonathan G Rennison
|
c94b7a6240
|
Add safeguard includes to tracerestrict files.
|
7 years ago |
|
Jonathan G Rennison
|
b8328ad21f
|
Merge branch 'tracerestrict-sx' into jgrpp
# Conflicts:
# src/command.cpp
# src/group_gui.cpp
# src/lang/english.txt
# src/saveload/extended_ver_sl.cpp
# src/settings_gui.cpp
# src/tracerestrict.cpp
# src/tracerestrict.h
# src/tracerestrict_gui.cpp
# src/vehicle_gui.cpp
# src/vehicle_gui_base.h
# src/vehiclelist.cpp
# src/window_type.h
|
7 years ago |
|
Jonathan G Rennison
|
0772236986
|
Add a release slot at front of train slot action.
Distinguish from release slot at back.
Fix slot release and acquire at front when passing PBS from back.
|
7 years ago |
|
Jonathan G Rennison
|
7dbf99fa33
|
Add UI setting to hide adv tracerestrict features from GUI
Hide wait at PBS and slot features.
|
7 years ago |
|
Jonathan G Rennison
|
927323dcb1
|
Add trace restrict slot membership conditional.
|
7 years ago |
|
Jonathan G Rennison
|
6417fb16c3
|
Initial implementation of trace restrict slots
|
7 years ago |
|
Jonathan G Rennison
|
0430502faa
|
Merge branch 'tracerestrict' into tracerestrict-sx
|
7 years ago |
|
Jonathan G Rennison
|
5a2d482c28
|
Tracerestrict: Add wait at PBS signal action.
|
7 years ago |
|
Jonathan G Rennison
|
8cf0f354d9
|
Merge branch 'tracerestrict-sx' into jgrpp
|
7 years ago |
|
Jonathan G Rennison
|
87f583fd99
|
Merge branch 'tracerestrict' into tracerestrict-sx
|
7 years ago |
|
Jonathan G Rennison
|
13f8de58c3
|
Add instruction move up/down buttons to GUI.
Has block and individual instruction move modes, depending on ctrl.
|
7 years ago |
|
Jonathan G Rennison
|
a2a8f7f7b7
|
Change goto signal button in GUI to have push-button behaviour.
|
7 years ago |
|
Jonathan G Rennison
|
f192865c27
|
Allow shallow-removing conditional blocks by use of ctrl+click.
|
7 years ago |
|
Jonathan G Rennison
|
0ebfcc23a5
|
Implement instruction scroll-to for PBS entry signal conditional in GUI.
|
7 years ago |
|
Jonathan G Rennison
|
1e8de54944
|
Merge branch 'tracerestrict-sx' into jgrpp
|
8 years ago |
|
Jonathan G Rennison
|
15787545a0
|
Merge branch 'tracerestrict' into tracerestrict-sx
|
8 years ago |
|
Jonathan G Rennison
|
78b7223272
|
Make tracerestrict GUI mouse-wheel scrollable.
|
8 years ago |
|
Jonathan G Rennison
|
3ea652c4b9
|
Merge branch 'tracerestrict-sx' into jgrpp
|
8 years ago |
|
Jonathan G Rennison
|
8482fc6aef
|
Merge branch 'tracerestrict' into tracerestrict-sx
|
8 years ago |
|
Jonathan G Rennison
|
3d6cbb76b4
|
Allow value of "PBS entry signal" conditional to be a rail depot.
|
8 years ago |
|
Jonathan G Rennison
|
f0fee802a9
|
Merge branch 'tracerestrict-sx' into jgrpp
# Conflicts:
# src/lang/english.txt
# src/settings_gui.cpp
# src/settings_type.h
# src/table/settings.ini
# src/vehicle_gui.cpp
|
8 years ago |
|
Jonathan G Rennison
|
ed33a62bcd
|
Merge branch 'tracerestrict' into tracerestrict-sx
|
8 years ago |
|
Jonathan G Rennison
|
8ec1b2200e
|
Change tracerestrict weight ratio properties to use decimals, and the weight unit.
Add {POWER_WEIGHT_RATIO} and {FORCE_WEIGHT_RATIO} string codes.
|
8 years ago |
|
Jonathan G Rennison
|
80e3af6bf5
|
Merge branch 'tracerestrict-sx' into jgrpp
# Conflicts:
# src/lang/english.txt
# src/saveload/extended_ver_sl.cpp
# src/tracerestrict.cpp
# src/tracerestrict.h
# src/tracerestrict_gui.cpp
|
8 years ago |
|
Jonathan G Rennison
|
e4b932d53a
|
Merge branch 'tracerestrict' into tracerestrict-sx
|
8 years ago |
|
Jonathan G Rennison
|
f942de699c
|
Add power/weight and max TE/weight ratio tracerestrict conditionals.
Minor refactorings.
|
8 years ago |
|
Jonathan G Rennison
|
2c6f74a982
|
Move header definition for unit conversion functions to own header.
|
8 years ago |
|
Jonathan G Rennison
|
b5531975da
|
Add train weight, power, and max TE tracerestrict conditionals.
Minor refactorings.
|
8 years ago |
|
Jonathan G Rennison
|
0d26da998b
|
Merge branch 'tracerestrict-sx' into jgrpp
# Conflicts:
# src/group_cmd.cpp
# src/group_gui.cpp
# src/lang/english.txt
# src/saveload/extended_ver_sl.cpp
# src/tracerestrict.cpp
# src/tracerestrict.h
# src/tracerestrict_gui.cpp
|
8 years ago |