Commit Graph

62 Commits (424e4691ce2122ccfe42d19aad4edb6b71b5c689)

Author SHA1 Message Date
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
Jonathan G Rennison 9ed3dc2581 Merge branch 'tracerestrict' into tracerestrict-sx 8 years ago
Jonathan G Rennison 213b0e7e3a Tracerestrict: Add a group membership conditional. 8 years ago
Jonathan G Rennison 73e8c32a5d Merge branch 'tracerestrict-sx' into jgrpp
Conflicts:
	src/saveload/extended_ver_sl.cpp
	src/tracerestrict.h
	src/tracerestrict_gui.cpp
	src/train_cmd.cpp
9 years ago
Jonathan G Rennison 4fdc495eea Merge branch 'tracerestrict' into tracerestrict-sx 9 years ago
patch-import 82cab7f31c Tracerestrict: Import "Long Reserve" feature.
https://github.com/KeldorKatarn/OpenTTD_PatchPack

Minor code de-duplications.
9 years ago
Jonathan G Rennison 0c29f9f9a0 Merge branch 'tracerestrict-sx' into jgrpp 9 years ago
Jonathan G Rennison feeae4a200 Merge branch 'tracerestrict' into tracerestrict-sx 9 years ago
Jonathan G Rennison b5b06351ac Tracerestrict: Fix GUI issue with picker button raise/lower states.
When a picker button was selected, clicking on a different picker button
would cause both buttons to be raised, instead of just the previous.
9 years ago
Jonathan G Rennison 7673436d3a Trace restrict: add train ownership conditional.
Infra sharing whitespace fix.
9 years ago
Jonathan G Rennison ecbbc03794 Merge branch 'tracerestrict' into tracerestrict-sx 9 years ago
Jonathan G Rennison 9c5189b212 Handle double instructions correctly when deleting stations/depots/etc.
Fix some whitespace and comment typos.
9 years ago
Jonathan G Rennison 8f4c216b3f Merge branch 'tracerestrict' into tracerestrict-sx 9 years ago
Jonathan G Rennison e2435c7169 Only run trace restrict programs if they contain relevant actions.
Only run in pathfinder case if deny or penalty are present.
Only run in is safe waiting tile case is reserve through is present.
Presence is determined at program validation time and cached in the
program structure.
Validator now checks for unknown non-conditional instructions.
9 years ago
Jonathan G Rennison 06a1d7c5c9 Add reserve through action to trace restrict programs.
This only changes the behaviour of PBS reservations which
would otherwise terminate at a PBS signal.
If the signal restriction sets the reserve through state,
the reservation continues through the signal, and the signal
is set to green.
9 years ago
Jonathan G Rennison 06cc930e47 Improve insertion and removal of 'or if' conditionals.
Allow inserting an 'or if' immediately after 'if', 'else if', 'or if'.
Removing an 'or if' no longer removes the associated block.
9 years ago
Jonathan G Rennison c4565f6bb0 Merge branch 'tracerestrict' into tracerestrict-sx 9 years ago
Jonathan G Rennison 76707fb72a Change pf penalty restriction value button to preset values and a custom option.
Preset values are 'small', 'medium' and 'large'.
Change default to 'small' preset.
9 years ago
Jonathan G Rennison 09f8ff420f Merge branch 'tracerestrict' into tracerestrict-sx
Conflicts:
	src/tracerestrict_gui.cpp
9 years ago
Jonathan G Rennison a0520b8937 Initial implementation of PBS entry signal condition variable.
TODO: see how the efficiency of this can be improved.
9 years ago