Jonathan G Rennison
|
c06acd3c47
|
Tracerestrict: Avoid double lookup when setting is restricted map bit
|
2 years ago |
|
Jonathan G Rennison
|
ccfcc22c03
|
Tracerestrict: Return error instead of assert for unknown subcommands
|
2 years ago |
|
Jonathan G Rennison
|
02dabad81e
|
Tracerestrict: Add flag for whether reserve through is always set
|
2 years ago |
|
Jonathan G Rennison
|
c4ea3e0335
|
Fully simulate slot occupancy changes in PBS res end dry-run mode
|
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
|
e5a421b65a
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/economy.cpp
# src/linkgraph/refresh.cpp
# src/order_cmd.cpp
# src/saveload/vehicle_sl.cpp
# src/station.cpp
# src/station_base.h
# src/timetable_cmd.cpp
# src/timetable_gui.cpp
# src/vehicle.cpp
# src/vehicle_base.h
# src/vehicle_cmd.cpp
|
2 years ago |
|
Jonathan G Rennison
|
904ff6757d
|
Add slot support to road vehicles, ships and aircraft
|
2 years ago |
|
Jonathan G Rennison
|
b23d394f0b
|
Handle predictable conditional orders in timetable window
|
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
|
dad007e16a
|
Fix spelling of TRPRF_SPEED_RESTRICTION_SET
|
3 years ago |
|
Jonathan G Rennison
|
1e0bea5b8d
|
Replace FindFirstBit/FindFirstBit64 with a single template function
|
3 years ago |
|
Jonathan G Rennison
|
53139c2405
|
Add current day/month to tracerestrict and conditional order conditionals
|
3 years ago |
|
Jonathan G Rennison
|
b8d5113c5a
|
Tracerestrict: Add slot action mode, try to acquire (only on reserve)
|
3 years ago |
|
Jonathan G Rennison
|
1002c6d9d2
|
Fix various compiler warnings
See: #267
|
3 years ago |
|
Jonathan G Rennison
|
0579c8755c
|
Add tracerestrict action: No PBS signal back PF penalty
|
3 years ago |
|
Jonathan G Rennison
|
112b235b71
|
Fix name prefix of TraceRestrictNewsControlField enum values
|
3 years ago |
|
Jonathan G Rennison
|
2e28bc8e6a
|
Tracerestrict: Add engine class conditional
|
3 years ago |
|
Jonathan G Rennison
|
923b2eb0a9
|
Fix tracerestrict train is loading status condition when predicting orders
|
3 years ago |
|
Jonathan G Rennison
|
aff89b61f5
|
Add tracerestrict reserved tiles ahead conditional
|
3 years ago |
|
Jonathan G Rennison
|
35d720b0ad
|
Add tracerestrict PBS end signal conditional
This is for realistic braking long reserve
|
3 years ago |
|
Jonathan G Rennison
|
8a814bbfe3
|
Add release slot train order
|
3 years ago |
|
Jonathan G Rennison
|
b7ddd486cf
|
Merge branch 'master' into jgrpp
# Conflicts:
# cmake/CompileFlags.cmake
# src/aircraft_cmd.cpp
# src/blitter/32bpp_anim.cpp
# src/cargopacket.cpp
# src/cheat_gui.cpp
# src/company_cmd.cpp
# src/company_gui.cpp
# src/core/pool_func.hpp
# src/date.cpp
# src/economy.cpp
# src/error_gui.cpp
# src/ground_vehicle.cpp
# src/ground_vehicle.hpp
# src/group_gui.cpp
# src/industry_cmd.cpp
# src/lang/dutch.txt
# src/lang/french.txt
# src/lang/german.txt
# src/linkgraph/linkgraph_gui.cpp
# src/linkgraph/mcf.cpp
# src/network/network_content.cpp
# src/network/network_server.cpp
# src/network/network_udp.cpp
# src/newgrf_engine.cpp
# src/newgrf_station.cpp
# src/order_cmd.cpp
# src/order_gui.cpp
# src/pathfinder/follow_track.hpp
# src/pathfinder/yapf/yapf_common.hpp
# src/saveload/saveload.cpp
# src/settings_gui.cpp
# src/station_cmd.cpp
# src/station_kdtree.h
# src/string_func.h
# src/table/settings.ini
# src/tgp.cpp
# src/timetable_cmd.cpp
# src/timetable_gui.cpp
# src/toolbar_gui.cpp
# src/town_cmd.cpp
# src/train_cmd.cpp
# src/train_gui.cpp
# src/tree_gui.cpp
# src/tunnelbridge_cmd.cpp
# src/vehicle.cpp
# src/vehicle_gui.cpp
# src/video/sdl2_v.cpp
# src/video/sdl_v.cpp
# src/video/win32_v.cpp
# src/viewport.cpp
# src/viewport_sprite_sorter_sse4.cpp
# src/window.cpp
|
3 years ago |
|
Jonathan G Rennison
|
6c3e5642f8
|
Merge branch 'master' into jgrpp
# Conflicts:
# cmake/CompileFlags.cmake
# src/crashlog.cpp
# src/fileio.cpp
# src/fileio_func.h
# src/fios_gui.cpp
# src/ini_load.cpp
# src/ini_type.h
# src/lang/english.txt
# src/lang/german.txt
# src/lang/korean.txt
# src/network/network_client.cpp
# src/order_base.h
# src/order_cmd.cpp
# src/os/windows/win32.cpp
# src/road_cmd.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/settings.cpp
# src/station_cmd.cpp
# src/stdafx.h
# src/table/settings.ini
# src/tree_cmd.cpp
# src/tree_gui.cpp
# src/vehicle_base.h
# src/video/cocoa/cocoa_v.mm
# src/video/cocoa/event.mm
# src/video/cocoa/wnd_quartz.mm
# src/viewport.cpp
# src/widgets/tree_widget.h
|
3 years ago |
|
Jonathan G Rennison
|
270a748b64
|
Tracerestrict: Add time/date conditional
|
4 years ago |
|
Jonathan G Rennison
|
72a7ae25e8
|
Tracerestrict: Fix program execution when skipping double non-conditional
|
4 years ago |
|
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 |