37683d8f50
Cargo type orders window: Use single command to change all cargoes at once
4 years ago
3a9b38bb10
Cargo type orders window: Use two columns when more than 32 cargos
4 years ago
05dc785f13
Split STR_ORDER_CONDITIONAL_CARGO string into two, adjust format
...
See: #172
4 years ago
0202211514
Conditional orders: Add slot acquire modes to train in slot conditional
4 years ago
0100ea4e32
Conditional orders: Add mode to check waiting station cargo via next node
4 years ago
59d84975e0
Fix length limit of waiting cargo amount cond order text input
4 years ago
692d836664
Fix rendering issue with scheduled dispatch tag in timetable/order list
4 years ago
6e6be7f36f
Fix 09b13dd4: Crash when opening order window of competitor vehicle
4 years ago
9917a1daef
Scheduled dispatch: Add hints about dispatch order to timetable window
...
Adjust condition for dispatch order
4 years ago
c4ec533d44
Fix train-only conditional orders being listed in non-train dropdown
5 years ago
09b13dd484
Add conditional orders for cargo load percentage and waiting cargo amount
...
See: #90
5 years ago
a0e92e50f6
Do not show slots conditional order types when slots not enabled in UI
5 years ago
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
13cc8a0cee
Cleanup: Removed SVN headers
5 years ago
041088d317
Fix fbbbc6e1931: Crash when creating orders to stations with relocated station sign. ( #7755 )
...
Station::xy is the position of the station sign, and not necessarily a tile of the station.
5 years ago
fc5df15b77
Fix fbbbc6e1931: Assumption that Station::xy is a station tile
5 years ago
1f535915d1
Merge branch 'master' into jgrpp-nrt
...
# Conflicts:
# config.lib
# src/core/bitmath_func.hpp
# src/lang/korean.txt
# src/main_gui.cpp
# src/order_gui.cpp
# src/script/api/script_object.cpp
# src/station_cmd.cpp
# src/video/cocoa/wnd_quartz.mm
5 years ago
fbbbc6e193
Fix #7692 : Added industry tile to GetOrderCmdFromTile() ( #7709 )
...
Sending order command to an industry tile now checks if a neutral_station is available and sends the order to that station
5 years ago
bc5681e79f
Fix incorrect cargo IDs used in load by cargo type GUI
...
Use CargoSpec::Index instead of GetCargoIDByBitnum
5 years ago
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
b9b34f676b
Change: Always report error when ordering a road vehicle to wrong type of road stop. ( #7316 )
...
This was inconsistent before, depending on road/tram and articulated/single vehicle status.
5 years ago
674732cd68
Merge: Codechange: Use null pointer literal instead of the NULL macro
5 years ago
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
7c8e7c6b6e
Codechange: Use null pointer literal instead of the NULL macro
5 years ago
c7b9987d08
Codechange: Switch DropDownList to directly use std::vector, thus making AutoDeleteSmallVector obsolete.
...
DropDownListItem are strongly managed using std::unique_ptr to ensure leak-free handling. Appropriate use
of move-semantics make intent a lot clearer than parameter comments and allows the compiler to generate
copy-free code for most situations.
5 years ago
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
a0f36a50e6
Codechange: Replaced SmallVector::Append() with std::vector::[push|emplace]_back()
5 years ago
317f69c152
Codechange: Use override specifier in Window-derived classes.
5 years ago
e3b85f617b
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/station_cmd.cpp
5 years ago
21ec3e5531
Cleanup: Remove questionable syntax in GetOrderCmdFromTile
5 years ago
de79d64837
Disallow ordering ordinary road vehicles to tram depots and vice versa
5 years ago
4c8b358ffe
Add game setting to allow only non-stop orders for ground vehicles
5 years ago
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
32dffceaa0
Merge branch 'order_occupancy-sx' into jgrpp
9 years ago
0cf7428f85
Fix crash in competitor orders GUI.
...
Fix attempt to set occupancy widget displayed pane in
competitors order GUI, where the occupancy widget is not present.
9 years ago
8357b911e5
Merge branch 'more_cond_orders-sx' into jgrpp
...
Conflicts:
src/order_base.h
src/order_gui.cpp
src/saveload/extended_ver_sl.cpp
src/saveload/extended_ver_sl.h
9 years ago
ffdd845b1c
Merge branch 'master' into more_cond_orders
...
Conflicts:
src/order_base.h
src/order_gui.cpp
src/saveload/saveload.cpp
src/saveload/saveload.h
9 years ago
ea5c33029b
Fix various whitespace and style issues.
9 years ago
c757a97214
Import more conditional orders patch
...
http://www.tt-forums.net/viewtopic.php?p=1033223#p1033223
9 years ago
f0fecda985
Merge branch 'order_occupancy-sx' into jgrpp
...
Conflicts:
src/lang/english.txt
src/saveload/extended_ver_sl.cpp
src/saveload/extended_ver_sl.h
src/settings_gui.cpp
9 years ago
117599ec7f
Order occupancy: Add column to orders GUI to show occupancy running average.
...
This is an exponentially weighted moving average of occupancies updated
when any vehicle in the shared order set leaves the station of that order.
The weighting factor is an adv setting.
9 years ago
4c6dc11c16
Merge branch 'infrastructure_sharing-sx' into jgrpp
...
Conflicts:
src/lang/english.txt
src/saveload/extended_ver_sl.cpp
src/saveload/extended_ver_sl.h
src/signal.cpp
src/table/settings.ini
src/vehicle.cpp
9 years ago
a4ad4130a6
Merge branch 'master' into infrastructure_sharing
...
Conflicts:
src/aircraft_cmd.cpp
src/economy.cpp
src/lang/english.txt
src/order_gui.cpp
src/roadveh_cmd.cpp
src/saveload/saveload.cpp
src/settings.cpp
src/settings_gui.cpp
src/train_cmd.cpp
9 years ago
ee791055f9
Import infrastructure sharing patch
...
Strip trailing whitespace
Remove a leftover line form settings.ini
http://www.tt-forums.net/viewtopic.php?p=1008843#p1008843
9 years ago
7ed93f9211
Merge branch 'enhanced_viewport_overlay-sx' into jgrpp
...
town_gui.cpp updated due to struct CommandContainer change.
Conflicts:
src/command.cpp
src/command_type.h
src/gfxinit.cpp
src/openttd.cpp
src/pbs.cpp
src/saveload/extended_ver_sl.cpp
src/saveload/extended_ver_sl.h
src/saveload/saveload.cpp
src/stdafx.h
src/train_cmd.cpp
src/viewport_type.h
src/window_type.h
9 years ago
536a95dfd0
Import combined Enhanced viewport: zoom out, overlays & tooltips (r53_27127) patch
...
https://www.tt-forums.net/viewtopic.php?f=33&t=53394
9 years ago
d8c5de188f
Import timetabling wait time in depots patch
...
http://www.tt-forums.net/viewtopic.php?f=33&t=70969
9 years ago
d563ff20e6
(svn r26693) -Codechange: Simplify GetOrderCmdFromTile (Juanjo)
10 years ago
8701514172
(svn r26693) -Codechange: Simplify GetOrderCmdFromTile (Juanjo)
10 years ago
dbc67efa98
(svn r26692) -Fix [FS#6059]: Ordering a vehicle to a competitor's rail waypoint displayed an error message. Ignore the click as is done for the other order types to competitor's stuff. (Juanjo)
10 years ago
14c4b24405
(svn r26692) -Fix [FS#6059]: Ordering a vehicle to a competitor's rail waypoint displayed an error message. Ignore the click as is done for the other order types to competitor's stuff. (Juanjo)
10 years ago
Jonathan G Rennison
S. D. Cloudt
frosch
JMcKiern
PeterN
Henry Wilson
Michael Lutz
peter1138
Johannes E. Krause
Eddi-z
keldorkatarn
patch-import