0e7519f33e
Merge branch 'more_cond_orders-sx' into jgrpp
...
# Conflicts:
# config.lib
# projects/openttd_vs100.vcxproj
# projects/openttd_vs100.vcxproj.filters
# projects/openttd_vs80.vcproj
# projects/openttd_vs90.vcproj
# src/order_gui.cpp
# src/order_type.h
# src/saveload/afterload.cpp
# src/saveload/extended_ver_sl.cpp
6 years ago
635c7ca2d5
Merge branch 'save_ext' into more_cond_orders-sx
...
# Conflicts:
# src/lang/english.txt
# src/order_type.h
6 years ago
13056aedbc
Add: Conditional order for max. reliability (patch by Cirdan, #6360 ) ( #7017 )
6 years ago
83a063f51c
Add train is in slot conditional order
6 years ago
a36304481e
Fix visual glitches rendering multi-part order lines
6 years ago
6578d94e63
Add support for timetabled wait times at waypoints
6 years ago
5344ec1931
Add a "leave early" order timetable flag
...
Re-arrange timetable GUI slightly.
Add an "extra" drop-down item.
6 years ago
3ed5d8f09f
Add mechanism to lock wait times in timetable against autofill/automate changes
6 years ago
3330e4cef8
Merge branch 'cargo_type_order' into jgrpp
...
# Conflicts:
# src/pathfinder/yapf/yapf_common.hpp
# src/saveload/extended_ver_sl.cpp
# src/saveload/order_sl.cpp
# src/saveload/station_sl.cpp
# src/track_func.h
6 years ago
0ae32838ea
Merge branch 'save_ext' into cargo_type_order
...
# Conflicts:
# src/core/smallstack_type.hpp
6 years ago
ef0a458ab6
Add go to depot and sell vehicle orders
...
Controlled by a setting (default off)
6 years ago
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
7aab49e282
Add setting to enable through loading in UI
6 years ago
78838ee2a2
Add freight train load/unload mode: through load
6 years ago
2e7e712f06
Ctrl+click on shared list button in order/timetable window to add veh to group
7 years ago
ac016eae5e
Add client setting to enable shared order group window for single vehicles
7 years ago
f34833f111
Merge branch 'improved_breakdowns' into jgrpp
...
# Conflicts:
# src/vehiclelist.cpp
7 years ago
b4b98e5165
(svn r27893) -Codechange: Use fallthrough attribute. (LordAro)
7 years ago
a47fb85cd8
(svn r27893) -Codechange: Use fallthrough attribute. (LordAro)
7 years ago
ea9b28ef8c
Merge branch 'cargo_type_order' into jgrpp
...
# Conflicts:
# src/order_gui.cpp
8 years ago
c60bc7be1a
Fix refresh/validity issues for cargo type orders GUI.
...
Handle case where the order disappears/moves, fixes crash if
order list is now too short.
Refresh drop-down when running as a multiplayer client, or
when another player updates the cargo options.
8 years ago
5c7f36ef4b
Merge branch 'enhanced_viewport_overlay' into jgrpp
...
Further fixes for viewport lines/marker for multiplayer clients.
# Conflicts:
# src/lang/russian.txt
8 years ago
509da024cc
Fix viewport order lines/markers for multiplayer clients.
8 years ago
675b88b391
Merge branch 'cargo_type_order' into jgrpp
8 years ago
08fb60d314
Fix cargo drop-down boxes being too narrow, resulting in variable sizing.
8 years ago
2dba3aff72
Add override annotations to classes in order_gui.cpp
8 years ago
16ce37ad14
Show vehicle route markers when cargo load by type window focused.
8 years ago
9ea018abc5
Merge branch 'cargo_type_order' into jgrpp
...
# Conflicts:
# src/order_base.h
# src/order_gui.cpp
# src/order_type.h
# src/saveload/extended_ver_sl.cpp
# src/saveload/extended_ver_sl.h
# src/vehicle_base.h
8 years ago
ed99dd2583
Change name of Order cargo-typed get load/unload type accessors.
...
Move helper functions to get cargo-specific type in cargo-specific
mode, into Order class.
8 years ago
c1c983ea16
Import cargo type orders patch
...
https://www.tt-forums.net/viewtopic.php?p=1047749#p1047749
Port to current trunk, resolve various conflicts, etc.
Adjust bit allocations for CmdModifyOrder.
Use save_ext framework for added order flags.
8 years ago
e29da8323c
Merge branch 'enhanced_viewport_overlay-sx' into jgrpp
8 years ago
c6d9a49a73
Merge branch 'enhanced_viewport_overlay' into enhanced_viewport_overlay-sx
8 years ago
8c4904a9e4
Update route markers/lines when drag/dropping vehicle orders.
8 years ago
04b188bd7d
Add client setting to show leftover ticks in timetable.
8 years ago
0ab20d7f5c
Merge branch 'enhanced_viewport_overlay-sx' into jgrpp
8 years ago
83c2103895
Merge branch 'enhanced_viewport_overlay' into enhanced_viewport_overlay-sx
8 years ago
dd7f5dca71
Fix route step lines not being updated when cloning a vehicle's orders.
8 years ago
5149912498
Merge branch 'master' into more_cond_orders
9 years ago
9826c2481e
Merge branch 'order_occupancy-sx' into jgrpp
9 years ago
2955610575
Add order occupancy average.
...
Show overall average instead of % char in toggle button.
Add a sort mode.
9 years ago
ea3198cc25
Merge branch 'save_ext' into enhanced_viewport_overlay-sx
9 years ago
8d19727c93
Merge branch 'save_ext' into jgrpp
...
Conflicts:
src/pathfinder/follow_track.hpp
9 years ago
0dbbd19223
Merge branch 'enhanced_viewport_overlay' into jgrpp
9 years ago
129e14d817
Fix redrawing/clearing of vehicle route lines.
...
Fix new route lines not being (fully) added in a timely manner.
Fix old lines not being (fully) removed until a scroll/zoom.
Fix the screen invalidation algorithm assuming that the terrain is
perfectly flat at at near sea level. (Use of MarkTileDirtyByTile to
clear lines which do not follow tile height contours).
9 years ago
44d1fc4253
(svn r27425) -Fix [FS#5842]: Crash when switching to or taking over companies, when an order window of a vehicle of the new company was opened. Now close those windows.
9 years ago
c74ffeecd1
(svn r27425) -Fix [FS#5842]: Crash when switching to or taking over companies, when an order window of a vehicle of the new company was opened. Now close those windows.
9 years ago
2e6b4cc961
Merge branch 'reverse_at_waypoint' into jgrpp
...
Conflicts:
src/order_gui.cpp
src/saveload/extended_ver_sl.cpp
src/saveload/extended_ver_sl.h
src/train_cmd.cpp
9 years ago
7bcd090a0f
Add reverse at waypoint orders.
...
The train will reverse when its tail is within the waypoint tile.
This is useful for reversing on train en-route, without creating
dedicated reversing sidings or platforms.
9 years ago
ef1176cf9f
Merge branch 'more_cond_orders-sx' into jgrpp
9 years ago
2d47c47a45
Fix new cond. order value widgets not being in the non-train orders window.
...
Copy the missing widgets from the train orders window.
9 years ago
Jonathan G Rennison
Eddi-z
keldorkatarn
frosch