Jonathan G Rennison
|
28724d651d
|
Tracerestrict: Add button to highlight all signals using program
|
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
|
904ff6757d
|
Add slot support to road vehicles, ships and aircraft
|
2 years ago |
|
Jonathan G Rennison
|
644bd0a325
|
Fix input/display of speeds in tracerestrict window in tiles/day mode
|
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
|
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
|
3 years ago |
|
Jonathan G Rennison
|
61cc60099a
|
Merge branch 'jgrpp' into jgrpp-beta
# Conflicts:
# src/network/core/packet.cpp
# src/network/core/udp.cpp
|
3 years ago |
|
Jonathan G Rennison
|
53139c2405
|
Add current day/month to tracerestrict and conditional order conditionals
|
3 years ago |
|
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
|
3 years ago |
|
Jonathan G Rennison
|
b8d5113c5a
|
Tracerestrict: Add slot action mode, try to acquire (only on reserve)
|
3 years ago |
|
Jonathan G Rennison
|
906ee568d6
|
Use a lower resort interval in veh windows when sorting by timetable delay
|
3 years ago |
|
Jonathan G Rennison
|
1002c6d9d2
|
Fix various compiler warnings
See: #267
|
3 years ago |
|
Jonathan G Rennison
|
24783c3d26
|
Tracerestrict: Fix speed unit conversions in GUI
|
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
|
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
|
3 years ago |
|
Jonathan G Rennison
|
7e62af94ee
|
Remove OVEERIDE macro
|
3 years ago |
|
Jonathan G Rennison
|
60e64b3b20
|
Change tracerestrict PBS signal tile conditionals to be advanced in GUI
|
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
|
c17ec5f923
|
Fix benign type error in tracerestrict GUI
|
3 years ago |
|
Jonathan G Rennison
|
b8c3bee8b0
|
Fix clicking trains in slots window
|
3 years ago |
|
Jonathan G Rennison
|
be216952cb
|
Fix drag and drop in tracerestrict slot window
|
3 years ago |
|
Jonathan G Rennison
|
351cf27719
|
Use go to location sprite for tracerestrict go to signal button
|
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
|
39df1c49a1
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/fileio.cpp
# src/group_gui.cpp
# src/industry.h
# src/lang/korean.txt
# src/linkgraph/linkgraphjob.cpp
# src/linkgraph/linkgraphjob.h
# src/linkgraph/linkgraphschedule.cpp
# src/linkgraph/linkgraphschedule.h
# src/openttd.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/town_cmd.cpp
# src/vehicle_gui.cpp
# src/vehicle_gui_base.h
|
3 years ago |
|
Jonathan G Rennison
|
270a748b64
|
Tracerestrict: Add time/date conditional
|
4 years ago |
|
Jonathan G Rennison
|
ec339b1dfa
|
Tracerestrict: Make condition type dropdown variable width
|
4 years ago |
|
Jonathan G Rennison
|
782493003b
|
Tracerestrict: Fix counter action being shown when adv settingnot enabled
|
4 years ago |
|
Jonathan G Rennison
|
bd2649c19e
|
Avoid unnecessary redrawing of vehicle list windows
Redraw info section every tick if values have changed
|
4 years ago |
|
Jonathan G Rennison
|
151a4d85b9
|
Tracerestrict: Fix owner state of counter window
|
4 years ago |
|
Jonathan G Rennison
|
8824130b66
|
Tracerestrict: Allow referencing competitor infra where allowed by sharing
|
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
|
030e8bf762
|
Rename programmable signals to programmable pre-signals
This is to make it less unclear what they actually are and do
|
5 years ago |
|
Jonathan G Rennison
|
6d30809fc7
|
Tracerestrict: Add support for signalled tunnel/bridges to PBS entry signal conditional
|
5 years ago |
|
Jonathan G Rennison
|
cbdd9f84d8
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/console_gui.cpp
# src/lang/korean.txt
# src/video/sdl2_v.cpp
# src/video/sdl2_v.h
# src/window.cpp
# src/window_gui.h
|
5 years ago |
|
Jonathan G Rennison
|
7332c0b673
|
Tracerestrict: Add load percentage conditional
|
5 years ago |
|
Jonathan G Rennison
|
5fe784f520
|
Remove incorrect CDECL declaration from SlotNameSorter
|
5 years ago |
|
Jonathan G Rennison
|
24458e9990
|
Add various missing override specifiers
|
5 years ago |
|
Jonathan G Rennison
|
0d93ecb6bf
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/core/alloc_type.hpp
# src/group_gui.cpp
# src/newgrf.cpp
# src/saveload/economy_sl.cpp
# src/saveload/map_sl.cpp
# src/station_cmd.cpp
|
5 years ago |
|
Jonathan G Rennison
|
674732cd68
|
Merge: Codechange: Use null pointer literal instead of the NULL macro
|
5 years ago |
|
Jonathan G Rennison
|
f5747bf753
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/genworld_gui.cpp
# src/group_gui.cpp
# src/saveload/saveload.cpp
# src/settings_gui.cpp
# src/toolbar_gui.cpp
# src/vehicle_gui.cpp
# src/vehicle_gui_base.h
# src/widgets/dropdown.cpp
# src/widgets/dropdown_type.h
|
5 years ago |
|
Jonathan G Rennison
|
ba34ec7ade
|
Merge branch 'master' into jgrpp
Replace build and refit, and group collapse implementations
Fix template creation build and refit
# Conflicts:
# Makefile.bundle.in
# config.lib
# src/animated_tile.cpp
# src/blitter/32bpp_anim.hpp
# src/blitter/32bpp_base.hpp
# src/blitter/8bpp_base.hpp
# src/blitter/null.hpp
# src/build_vehicle_gui.cpp
# src/command.cpp
# src/command_func.h
# src/console_gui.cpp
# src/core/smallstack_type.hpp
# src/date.cpp
# src/debug.cpp
# src/genworld_gui.cpp
# src/ground_vehicle.hpp
# src/group_gui.cpp
# src/lang/korean.txt
# src/linkgraph/linkgraph_gui.h
# src/main_gui.cpp
# src/misc_gui.cpp
# src/network/core/game.h
# src/network/core/packet.cpp
# src/network/core/udp.cpp
# src/network/core/udp.h
# src/network/network_content.cpp
# src/network/network_type.h
# src/network/network_udp.cpp
# src/newgrf_house.h
# src/openttd.cpp
# src/order_cmd.cpp
# src/order_gui.cpp
# src/os/unix/crashlog_unix.cpp
# src/os/windows/crashlog_win.cpp
# src/osk_gui.cpp
# src/pathfinder/opf/opf_ship.cpp
# src/rail_cmd.cpp
# src/rail_gui.cpp
# src/saveload/saveload.cpp
# src/settings.cpp
# src/settings_gui.cpp
# src/smallmap_gui.h
# src/station_base.h
# src/station_cmd.cpp
# src/table/gameopt_settings.ini
# src/table/newgrf_debug_data.h
# src/table/settings.ini
# src/timetable_gui.cpp
# src/toolbar_gui.cpp
# src/train_gui.cpp
# src/vehicle.cpp
# src/vehicle_gui.cpp
# src/vehiclelist.cpp
# src/viewport.cpp
# src/widgets/dropdown.cpp
# src/window_gui.h
|
5 years ago |
|
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 |