dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
22,218 Commits 1 Branch 0 Tags
6596ba216ccd5e282314718c9d8032957a9b4466
Commit Graph

22218 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jonathan G Rennison
6596ba216c Merge branch 'zoning' into jgrpp 
Conflicts:
	src/table/sprites.h
 2015-08-02 18:20:23 +01:00
Jonathan G Rennison
0afc054bff Merge branch 'adjacent_crossings-sx' into jgrpp 
Conflicts:
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
 2015-08-02 18:18:41 +01:00
Jonathan G Rennison
78b2e5babb Merge branches 'upgrade_airport' and 'vehicle_group_info' into jgrpp 2015-08-02 18:17:44 +01:00
Jonathan G Rennison
2bcbeea011 Merge branch 'progsig-sx' into jgrpp 
Conflicts:
	src/command.cpp
	src/command_type.h
	src/lang/english.txt
	src/rail_cmd.cpp
	src/rail_gui.cpp
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
	src/saveload/saveload.cpp
	src/widgets/rail_widget.h
	src/window_type.h
 2015-08-02 18:15:18 +01:00
Jonathan G Rennison
de76316634 Merge branch 'tracerestrict-sx' into jgrpp 2015-08-02 17:59:10 +01:00
Jonathan G Rennison
09be8afd8d Adjacent crossings: add setting (in PATX), add info to SLXI chunk. 2015-08-02 17:49:25 +01:00
Jonathan G Rennison
b8ef887cc1 Merge branch 'save_ext' into adjacent_crossings-sx 2015-08-02 17:12:28 +01:00
patch-import
4117808b9d Import adjacent crossings patch (v3.1) 
Fix trailing whitespace

http://www.tt-forums.net/viewtopic.php?p=836749#p836749
 2015-08-02 17:12:15 +01:00
Jonathan G Rennison
74bccb5d50 Zoning: Implement ownership checks, and station facility checks for industries. 2015-08-02 13:17:43 +01:00
Jonathan G Rennison
03373c7ef4 Zoning: Remove unimplemented modes, fix some whitespace and style issues, 
add missing licence headers, move/rename some declarations, fix sprite
ID allocation, update to build on trunk.
 2015-08-02 13:17:42 +01:00
patch-import
6de087786c Import and rebase zoning patch 
Fix some of the whitespace issues

http://www.tt-forums.net/viewtopic.php?p=888801#p888801
 2015-08-02 13:17:42 +01:00
patch-import
45b5145396 Add group info patch 
Fix whitespace, add NOSAVE comment in vehicle struct

http://www.tt-forums.net/viewtopic.php?f=33&t=72855
 2015-08-02 12:35:18 +01:00
patch-import
c72b29cfd0 Import upgrade airport patch 
http://www.tt-forums.net/viewtopic.php?f=33&t=35867
 2015-08-02 00:32:41 +01:00
Jonathan G Rennison
de14c210db Add progsigs info to SLXI chunk, move setting to PATX chunk. 2015-08-01 18:21:34 +01:00
Jonathan G Rennison
3a3280e536 Merge branch 'save_ext' into progsig-sx 2015-08-01 18:17:30 +01: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
b1d8bcfe35 Merge branch 'save_ext' into progsig-sx 
Conflicts:
	source.list
	src/saveload/saveload.cpp
 2015-08-01 17:21:38 +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
patch-import
fc0efe599e Port of the programmable signals patch to recent trunk 
Also add some additional changes from the SpringPP patch,
and make some other minor changes/fixes.
 2015-08-01 17:06:43 +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
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