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

3410 Commits

Author SHA1 Message Date
Jonathan G Rennison
8271acadb7 Merge branch 'show_veh_tunnel' into jgrpp 2015-08-02 18:25:08 +01:00
Jonathan G Rennison
9b4b170b2d Merge branch 'town_cargo_adj-sx' into jgrpp 
Conflicts:
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
 2015-08-02 18:24:45 +01:00
Jonathan G Rennison
6452b0fe02 Merge branch 'departure-boards-sx' into jgrpp 
Conflicts:
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
	src/window_type.h
 2015-08-02 18:23:25 +01:00
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
09be8afd8d Adjacent crossings: add setting (in PATX), add info to SLXI chunk. 2015-08-02 17:49:25 +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
Jonathan G Rennison
08dc95fea1 Add town cargo patch SLXI/PATX code. 
Update setting string.
 2015-08-02 00:59:40 +01:00
Jonathan G Rennison
60377f2262 Merge branch 'master' into town_cargo_adj 
Conflicts:
	src/settings_gui.cpp
 2015-08-02 00:04:04 +01:00
patch-import
1c9801e6b6 Import town cargo generation factor patch 
Adjust whitespace

http://www.tt-forums.net/viewtopic.php?f=33&t=46399&start=200#p1086221
 2015-08-01 23:56:58 +01:00
Jonathan G Rennison
526cb42608 Merge branch 'master' into depature-boards 
Conflicts:
	src/table/strgen_tables.h
 2015-08-01 20:39:16 +01:00
patch-import
79138de1b9 Import departure boards patch 2015-08-01 19:48:19 +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
5e7638a6d0 Port of old vehicles visible in tunnels patch 
from http://dev.openttdcoop.org/projects/clientpatches/repository/changes/VehicelsInTunnels.diffhttp://dev.openttdcoop.org/projects/clientpatches/repository/changes/VehicelsInTunnels.diff
 2015-07-30 00:32:55 +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
Jonathan G Rennison
5474ee3e40 Add entry direction condition variable. 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
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
translators
f6a3faf927 (svn r27337) -Update from WebTranslator v3.0: 
simplified_chinese - 1 changes by Gavin
 2015-07-21 17:45:18 +00:00
translators
28f9637aed (svn r27336) -Update from WebTranslator v3.0: 
greek - 36 changes by Jubilee
 2015-07-17 17:45:14 +00:00
translators
28e885dd51 (svn r27335) -Update from WebTranslator v3.0: 
greek - 24 changes by Jubilee
 2015-07-16 17:45:15 +00:00
translators
99ed8df797 (svn r27333) -Update from WebTranslator v3.0: 
greek - 7 changes by Jubilee
 2015-07-13 17:45:17 +00:00
translators
d25934580f (svn r27327) -Update from WebTranslator v3.0: 
korean - 1 changes by telk5093
 2015-07-09 17:45:08 +00:00
translators
81ec32199f (svn r27326) -Update from WebTranslator v3.0: 
simplified_chinese - 6 changes by Gavin
 2015-07-08 17:45:12 +00:00
translators
b50eddaea2 (svn r27325) -Update from WebTranslator v3.0: 
catalan - 4 changes by juanjo
 2015-06-30 17:45:15 +00:00
translators
1d9c78ef6b (svn r27321) -Update from WebTranslator v3.0: 
korean - 2 changes by telk5093
 2015-06-27 17:45:18 +00:00
translators
d3bfb5422f (svn r27319) -Update from WebTranslator v3.0: 
frisian - 1 changes by BAJansen
 2015-06-26 17:45:13 +00:00
translators
d9f8045255 (svn r27318) -Update from WebTranslator v3.0: 
frisian - 9 changes by BAJansen
 2015-06-25 17:45:13 +00:00
translators
d64d56b5a8 (svn r27317) -Update from WebTranslator v3.0: 
frisian - 458 changes by BAJansen
 2015-06-24 17:45:14 +00:00
frosch
a1ca479a65 (svn r27315) -Fix: Norwegian bokmal 2015-06-21 17:52:18 +00:00
translators
8f84989389 (svn r27314) -Update from WebTranslator v3.0: 
norwegian_bokmal - 4 changes by eirik174
 2015-06-21 17:45:13 +00:00
translators
a2f13f0fe2 (svn r27310) -Update from WebTranslator v3.0: 
norwegian_bokmal - 79 changes by eirik174
 2015-06-20 17:45:17 +00:00
translators
3ed9f24d19 (svn r27296) -Update from WebTranslator v3.0: 
estonian - 93 changes by Jaropower
 2015-06-01 17:45:13 +00:00
frosch
7f5e63324d (svn r27294) -Fix: Invalid plural references in various translations. 2015-05-28 17:25:46 +00:00
translators
25b87fe4a9 (svn r27293) -Update from WebTranslator v3.0: 
traditional_chinese - 4 changes by siu238X
danish - 4 changes by beruic
 2015-05-27 17:53:35 +00:00
frosch
5053ba6a6e (svn r27292) -Codechange: Unify language file range comments. 2015-05-26 21:11:12 +00:00
translators
ffb6f3cea0 (svn r27284) -Update from WebTranslator v3.0: 
latin - 1 changes by Supercheese
 2015-05-12 17:45:19 +00:00
translators
a976ec28b4 (svn r27283) -Update from WebTranslator v3.0: 
belarusian - 4 changes by KorneySan
brazilian_portuguese - 20 changes by Tucalipe
 2015-05-11 17:45:26 +00:00