dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
48,860 Commits 1 Branch 0 Tags
b9eaef9fe1517c246974b7b6b3dffc7ed1c99158
Commit Graph

36226 Commits

Author SHA1 Message Date
patch-import
01cf154f51 Import polyline rail tool patch v10b 
http://www.tt-forums.net/viewtopic.php?f=33&t=57080
 2016-04-13 21:03:51 +01:00
translators
bff29d86b5 (svn r27538) -Update from Eints: 
hebrew: 18 changes by dnd_man
luxembourgish: 1 change by Phreeze
 2016-04-13 17:45:37 +00:00
translators
4f5d6f7952 (svn r27538) -Update from Eints: 
hebrew: 18 changes by dnd_man
luxembourgish: 1 change by Phreeze
 2016-04-13 17:45:37 +00:00
translators
6ed602fab2 (svn r27537) -Update from Eints: 
korean: 2 changes by telk5093
 2016-04-09 17:45:38 +00:00
translators
6931d1df51 (svn r27537) -Update from Eints: 
korean: 2 changes by telk5093
 2016-04-09 17:45:38 +00:00
Jonathan G Rennison
d0aa4a53ed Improve performance of updating railtypes when reloading NewGRFs. 
Now O(N) instead of O(N log N), and only traverses map once.
 2016-04-08 20:38:32 +01:00
keldorkatarn
75396c9b5f - Make sure we clear the additional railtype bit only for the correct tiles. 
- Backup and restore the correct railtype for tiles when newGRFs are reloaded during a game.

(cherry picked from commit f5bf8e69b4fe95519513b934dc1057dc304ce3da)
 2016-04-08 20:38:31 +01:00
keldorkatarn
4c37aad393 Make sure we the custom track type based signals for bridges and tunnels also. 
(cherry picked from commit 1dc478cb654f88eab3c760bdc9f305ce3f039ec3)
 2016-04-08 20:38:31 +01:00
keldorkatarn
5cc56d6ad9 Make 32 instead of 16 rail types possible. by using one free bit of m1 in the map array. 
(cherry picked from commit b44843800880cdc186f5183301ee0f42afbb5f84)

Also set non-rail type M3 bits to 0 where applicable.
Change savegame versioning to SLXI format.
 2016-04-08 20:38:31 +01:00
Jonathan G Rennison
59677d5c6f Merge branch 'signal_tunnels_bridges-sx' into jgrpp 2016-04-08 20:19:19 +01:00
Jonathan G Rennison
a974db6ade Merge branch 'signal_tunnels_bridges' into signal_tunnels_bridges-sx 2016-04-08 20:19:13 +01:00
Jonathan G Rennison
41a06e698f Merge branch 'house_placing' into jgrpp 
# Conflicts:
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/town_gui.cpp
 2016-04-08 20:15:08 +01:00
Jonathan G Rennison
6ebea4b49c Merge v4 of house picking/placing patch. 2016-04-08 19:51:37 +01:00
patch-import
0fd34a17a5 Update to v4 of house placing patch. 2016-04-08 19:42:10 +01:00
keldorkatarn
095229128d Fix crash when dragging two-directional block signals onto a bridge or tunnel 
(cherry picked from commit 4199ba5981b2761d5226ebc89b315f00e62e1a3a)
 2016-04-08 18:04:18 +01:00
translators
0badab6d8e (svn r27536) -Update from Eints: 
belarusian: 1 change by KorneySan
malay: 1 change by rionix88
 2016-04-07 17:45:37 +00:00
translators
9884b2c72c (svn r27536) -Update from Eints: 
belarusian: 1 change by KorneySan
malay: 1 change by rionix88
 2016-04-07 17:45:37 +00:00
translators
9a5db2063b (svn r27535) -Update from Eints: 
norwegian (bokmal): 16 changes by Leifbk
 2016-04-06 17:45:35 +00:00
translators
901a073f8b (svn r27535) -Update from Eints: 
norwegian (bokmal): 16 changes by Leifbk
 2016-04-06 17:45:35 +00:00
Jonathan G Rennison
0d26da998b Merge branch 'tracerestrict-sx' into jgrpp 
# Conflicts:
#	src/group_cmd.cpp
#	src/group_gui.cpp
#	src/lang/english.txt
#	src/saveload/extended_ver_sl.cpp
#	src/tracerestrict.cpp
#	src/tracerestrict.h
#	src/tracerestrict_gui.cpp
 2016-04-05 20:12:09 +01:00
Jonathan G Rennison
faf8dab12a Bump tracerestrict version due to group conditional. 2016-04-05 19:45:01 +01:00
Jonathan G Rennison
9ed3dc2581 Merge branch 'tracerestrict' into tracerestrict-sx 2016-04-05 19:43:41 +01:00
Jonathan G Rennison
213b0e7e3a Tracerestrict: Add a group membership conditional. 2016-04-05 18:40:16 +01:00
frosch
76fc242666 (svn r27534) -Fix [FS#6435]: [NewGRF] Station spritelayouts did not accept the var10 flag for the palette. 2016-04-02 16:02:22 +00:00
frosch
ebee9fa418 (svn r27534) -Fix [FS#6435]: [NewGRF] Station spritelayouts did not accept the var10 flag for the palette. 2016-04-02 16:02:22 +00:00
translators
05b5c945cc (svn r27530) -Update from Eints: 
catalan: 2 changes by juanjo
 2016-04-01 17:45:37 +00:00
translators
13d6cec802 (svn r27530) -Update from Eints: 
catalan: 2 changes by juanjo
 2016-04-01 17:45:37 +00:00
translators
db8d95b1a0 (svn r27529) -Update from Eints: 
scottish gaelic: 3 changes by GunChleoc
frisian: 6 changes by BAJansen
spanish: 13 changes by SilverSurferZzZ
portuguese (brazilian): 1 change by Tucalipe
 2016-03-31 17:45:35 +00:00
translators
ac4ecbf4ee (svn r27529) -Update from Eints: 
scottish gaelic: 3 changes by GunChleoc
frisian: 6 changes by BAJansen
spanish: 13 changes by SilverSurferZzZ
portuguese (brazilian): 1 change by Tucalipe
 2016-03-31 17:45:35 +00:00
translators
c5aee2ac52 (svn r27528) -Update from Eints: 
catalan: 233 changes by juanjo
portuguese (brazilian): 1 change by Tucalipe
 2016-03-30 17:45:37 +00:00
translators
c4b8629119 (svn r27528) -Update from Eints: 
catalan: 233 changes by juanjo
portuguese (brazilian): 1 change by Tucalipe
 2016-03-30 17:45:37 +00:00
translators
692458d8f5 (svn r27527) -Update from Eints: 
tamil: 13 changes by aswn
 2016-03-27 17:45:35 +00:00
translators
a42832afb7 (svn r27527) -Update from Eints: 
tamil: 13 changes by aswn
 2016-03-27 17:45:35 +00:00
translators
927d1a9490 (svn r27526) -Update from Eints: 
malay: 2 changes by rionix88
 2016-03-26 18:45:36 +00:00
translators
7c15190ec2 (svn r27526) -Update from Eints: 
malay: 2 changes by rionix88
 2016-03-26 18:45:36 +00:00
Jonathan G Rennison
ec62878758 Merge branch 'crashlog_improvements' into jgrpp 2016-03-23 18:22:14 +00:00
Jonathan G Rennison
2a2ff30c3f Fix Pool verbose assertion format string on Windows platforms. 2016-03-23 18:21:54 +00:00
Jonathan G Rennison
636ecc9f23 Merge branch 'master' into jgrpp 2016-03-23 18:05:28 +00:00
Jonathan G Rennison
0ea1d69ac0 Workaround console command to fix blocked heliports. 
This is for savegames affected by the improved breakdowns bug.
 2016-03-22 23:17:45 +00:00
Jonathan G Rennison
fa232ddaed Merge branch 'improved_breakdowns-sx' into jgrpp 2016-03-22 22:10:47 +00:00
Jonathan G Rennison
b59f1be235 Merge branch 'improved_breakdowns' into improved_breakdowns-sx 2016-03-22 22:10:19 +00:00
Jonathan G Rennison
7caebc2a77 Avoid aircraft leaving the state machine in the event of a breakdown. 
This can result in airport state machine blocks being left
erroneously occupied, blocking the airport.
 2016-03-22 22:08:26 +00:00
Jonathan G Rennison
196af4116e Merge branch 'enhanced_viewport_overlay-sx' into jgrpp 2016-03-21 21:44:22 +00:00
Jonathan G Rennison
bc48c6a219 Merge branch 'enhanced_viewport_overlay' into enhanced_viewport_overlay-sx 2016-03-21 21:44:12 +00:00
Jonathan G Rennison
a57c41b2c4 Fix height colour table not being checked/inited in viewport map mode. 2016-03-21 21:44:00 +00:00
Jonathan G Rennison
13c88dcef2 Merge branch 'template_train_replacement-sx' into jgrpp 2016-03-21 21:19:46 +00:00
Jonathan G Rennison
df421a55bb Fix air cache being leaked in CheckCaches. 2016-03-21 21:19:40 +00:00
Jonathan G Rennison
5519bf33b3 Merge branch 'template_train_replacement' into template_train_replacement-sx 2016-03-21 21:18:56 +00:00
Jonathan G Rennison
31136bac50 Fix AfterLoadTemplateVehiclesUpdateImage clobbering the random seeds. 
This broke MP games with template replacement trains.
 2016-03-21 21:18:22 +00:00
Jonathan G Rennison
bdca33ee80 Merge branch 'crashlog_improvements' into jgrpp 2016-03-21 20:47:16 +00:00