dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
22,845 Commits 1 Branch 0 Tags
5aad0b51a38adba5b50275460a7f15c7d69593f5
Commit Graph

22845 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
patch-import
9f5164b403 Import Improved Breakdowns patch 
Fix trailing whitespace

http://www.tt-forums.net/viewtopic.php?p=1146419#p1146419
 2015-08-02 22:58:52 +01:00
Jonathan G Rennison
b6a1866ded Merge branch 'max_grfs' into jgrpp 2015-08-02 22:17:45 +01:00
patch-import
8f5ef2ae01 Import and rebase Max NewGRFs patch 
Fix trailing whitespace, clean up code a bit

http://www.tt-forums.net/viewtopic.php?p=894743#p894743
 2015-08-02 22:17:35 +01:00
Jonathan G Rennison
3c9c0acba1 Merge branch 'measurement_tool' into jgrpp 2015-08-02 21:06:39 +01:00
patch-import
9dfdd8bce8 Import measurement patch 
http://www.tt-forums.net/viewtopic.php?p=1086160#p1086160
 2015-08-02 21:04:46 +01:00
Jonathan G Rennison
27c70542da Merge branch 'signal_tunnels_bridges-sx' into jgrpp 
Conflicts:
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
	src/settings_type.h
	src/signal.cpp
 2015-08-02 18:45:32 +01:00
translators
163c30570b (svn r27358) -Update from WebTranslator v3.0: 
catalan - 25 changes by juanjo
 2015-08-02 17:45:14 +00:00
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
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
Jonathan G Rennison
08dc95fea1 Add town cargo patch SLXI/PATX code. 
Update setting string.
 2015-08-02 00:59:40 +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
9905e478d4 Merge branch 'save_ext' into town_cargo_adj-sx 2015-08-02 00:05:01 +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
09aa29de8b Add signals on bridges/tunnels SLXI info, move setting to PATX. 2015-08-01 21:41:44 +01:00
Jonathan G Rennison
6c81f8f35b Add departure boards and timetable tick status to SLXI info. 
Implementing converting timetable start date to/from ticks/days in
afterload code.
 2015-08-01 21:07:14 +01:00
Jonathan G Rennison
00f9f75d34 Merge branch 'save_ext' into departure-boards-sx 2015-08-01 20:40:49 +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
Jonathan G Rennison
9f79c555da Merge branch 'save_ext' into signal_tunnels_bridges-sx 2015-08-01 20:27:19 +01:00
Jonathan G Rennison
22a5c6d459 Minor fixes in CmdRemoveSingleSignal 
Whitespace fixes
 2015-08-01 20:26:41 +01:00
patch-import
59b0b18aa2 Import signals on tunnels and bridges patch 
http://www.tt-forums.net/viewtopic.php?p=1140215#p1140215
 2015-08-01 20:25:59 +01:00
patch-import
79138de1b9 Import departure boards patch 2015-08-01 19:48:19 +01: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
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