Jonathan G Rennison
a38c98d10a
Bump SLXI tracerestrict version due to PBS entry and PF penalty new features.
2015-08-04 19:15:54 +01:00
Jonathan G Rennison
c4565f6bb0
Merge branch 'tracerestrict' into tracerestrict-sx
2015-08-04 19:14:57 +01: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
09f8ff420f
Merge branch 'tracerestrict' into tracerestrict-sx
...
Conflicts:
src/tracerestrict_gui.cpp
2015-08-03 20:40:42 +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
Jonathan G Rennison
bc8b2d9826
Merge branch 'save_ext' into tracerestrict-sx
2015-08-03 00:14:51 +01:00
Jonathan G Rennison
eadeb51535
Merge branch 'master' into save_ext
2015-08-03 00:09:59 +01:00
Jonathan G Rennison
047395c663
Remove unnecessary and buggy field-packing in struct SlXvFeatureTest.
2015-08-02 23:37:34 +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
Jonathan G Rennison
b3e102fe52
Fix length mismatch in PATX loader.
2015-08-01 18:16:55 +01:00
Jonathan G Rennison
5d680d9154
Implement version setting in SlXvSetCurrentState
...
Call in ClearSaveLoadState
2015-08-01 18:03:07 +01:00
Jonathan G Rennison
36d5b874da
Update project files
2015-08-01 17:22:34 +01:00
Jonathan G Rennison
c562e7c6fb
Merge branch 'tracerestrict' into tracerestrict-sx
2015-08-01 17:15:35 +01:00
Jonathan G Rennison
804cfad053
Add override keywords for tracerestrict GUI code
2015-08-01 17:15:25 +01:00
Jonathan G Rennison
d8a8e75bbf
Merge branch 'override-keyword' into tracerestrict
2015-08-01 17:11:58 +01:00
Jonathan G Rennison
0b09a7ac61
Add a conditional define for the override keyword.
...
Use of the override keyword can prevent various types of problems when
the base method signature is changed, but derived overriding methods are
not. This is conditional to maintain compatibility with legacy compilers.
2015-08-01 17:06:42 +01:00
Jonathan G Rennison
d99ebb4976
Add tracerestrict SLXI version info and special case loading from
...
tracerestrict branch without SLXI.
2015-08-01 13:04:53 +01:00
Jonathan G Rennison
bda3343107
Merge branch 'save_ext' into tracerestrict-sx
...
Conflicts:
src/saveload/saveload.cpp
2015-08-01 13:03:01 +01:00
Jonathan G Rennison
c57ffc64bc
Settings update: add PATX chunk to store additional settings
...
in an unordered format which is tolerant of extra, missing or reordered
settings.
2015-08-01 12:58:53 +01:00
Jonathan G Rennison
bde094fe01
Initial implementation of SLXI chunk save/load
2015-08-01 12:58:53 +01:00
Jonathan G Rennison
a3980dc6ba
Move SlRead/SlWrite functions to saveload.h
...
Add SlGetBytesRead and SlGetBytesWritten functions.
2015-08-01 12:26:22 +01:00
Jonathan G Rennison
4508cfbf93
Add format-style versions of SlError and SlErrorCorrupt.
2015-08-01 12:26:22 +01:00
Jonathan G Rennison
17e8693e62
Initial stubs for extending the save/load version checking/upgrade code,
...
with support for tests on individually versioned features as well as
savegame versions.
This is mainly for improved handling of features added to patchpacks.
The current status-quo of picking a random number for the savegame
version when releasing a patch breaks loading of savegames from newer
trunk savegame versions, with or without the same patch applied, as
savegame upgrade code is not run, which can also lead to crashes on load.
Instead don't change the savegame version (but set the high bit to
keep trunk versions away), but instead include the versions of individual
features using a separate mechanism.
2015-08-01 12:26:22 +01: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
71012789d2
Update project listings.
2015-07-28 01:51:31 +01: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
translators
55c177c26d
(svn r27338) -Update from WebTranslator v3.0:
...
frisian - 8 changes by BAJansen
2015-07-24 17:45:18 +00:00
