dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
55,701 Commits 1 Branch 0 Tags
85b20068a8abad18921c391f32feffe1dd76c75b
Commit Graph

760 Commits

Author SHA1 Message Date
Jonathan G Rennison
4e8a8a5e0a Add conditional order to test if last/next dispatch slot is first/last 2022-07-03 15:49:29 +01:00
Melvin Vermeeren
d48234c81b Add GUI setting to show order occupancy by default 2022-06-27 20:06:20 +02:00
Jonathan G Rennison
4897fded95 Add hotkey to toggle via state of order 
See: #398
 2022-06-14 19:56:16 +01:00
Jonathan G Rennison
5f511f8a65 Fix incorrect check preventing ordering road vehicles to incompatible depots 2022-03-29 22:24:34 +01:00
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
 2022-03-04 18:17:44 +00:00
Jonathan G Rennison
c69ed1711d Allow road vehicle go to station/waypoint orders to have a direction 2022-01-27 01:30:22 +00:00
Jonathan G Rennison
b4fc0b4dc5 Initial implementation of road waypoints 2022-01-26 21:46:36 +00:00
Jonathan G Rennison
904ff6757d Add slot support to road vehicles, ships and aircraft 2022-01-19 00:10:49 +00:00
Jonathan G Rennison
ce61f6439c Allow non-train vehicles to test counter values in conditional orders 2022-01-18 18:17:28 +00:00
Jonathan G Rennison
91ed26415e Fix manual setting of conditional order jump taken travel times 2022-01-15 15:33:34 +00:00
Jonathan G Rennison
ff3473fe6a Add support for multiple scheduled dispatch schedules per order list 2022-01-13 19:46:43 +00:00
Michael Lutz
211c630cbe Codechange: Un-bitstuff order commands. 2021-12-16 22:28:32 +01:00
Michael Lutz
0f64ee5ce1 Codechange: Template DoCommandP to automagically reflect the parameters of the command proc. 
When finished, this will allow each command handler to take individually
different parameters, obliviating the need for bit-packing.
 2021-12-16 22:28:32 +01:00
Michael Lutz
a38bbefe1b Codechange: Untangle command code, flags and error string for DoCommand*. 2021-12-16 22:28:32 +01:00
Michael Lutz
549caca39c Codechange: Move command arguments to the back of the networked command function calls. 2021-12-16 22:28:32 +01:00
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
 2021-11-01 21:18:24 +00:00
Jonathan G Rennison
aff6dbec2d Show timetabled 0 wait times for stations/depots in timetable window 2021-10-27 00:24:26 +01:00
Jonathan G Rennison
53139c2405 Add current day/month to tracerestrict and conditional order conditionals 2021-10-26 23:39:40 +01:00
Patric Stout
ab74800b8e Change: by default, make "unload all" leave stations empty (#9301) 
(cherry picked from commit 7648483364)
 2021-06-07 18:36:35 +01:00
glx22
5799402f7a Codechange: Rename window related DeleteXXX to match new behaviour 2021-05-29 21:08:25 +02:00
Patric Stout
7648483364 Change: by default, make "unload all" leave stations empty (#9301) 2021-05-27 18:56:39 +02:00
rubidium42
b280f16316 Codechange: remove unneeded comparison and casts 
Division by resize_y is already yielding an unsigned number, so when clicking in the WD_FRAMERECT_TOP you would already get a huge value, so sel would never be negative. So, leave sel an unsigned number and remove the <= check.
 2021-05-27 18:30:56 +02:00
Jonathan G Rennison
912c62d749 Add timetable lateness/earliness conditional order 2021-03-27 23:19:19 +00:00
Jonathan G Rennison
7e62af94ee Remove OVEERIDE macro 2021-03-02 23:45:08 +00:00
Jonathan G Rennison
e95216b59d Merge branch 'master' into jgrpp 
# Conflicts:
#	src/company_cmd.cpp
#	src/core/geometry_func.cpp
#	src/date.cpp
#	src/genworld_gui.cpp
#	src/gfx.cpp
#	src/object_gui.cpp
#	src/openttd.cpp
#	src/settings_type.h
#	src/video/allegro_v.cpp
#	src/video/dedicated_v.cpp
#	src/video/null_v.cpp
#	src/video/sdl2_v.cpp
#	src/video/sdl_v.cpp
#	src/video/win32_v.cpp
 2021-02-19 15:38:34 +00:00
Jonathan G Rennison
aa85ebe51e Show warning icon in order window if there are timetable warnings 2021-02-15 01:50:55 +00:00
Charles Pigott
f1fc083f2b Change: Make order window hotkeys toggle for load & unload variants 2021-02-13 22:14:58 +00:00
Jonathan G Rennison
8a814bbfe3 Add release slot train order 2021-02-10 22:30:22 +00:00
Jonathan G Rennison
d42ad99688 Add conditional order for current time/date 2021-02-10 18:34:46 +00:00
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
 2021-02-01 17:07:34 +00:00
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
 2021-01-31 01:08:35 +00:00
Patric Stout
9aa39d0af9 Fix #7972: show invalid orders to stations that don't accept your vehicle (#8516) 
Before it was shown as a normal order, but the vehicle was skipping
it. This was rather unclear to the user. Now it is red and contains
text with some hints what is going on.

The text is prefixed rather than post-fixed, as we have many
post-fixes already.
 2021-01-08 16:04:44 +01:00
Charles Pigott
9b800a96ed Codechange: Remove min/max functions in favour of STL variants (#8502) 2021-01-08 11:16:18 +01:00
glx22
d8605ad18d Codechange: Replace FOR_VEHICLE_ORDERS with range-based for loops 2020-12-27 10:28:46 +00:00
Jonathan G Rennison
b20df78b49 Add feature to append the reverse of an order list 2020-11-04 18:20:36 +00:00
Jonathan G Rennison
9984f39c96 Add feature to reverse the order of an order list 
See: #120
 2020-11-02 20:10:44 +00:00
Jonathan G Rennison
5556ef38b0 Fix GUI limit for cargo waiting amount conditional order 2020-10-28 22:16:24 +00:00
Jonathan G Rennison
c0c0c9c340 Fix updating selected order when changing order list 2020-10-18 17:06:08 +01:00
Jonathan G Rennison
e1aca1ab34 Extend Order::flags to 16 bits, fixes conditional order target field size 
Adjust order packing and CmdInsertOrder

See: #198
 2020-10-17 17:25:44 +01:00
Jonathan G Rennison
6e17f9bf5d Use p3 for order indices which don't fit into p1 
Fix insert/modify order overflowing p1
Don't use text field for change timetable
 2020-10-17 17:25:44 +01:00
Jonathan G Rennison
9ee8091ecc Add conditional order which tests counter value 2020-08-31 22:52:26 +01:00
Jonathan G Rennison
2b9c633d50 Add leave early if any/all cargoes fully loaded timetable modes 2020-08-19 18:51:47 +01:00
Jonathan G Rennison
37683d8f50 Cargo type orders window: Use single command to change all cargoes at once 2020-08-19 18:34:27 +01:00
Jonathan G Rennison
3a9b38bb10 Cargo type orders window: Use two columns when more than 32 cargos 2020-08-19 18:02:00 +01:00
Jonathan G Rennison
05dc785f13 Split STR_ORDER_CONDITIONAL_CARGO string into two, adjust format 
See: #172
 2020-07-12 21:58:49 +01:00
Jonathan G Rennison
0202211514 Conditional orders: Add slot acquire modes to train in slot conditional 2020-05-10 21:06:09 +01:00
Jonathan G Rennison
0100ea4e32 Conditional orders: Add mode to check waiting station cargo via next node 2020-05-10 15:32:12 +01:00
Jonathan G Rennison
59d84975e0 Fix length limit of waiting cargo amount cond order text input 2020-04-19 11:45:07 +01:00
Jonathan G Rennison
692d836664 Fix rendering issue with scheduled dispatch tag in timetable/order list 2020-03-11 18:22:37 +00:00
Jonathan G Rennison
6e6be7f36f Fix 09b13dd4: Crash when opening order window of competitor vehicle 2020-02-05 17:05:35 +00:00