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
15a7f9da9d
Fix 13056ae: PR #7017 added new enum value in bad position, move it
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
0e3986c39c
Extend timetable wait/travel times from 16 to 32 bits wide
6 years ago
e55a327c09
Enable locking timetable travel times
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
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
78838ee2a2
Add freight train load/unload mode: through load
6 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
bc04b07f2b
Fix double-use of bits 3 and 7 in Order::flags.
...
Use a different encoding for the cargo type load/unload bit in flags.
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
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
78f8627c34
Add order waypoint flags.
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
c757a97214
Import more conditional orders patch
...
http://www.tt-forums.net/viewtopic.php?p=1033223#p1033223
9 years ago
e4ccea350b
Merge branch 'wait_in_depot-sx' into jgrpp
...
Conflicts:
src/saveload/extended_ver_sl.cpp
src/saveload/extended_ver_sl.h
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
9f5164b403
Import Improved Breakdowns patch
...
Fix trailing whitespace
http://www.tt-forums.net/viewtopic.php?p=1146419#p1146419
9 years ago
2c2e143026
(svn r25735) -Feature: allow implicit orders even if no explicit ones are given.
11 years ago
d8365c63fd
(svn r25735) -Feature: allow implicit orders even if no explicit ones are given.
11 years ago
19adc87262
(svn r24776) -Doc: Typo fixes, additions, and additional dots collected from various sources (including Eagle_rainbow, MinchinWeb)
12 years ago
732e073261
(svn r24776) -Doc: Typo fixes, additions, and additional dots collected from various sources (including Eagle_rainbow, MinchinWeb)
12 years ago
64c5299b4d
(svn r23947) -Feature: Timetabled maximum travel speeds for non-flying vehicles.
13 years ago
f2c694c8fb
(svn r23947) -Feature: Timetabled maximum travel speeds for non-flying vehicles.
13 years ago
8161459cfe
(svn r23946) -Codechange: Pass a proper enum instead of a bit flag to CmdChangeTimetable for indicating what to change.
13 years ago
347157cb8c
(svn r23946) -Codechange: Pass a proper enum instead of a bit flag to CmdChangeTimetable for indicating what to change.
13 years ago
ed2cfbd321
(svn r22858) -Feature: Conditional order depending on remaining lifetime of a vehicle. (monoid)
13 years ago
4e5d841d66
(svn r22858) -Feature: Conditional order depending on remaining lifetime of a vehicle. (monoid)
13 years ago
7aa57e4acd
(svn r22473) -Codechange: Automatic orders are better called implicit orders as no real order influencing path finding is added
13 years ago
43c8cd1d5e
(svn r22473) -Codechange: Automatic orders are better called implicit orders as no real order influencing path finding is added
13 years ago
4d6841b553
(svn r21642) -Feature: concept of automatic station orders; add stub orders for intermediate stations and remove them when not visiting them anymore. This allows you to see what trains visit a station without actually having to order a vehicle to stop at all stations. Based on patch by fonsinchen
14 years ago
64f04c3a74
(svn r21642) -Feature: concept of automatic station orders; add stub orders for intermediate stations and remove them when not visiting them anymore. This allows you to see what trains visit a station without actually having to order a vehicle to stop at all stations. Based on patch by fonsinchen
14 years ago
de9c678901
(svn r21270) -Doc: Doxyment updates and additions. Removal of doxyment in code.
14 years ago
3b0ee65571
(svn r21270) -Doc: Doxyment updates and additions. Removal of doxyment in code.
14 years ago
f09a74a996
(svn r19812) -Codechange: give some unnamed enums a name or, in case they consisted of unrelated values use static const (u)int
14 years ago
398418b8fa
(svn r19812) -Codechange: give some unnamed enums a name or, in case they consisted of unrelated values use static const (u)int
14 years ago
ed80045221
(svn r19654) -Codechange: Use Extract<> in more places.
14 years ago
75d4bc947d
(svn r19654) -Codechange: Use Extract<> in more places.
14 years ago
d2e99657fa
(svn r19507) -Codechange: remove semicolon after DECLARE_POSTFIX_INCREMENT and DECLARE_ENUM_AS_BIT_SET
14 years ago
53aaabe6e9
(svn r19507) -Codechange: remove semicolon after DECLARE_POSTFIX_INCREMENT and DECLARE_ENUM_AS_BIT_SET
14 years ago
2a329b6d2a
(svn r18518) -Add [NoAI]: AIOrder::AIOF_GOTO_NEAREST_DEPOT for goto nearest depot orders
15 years ago
04dfadc523
(svn r18518) -Add [NoAI]: AIOrder::AIOF_GOTO_NEAREST_DEPOT for goto nearest depot orders
15 years ago
99d46e0ad7
(svn r17248) -Fix: add GPL license notice where appropriate
15 years ago
7fbc33dae1
(svn r17248) -Fix: add GPL license notice where appropriate
15 years ago
Jonathan G Rennison
Niels Martin Hansen
Eddi-z
keldorkatarn
patch-import
fonsinchen
alberth
michi_cc
frosch
planetmaker
rubidium
smatz
yexo