Jonathan G Rennison
|
352b361e1b
|
Viewport: Replace viewport mark dirty if zoom level below with flags param
Fix missing flags for tracerestrict and effect vehicles
|
4 years ago |
|
Jonathan G Rennison
|
abb7b69861
|
Add slot and counter support to programmable pre-signals
|
4 years ago |
|
Jonathan G Rennison
|
9ee8091ecc
|
Add conditional order which tests counter value
|
4 years ago |
|
Jonathan G Rennison
|
817bc44a3e
|
Initial implementation of tracerestrict counter mechanism
|
4 years ago |
|
Jonathan G Rennison
|
d2594ece79
|
Add routing restrictions action to control news reports about stuck trains
|
4 years ago |
|
Jonathan G Rennison
|
7960db35f2
|
Merge branch 'master' into jgrpp
# Conflicts:
# config.lib
# projects/openttd_vs140.vcxproj
# projects/openttd_vs140.vcxproj.filters
# projects/openttd_vs141.vcxproj
# projects/openttd_vs141.vcxproj.filters
# projects/openttd_vs142.vcxproj
# projects/openttd_vs142.vcxproj.filters
# src/aircraft_cmd.cpp
# src/base_station_base.h
# src/core/pool_type.hpp
# src/disaster_vehicle.cpp
# src/economy.cpp
# src/engine.cpp
# src/group.h
# src/group_cmd.cpp
# src/group_gui.cpp
# src/lang/english.txt
# src/lang/german.txt
# src/linkgraph/linkgraph_gui.cpp
# src/network/network_command.cpp
# src/network/network_server.cpp
# src/openttd.cpp
# src/order_cmd.cpp
# src/road_cmd.cpp
# src/saveload/afterload.cpp
# src/saveload/cargopacket_sl.cpp
# src/saveload/linkgraph_sl.cpp
# src/saveload/order_sl.cpp
# src/saveload/station_sl.cpp
# src/saveload/town_sl.cpp
# src/saveload/vehicle_sl.cpp
# src/screenshot.cpp
# src/screenshot.h
# src/settings_gui.cpp
# src/settings_type.h
# src/smallmap_gui.cpp
# src/station.cpp
# src/station_cmd.cpp
# src/table/settings.ini
# src/toolbar_gui.cpp
# src/town_cmd.cpp
# src/train.h
# src/train_cmd.cpp
# src/train_gui.cpp
# src/vehicle.cpp
# src/vehicle_base.h
# src/vehiclelist.cpp
# src/window_type.h
|
5 years ago |
|
Jonathan G Rennison
|
aa8aae9a62
|
Initial implementation of tracerestrict speed restriction feature
|
5 years ago |
|
Jonathan G Rennison
|
7332c0b673
|
Tracerestrict: Add load percentage conditional
|
5 years ago |
|
Jonathan G Rennison
|
2105d21356
|
Merge branch 'tracerestrict' into jgrpp
|
5 years ago |
|
Jonathan G Rennison
|
ccdc75e2bf
|
Tracerestrict: Fix non-deterministic use of _sorted_cargo_specs
|
5 years ago |
|
Jonathan G Rennison
|
e1d98e1b37
|
Check trace restrict slot vehicle index and occupants in CheckCaches
|
5 years ago |
|
Jonathan G Rennison
|
3fdd553a08
|
Handle trace restrict slots when deleting or merging company
|
5 years ago |
|
Jonathan G Rennison
|
06463b8be0
|
Merge branch 'tracerestrict-sx' into jgrpp
|
5 years ago |
|
Jonathan G Rennison
|
6b107d65d9
|
Merge branch 'tracerestrict' into tracerestrict-sx
|
5 years ago |
|
Jonathan G Rennison
|
0d2277211c
|
Fix enum type mismatch in TestOrderCondition
|
5 years ago |
|
Jonathan G Rennison
|
674732cd68
|
Merge: Codechange: Use null pointer literal instead of the NULL macro
|
5 years ago |
|
Jonathan G Rennison
|
cd41683b9b
|
Add tracerestrict feature reverse behind signal
|
6 years ago |
|
Jonathan G Rennison
|
83a063f51c
|
Add train is in slot conditional order
|
6 years ago |
|
Jonathan G Rennison
|
3e50336079
|
Add trace restrict train status conditional
|
6 years ago |
|
Jonathan G Rennison
|
f59535c0b7
|
Merge branch 'tracerestrict-sx' into jgrpp
# Conflicts:
# src/train_cmd.cpp
|
6 years ago |
keldorkatarn
|
acdeaa715e
|
Tracerestrict slots: Fix a crash bug when selling a train that's in a tracerestrict slot. Again a use of an invalid iterator. We need to check FIRST if range.first and reange.second are equal. After erasing the range those iterators are invalid.
(cherry picked from commit 7aea2ced3ced5ec4201fbad9c206451aad057718)
|
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 |
|
Jonathan G Rennison
|
751f379cdd
|
Trace restrict: Fix wrong position of safeguards header include
|
6 years ago |
|
Jonathan G Rennison
|
de4d958808
|
Fix tracerestrict current order test on load through advance order
|
6 years ago |
|
Jonathan G Rennison
|
97fd250d21
|
Remove conditional order refs when removing tracerestrict slot
See #40
|
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
|
2f3e4044b7
|
FIX: TraceRestrictSlots: Fix crash when removing vehicle from slot. Invalid iterator got used. (it was no longer valid after calling erase with it)
(cherry picked from commit 3571f1bc898b9ffd8b124040882caa5357085f42)
Fixes: #37
|
6 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
|
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
|
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
|
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
|
f10c32de53
|
Fix removal of double-length conditional instructions (PBS entry signal).
|
7 years ago |
|
Jonathan G Rennison
|
f192865c27
|
Allow shallow-removing conditional blocks by use of ctrl+click.
|
7 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
|
f942de699c
|
Add power/weight and max TE/weight ratio tracerestrict conditionals.
Minor refactorings.
|
8 years ago |
|
Jonathan G Rennison
|
91ba866852
|
Fix comment typo.
|
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 |