dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
22,230 Commits 1 Branch 0 Tags
06a1d7c5c9b541ce2d7bd8b510080643f5a996f6
Commit Graph

15874 Commits

Author SHA1 Message Date
Jonathan G Rennison
06a1d7c5c9 Add reserve through action to trace restrict programs. 
This only changes the behaviour of PBS reservations which
would otherwise terminate at a PBS signal.
If the signal restriction sets the reserve through state,
the reservation continues through the signal, and the signal
is set to green.
 2015-09-02 02:12:02 +01:00
Jonathan G Rennison
06cc930e47 Improve insertion and removal of 'or if' conditionals. 
Allow inserting an 'or if' immediately after 'if', 'else if', 'or if'.
Removing an 'or if' no longer removes the associated block.
 2015-09-02 02:12:02 +01:00
Jonathan G Rennison
38aaf8a921 Fix compilation on legacy compilers. 2015-08-25 18:22:18 +01:00
Jonathan G Rennison
8faead7e7a Graphically indicate restricted signals by recolouring the signal post. 
Recolour signal posts from grey to blue for restricted signals which
are not semaphores and are not custom sprites.
 2015-08-19 21:56:22 +01:00
Jonathan G Rennison
614b3d8ab5 Trace restrict: Handle removing mapping from refcount 2 empty program. 
Instead of leaving the other mapping pointing to an empty unshared
program, find and delete it.
 2015-08-19 18:52:49 +01:00
Jonathan G Rennison
29c4f244f3 Merge branch 'master' into tracerestrict 
Conflicts:
	src/pathfinder/yapf/yapf_costrail.hpp
 2015-08-15 00:28:14 +01:00
translators
8cfc1e9d23 (svn r27386) -Update from WebTranslator v3.0: 
dutch - 3 changes by TheTycoonist
 2015-08-14 17:45:16 +00:00
rubidium
3b8aabdd9e (svn r27385) -Fix: compilation failure due #define-ing enum name of a system library before including the system library 2015-08-13 18:13:24 +00:00
translators
70322bce59 (svn r27384) -Update from WebTranslator v3.0: 
catalan - 35 changes by juanjo
 2015-08-13 17:45:15 +00:00
rubidium
8f711aca53 (svn r27383) -Fix: win32 sound driver would not catch the exception due to constness difference 2015-08-12 20:50:10 +00:00
michi_cc
44918010df (svn r27381) -Fix: Warnings due to C++11 requirements for explicit narrowing conversions in initializer lists. 2015-08-10 20:24:13 +00:00
michi_cc
0cd198c798 (svn r27380) -Fix: [Win32] Compilation with MSVC2015. 2015-08-10 20:21:29 +00:00
frosch
63aa9f4ea8 (svn r27379) -Codechange: Do not throw in the destructors of ScriptTest/ExecMode. 2015-08-10 20:04:31 +00:00
alberth
438d7a26cc (svn r27378) -Codechange: Fix indentation of the table values, allow Doxygen to link to the TextColour enum. 2015-08-10 10:04:14 +00:00
rubidium
eb4b6a08d0 (svn r27377) -Codechange: use the pkg-config files of ICU as well. Since they are split into separate libraries it becomes possible to split RTL support for natural sorting, although the effect will be minimal 2015-08-09 13:54:17 +00:00
rubidium
ee700fd3b1 (svn r27367) -Codechange: make a distinction between the layouting part of ICU (lx) or the sorting/collation part of ICU (i18n) 2015-08-09 12:33:27 +00:00
frosch
9f72662ecc (svn r27366) -Fix [FS#6358]: Clickareas in settings tree were misaligned when the filter warning was displayed, if the setting height was defined by the icons instead of the font. 2015-08-09 10:22:51 +00:00
frosch
c9120cd714 (svn r27365) -Fix: Center settings filter warning also vertically, and also in case of multiple lines. 2015-08-09 10:21:06 +00:00
translators
a9200aa69a (svn r27364) -Update from WebTranslator v3.0: 
czech - 1 changes by Eskymak
dutch - 12 changes by TheTycoonist
 2015-08-08 17:45:27 +00:00
alberth
894f69e1fd (svn r27363) -Codechange: Fix codestyle of one-line methods and header codestyle of derived structs. 2015-08-08 13:19:38 +00:00
alberth
48485a6a5a (svn r27362) -Codechange: Codestyle fixes for reference var declarations, static cast type, operator methods. 2015-08-08 10:06:24 +00:00
translators
f95759139b (svn r27359) -Update from WebTranslator v3.0: 
swedish - 1 changes by planetmaker
 2015-08-07 17:45:12 +00:00
Jonathan G Rennison
76707fb72a Change pf penalty restriction value button to preset values and a custom option. 
Preset values are 'small', 'medium' and 'large'.
Change default to 'small' preset.
 2015-08-04 19:09:40 +01:00
Jonathan G Rennison
a0520b8937 Initial implementation of PBS entry signal condition variable. 
TODO: see how the efficiency of this can be improved.
 2015-08-03 20:28:42 +01:00
Jonathan G Rennison
116bd41101 Initial support for multi-item instructions. 
This involves various changes to instruction modification actions,
and the GUI code.
 2015-08-03 20:03:42 +01:00
translators
163c30570b (svn r27358) -Update from WebTranslator v3.0: 
catalan - 25 changes by juanjo
 2015-08-02 17:45:14 +00:00
translators
e6782df9ba (svn r27357) -Update from WebTranslator v3.0: 
catalan - 181 changes by juanjo
 2015-08-01 17:45:15 +00:00
frosch
4eb6ce863a (svn r27354) -Fix (r27343): Actually make it work. (rubidium) 2015-07-31 21:43:40 +00:00
translators
66418db43e (svn r27352) -Update from WebTranslator v3.0: 
catalan - 134 changes by juanjo
 2015-07-31 17:45:18 +00:00
translators
18e7b67864 (svn r27347) -Update from WebTranslator v3.0: 
slovenian - 15 changes by matej1245
 2015-07-30 17:45:14 +00:00
Jonathan G Rennison
2c5bfc5486 Merge branch 'master' into tracerestrict 2015-07-29 19:01:24 +01:00
Jonathan G Rennison
9fc308b70e Update land info window to indicate if signal tile is restricted. 2015-07-28 21:43:23 +01:00
alberth
67366cf03d (svn r27346) -Feature: Make the object placement gui an independent window. 2015-07-28 18:20:54 +00:00
alberth
e36a82c3e6 (svn r27345) -Fix-ish: Hide selected view if no object selected. 2015-07-28 18:18:59 +00:00
alberth
b1f1647303 (svn r27344) -Doc: Documenting the (Re)setObjectToPlace functions. 2015-07-28 08:16:52 +00:00
Jonathan G Rennison
5474ee3e40 Add entry direction condition variable. 2015-07-28 01:36:52 +01:00
Jonathan G Rennison
3dd51e96b8 Bulk documentation update, and a few style fixes. 2015-07-28 01:36:52 +01:00
Jonathan G Rennison
75869cae41 Add train can carry cargo condition variable. 2015-07-28 01:36:52 +01:00
Jonathan G Rennison
3a7a81e02f Add GUI support for else if, or if and else blocks. 
Add another drop-down to change between these.
Opening if blocks cannot be converted to/from these.
 2015-07-28 01:36:52 +01:00
Jonathan G Rennison
fedf618978 Add last visited station condition. 2015-07-28 01:36:52 +01:00
Jonathan G Rennison
2296fc85e6 Add next order condition variable. 2015-07-28 01:36:52 +01:00
Jonathan G Rennison
ffed0c194a Add current order (station, waypoint or depot) condition variable. 
Adjust item bit allocations:
* Increase cond flags from 2 bits to 3 bits, for future expansion.
* Use 2 bits remaining in adjacent gap for an auxiliary type field.
  This is used for the type (station, waypoint, etc.) of order tests.
Perform a linear scan of the program pool when deleting a station,
waypoint or depot.
 2015-07-28 01:36:52 +01:00
Jonathan G Rennison
0be3b053d5 Add maximum train speed condition variable. 2015-07-28 01:36:52 +01:00
Jonathan G Rennison
627288277e Implement reset, copy, share and unshare of trace restrict programs. 
Add documentation on data storage model, wrt lookup, mapping and sharing.
 2015-07-28 01:36:52 +01:00
Jonathan G Rennison
5f1b148cf9 Initial minimal working tracerestrict implementation. 
This is a port of the tracerestrict/routing restrictions feature
from TTDPatch.
At present this implements if tests (train length only),
and pathfinder deny and penalty actions.
This requires the use of YAPF. Note that restrictions are only evaluated
within the YAPF lookahead distance.
 2015-07-28 01:36:52 +01:00
frosch
13a726b18f (svn r27343) -Feature [FS#6315]: [NewGRF] Allow railtype NewGRF to define separate sprites for the fences on either track side. 2015-07-26 12:28:34 +00:00
frosch
730c2177bf (svn r27342) -Add: Optionally return the number of sprites in the spriteset from GetCustomRailSprite. 2015-07-26 12:25:37 +00:00
frosch
bd50600f5b (svn r27341) -Fix [FS#6332]: Do not rerandomise the town name when only cost-estimating the founding. 2015-07-26 09:56:43 +00:00
frosch
67ae231f1b (svn r27340) -Fix [FS#6338]: Silence warning by moving _string_colourmap to a file no its own. (Cif) 2015-07-26 09:47:17 +00:00
translators
932aaa8cb5 (svn r27339) -Update from WebTranslator v3.0: 
frisian - 42 changes by BAJansen
 2015-07-25 17:45:15 +00:00