dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
47,264 Commits 1 Branch 0 Tags
0bb9207f4d28d74425d3b9131c3be55b90cf48ab
Commit Graph

673 Commits

Author SHA1 Message Date
Jonathan G Rennison
0bb9207f4d Index OrderList contents in a flat vector 2019-01-19 11:21:04 +00:00
Jonathan G Rennison
7c539267ed Merge branch 'master' into jgrpp 2019-01-15 18:39:32 +00:00
Peter Nelson
7af53d7588 Codechange: Use const instead of magic number for ship order distance. Allow slightly further distance when following orders. 2019-01-14 19:57:07 +00:00
Jonathan G Rennison
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
 2019-01-06 22:35:57 +00:00
Jonathan G Rennison
635c7ca2d5 Merge branch 'save_ext' into more_cond_orders-sx 
# Conflicts:
#	src/lang/english.txt
#	src/order_type.h
 2019-01-06 22:19:41 +00:00
Eddi-z
13056aedbc Add: Conditional order for max. reliability (patch by Cirdan, #6360) (#7017) 2019-01-05 22:10:37 +01:00
Jonathan G Rennison
e735c1a51a Merge branch 'master' into jgrpp 
# Conflicts:
#	src/aircraft_cmd.cpp
#	src/autoreplace_cmd.cpp
#	src/pathfinder/follow_track.hpp
#	src/pathfinder/yapf/yapf_rail.cpp
#	src/saveload/afterload.cpp
#	src/saveload/saveload.cpp
#	src/script/api/ai/ai_station.hpp.sq
#	src/script/api/game/game_station.hpp.sq
#	src/script/api/script_station.hpp
#	src/track_func.h
#	src/vehicle_base.h
 2018-11-05 12:53:36 +00:00
Jonathan G Rennison
83a063f51c Add train is in slot conditional order 2018-11-05 04:21:08 +00:00
Jonathan G Rennison
c632539bb7 Prevent adding train slot state conditional orders to non-train vehicles 2018-11-05 04:01:41 +00:00
Charles Pigott
f5b1115039 Doc: Lots and lots of doxymentation fixes 2018-10-31 12:35:54 +01:00
Jonathan G Rennison
2c4d3192c6 Fix trains unnecessarily slowing down when passing waypoints 2018-10-07 11:32:15 +01:00
Jonathan G Rennison
6578d94e63 Add support for timetabled wait times at waypoints 2018-08-14 12:35:05 +01:00
Jonathan G Rennison
a5603b539f Fix order extra data/flags copying conditions in Order::AssignOrder 
Data/flags were not copied to vehicle current_orders if cargo-type
load/unload was not being used.
 2018-08-13 01:16:16 +01:00
Jonathan G Rennison
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
 2018-07-02 21:04:06 +01:00
Jonathan G Rennison
00b1fe6246 Cargo type orders: Add support for 64 cargo types 2018-07-02 21:03:53 +01:00
Jonathan G Rennison
0ae32838ea Merge branch 'save_ext' into cargo_type_order 
# Conflicts:
#	src/core/smallstack_type.hpp
 2018-07-02 18:52:22 +01:00
Jonathan G Rennison
ef0a458ab6 Add go to depot and sell vehicle orders 
Controlled by a setting (default off)
 2018-06-21 23:28:19 +01:00
Jonathan G Rennison
0ac92b8236 Update current order unload type and cargo type load/unload on modify order 2018-06-19 18:50:23 +01:00
keldorkatarn
78588d8ce5 First implementation of conditional order checking slot occupancy 
(cherry picked from commit 524e3e56cb4a357ba60335f91dce1e00cb8d22f2)

Some code adjustments: serialisation/storage, formatting

See: #40
 2018-04-22 15:03:16 +01:00
Jonathan G Rennison
78838ee2a2 Add freight train load/unload mode: through load 2018-03-26 20:12:50 +01:00
Jonathan G Rennison
9a5986fa70 Fix handling of current timetable order index when deleting/inserting orders 2017-12-18 23:19:50 +00:00
Jonathan G Rennison
218085c535 Timetable: Implement autofill/automate for taken conditional orders. 
Fix wrong timetable values being set after using skip or send to depot.
Add timetabled flag for conditional order branch taken travel time.
 2017-12-18 01:26:27 +00:00
keldorkatarn
1d3cf59d8a Allow building multiple docks per station. 
(cherry picked from commit 0110c4a35d383e0be2cbb53cbe9cbe6784abb3e9)

# Conflicts:
#	src/station_cmd.cpp
 2017-09-20 19:11:48 +01:00
Jonathan G Rennison
ac016eae5e Add client setting to enable shared order group window for single vehicles 2017-08-18 01:49:21 +01:00
Jonathan G Rennison
f34833f111 Merge branch 'improved_breakdowns' into jgrpp 
# Conflicts:
#	src/vehiclelist.cpp
 2017-08-15 19:26:26 +01:00
frosch
b4b98e5165 (svn r27893) -Codechange: Use fallthrough attribute. (LordAro) 2017-08-13 18:38:42 +00:00
frosch
a47fb85cd8 (svn r27893) -Codechange: Use fallthrough attribute. (LordAro) 2017-08-13 18:38:42 +00:00
innocenat
c2a8d0fc81 Schdispatch: Fix crash when cloning vehicle with empty order 2017-07-25 22:29:36 +07:00
innocenat
708514dc35 Scheduled Dispatch: Fix bug resulting in a hang 
If a vechile order is decloned.
 2017-07-03 16:50:20 +07:00
innocenat
02b53a2f52 Fix bug in cloning of schedued dispatch order 2017-06-07 17:04:29 +07:00
innocenat
0b8f0e64ec Scheduled Dispatch feature 
Code is tested and run well on small-ish train network. Not tested extensively.
 2017-05-30 01:37:08 +07:00
Jonathan G Rennison
df3c10c523 Merge branch 'infrastructure_sharing' into jgrpp 
# Conflicts:
#	src/infrastructure.cpp
#	src/order_cmd.cpp
 2017-02-22 20:58:39 +00:00
Jonathan G Rennison
f3b1059930 Fix order removal due to shared-infra company deletion. 
Order totals were not updated correctly, implicit orders not handled
properly, etc.
Create generic function for vehicle order filtering.
Use for station deletion and infra sharing company deletion.
 2017-02-22 20:58:24 +00:00
Jonathan G Rennison
3ba859727c Increase verbosity of asserts in OrderList::DebugCheckSanity. 2017-02-19 14:44:38 +00:00
Jonathan G Rennison
71bda2a4dd Merge branch 'more_cond_orders-sx' into jgrpp 2017-01-20 20:08:14 +00:00
Jonathan G Rennison
15e4174332 Fix inverted condition for cargo waiting conditional order. 
Fixes incorrect port in 2d47c47a
 2017-01-20 20:07:35 +00:00
Jonathan G Rennison
c600ffe6d5 Fix go to nearest depot and halt orders, not halting. 2017-01-11 23:49:23 +00:00
Jonathan G Rennison
5c7f36ef4b Merge branch 'enhanced_viewport_overlay' into jgrpp 
Further fixes for viewport lines/marker for multiplayer clients.

# Conflicts:
#	src/lang/russian.txt
 2016-12-26 15:38:56 +00:00
Jonathan G Rennison
509da024cc Fix viewport order lines/markers for multiplayer clients. 2016-12-26 15:35:11 +00:00
Jonathan G Rennison
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
 2016-09-08 00:12:48 +01:00
Jonathan G Rennison
f8f8e642dc Use unique_ptr and initialiser init for OrderExtraInfo. 2016-09-06 22:10:18 +01:00
Jonathan G Rennison
e90b266af1 De-duplicate cargo masking boilerplate using C++11. 2016-09-06 22:10:18 +01:00
Jonathan G Rennison
871d26098e Move Order::cargo_type_flags into a separately allocated object. 
Change savegame format, add a new chunk for cargo_type_flags.
 2016-09-05 00:12:48 +01:00
Jonathan G Rennison
3507b51d9e Initial LinkRefresher support for cargo-specific links. 2016-09-05 00:12:48 +01:00
Jonathan G Rennison
a670966acf Change GetNextStoppingStation to return per-cargo result(s). 2016-09-05 00:12:48 +01:00
Jonathan G Rennison
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.
 2016-09-04 23:00:10 +01:00
Jonathan G Rennison
376a45d9fc Fix wrong bit-allocation in doc comment of CmdModifyOrder. 2016-09-03 21:55:51 +01:00
Jonathan G Rennison
4c5173b6bf Merge branch 'auto_timetables-sx' into jgrpp 
# Conflicts:
#	src/lang/english.txt
#	src/saveload/afterload.cpp
#	src/saveload/extended_ver_sl.cpp
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/table/company_settings.ini
#	src/vehicle.cpp
 2016-05-08 01:13:35 +01:00
Jonathan G Rennison
d59252d15b Timetable auto separation is now per vehicle, with a company default. 
Remove global on-off setting.
Add button to timetable GUI.
Add company setting to control default for new vehicles.

Fix automate, start date, change time and autofill buttons
being shown enabled for other companies' vehicles.
 2016-05-08 01:12:07 +01:00
Jonathan G Rennison
580b2f7584 Merge branch 'template_train_replacement-sx' into jgrpp 
Remove a duplicated declaration.

# Conflicts:
#	projects/openttd_vs100.vcxproj
#	projects/openttd_vs100.vcxproj.filters
#	projects/openttd_vs140.vcxproj
#	projects/openttd_vs140.vcxproj.filters
#	projects/openttd_vs80.vcproj
#	projects/openttd_vs90.vcproj
#	source.list
#	src/group_gui.cpp
#	src/lang/english.txt
#	src/network/network_command.cpp
#	src/saveload/extended_ver_sl.cpp
#	src/saveload/extended_ver_sl.h
#	src/saveload/saveload.cpp
#	src/train_cmd.cpp
#	src/vehicle.cpp
#	src/vehicle_gui.cpp
#	src/vehicle_gui_base.h
#	src/window_type.h
 2016-02-14 17:55:51 +00:00