dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
23,288 Commits 1 Branch 0 Tags
25bd3ed6f47a7fec425f137e8f47dc883fd1023c
Commit Graph

23288 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
translators
3d476cf432 (svn r27555) -Update from Eints: 
croatian: 3 changes by VoyagerOne
 2016-05-08 17:45:37 +00:00
Jonathan G Rennison
4c5173b6bf Merge branch 'auto_timetables-sx' into jgrpp 
# Conflicts:
#	src/lang/english.txt
#	src/saveload/afterload.cpp
#	src/saveload/extended_ver_sl.cpp
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/table/company_settings.ini
#	src/vehicle.cpp
 2016-05-08 01:13:35 +01:00
Jonathan G Rennison
d59252d15b Timetable auto separation is now per vehicle, with a company default. 
Remove global on-off setting.
Add button to timetable GUI.
Add company setting to control default for new vehicles.

Fix automate, start date, change time and autofill buttons
being shown enabled for other companies' vehicles.
 2016-05-08 01:12:07 +01:00
translators
3ae6dab58b (svn r27554) -Update from Eints: 
korean: 1 change by Gimel3830
 2016-05-07 17:45:33 +00:00
Jonathan G Rennison
efcdd6c36f Remove global automated timetable setting. 2016-05-06 23:33:12 +01:00
Jonathan G Rennison
ff5ee52b94 Add a company setting to control auto-fill timetable rounding. 2016-05-06 23:16:17 +01:00
Jonathan G Rennison
04b188bd7d Add client setting to show leftover ticks in timetable. 2016-05-06 19:47:46 +01:00
frosch
b21e13a2a4 (svn r27553) -Update: Project files 2016-04-30 14:33:36 +00:00
frosch
a3ffac0025 (svn r27552) -Feature: Mexican Spanish (Absay) 2016-04-30 08:28:40 +00:00
Jonathan G Rennison
cf59b4fcab Merge branch 'signal_tunnels_bridges-sx' into jgrpp 2016-04-28 22:24:36 +01:00
Jonathan G Rennison
6e545d1138 Merge branch 'infrastructure_sharing-sx' into jgrpp 2016-04-28 22:23:22 +01:00
Jonathan G Rennison
16de93413e Merge branch 'infrastructure_sharing' into infrastructure_sharing-sx 2016-04-28 22:23:12 +01:00
Jonathan G Rennison
22f9e3b97c Merge branch 'signal_tunnels_bridges' into signal_tunnels_bridges-sx 2016-04-28 22:19:46 +01:00
Jonathan G Rennison
17f74e4c51 Fix signalled bridge/tunnel not always being redrawn on (un)reservation. 2016-04-28 22:19:35 +01:00
Jonathan G Rennison
3ae94d857c Fix FindTrainOnTrackEnum finding trains inside signalled bridge/tunnels. 
Now only find trains on the given entrance/exit tile.
This fixes trains not leaving stations by PBS into non-empty signalled
bridge/tunnels.
 2016-04-28 22:07:16 +01:00
Jonathan G Rennison
781bf73c6d Fix incorrect calculation of final delivery payment. 
Calculation was incorrect for partial packet delivery after a transfer.
 2016-04-28 19:39:06 +01:00
translators
806d97435e (svn r27551) -Update from Eints: 
ukrainian: 3 changes by odisseus
 2016-04-28 17:45:35 +00:00
translators
729a03ea67 (svn r27550) -Update from Eints: 
frisian: 7 changes by BAJansen
 2016-04-25 17:45:36 +00:00
Jonathan G Rennison
1a01115101 Fix create group from veh list being shown (non-functional) in group GUI. 
Remove and only show in vehicle list.
 2016-04-25 18:45:02 +01:00
translators
d23bcc13b1 (svn r27549) -Update from Eints: 
chinese (traditional): 1 change by ww9980
 2016-04-23 17:45:37 +00:00
translators
fa83b145c8 (svn r27548) -Update from Eints: 
korean: 1 change by telk5093
 2016-04-21 17:45:38 +00:00
Jonathan G Rennison
24a85d1c99 Version: Committing version data for tag: jgrpp-0.13.0 2016-04-19 23:10:07 +01:00
Jonathan G Rennison
3da991bf9b Merge branch 'master' into jgrpp 
# Conflicts:
#	src/rail_gui.cpp
 2016-04-19 22:48:33 +01:00
frosch
34b68c7a82 (svn r27547) -Fix: Use a more appropiate sound effect for convert-rail. (andythenorth) 2016-04-19 20:39:08 +00:00
frosch
732260853e (svn r27546) -Fix: Remove SetFill from vehicle GUI buttons, so that the viewport is resized instead of them in case of long window titles. 2016-04-17 20:20:52 +00:00
frosch
e9fea1738a (svn r27545) -Fix: Remove special handling of classes with virtual methods from squirrel_export.awk. It seems to serve no purpose, except to break on 3 classes. 2016-04-17 19:51:42 +00:00
frosch
507e7135ec (svn r27544) -Fix-ish: Mark ScriptText::GetEncodedText as not part of any API, instead of relying on the export script to break on '/*'. 2016-04-17 19:50:27 +00:00
frosch
d70da28365 (svn r27543) -Fix (r27379): ScriptExec/TestMode::FinalRelease is not part of the API. 2016-04-17 17:10:07 +00:00
frosch
e7e6b45d89 (svn r27542) -Fix (r27367) [FS#6427]: ICU got disabled for Windows builds. 2016-04-17 16:50:37 +00:00
frosch
4cfa482786 (svn r27541) -Update: Baseset translations 2016-04-17 16:30:45 +00:00
translators
c723ef85ff (svn r27540) -Update from Eints: 
hebrew: 40 changes by dnd_man
 2016-04-16 17:45:37 +00:00
translators
35aa952c36 (svn r27539) -Update from Eints: 
hebrew: 66 changes by dnd_man
 2016-04-14 17:45:35 +00:00
Jonathan G Rennison
54b8eb9b4c Merge branch 'polyline_track_tool' into jgrpp 
# Conflicts:
#	src/rail_cmd.cpp
#	src/rail_gui.cpp
#	src/viewport.cpp
#	src/viewport_func.h
 2016-04-13 21:14:47 +01:00
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
6ed602fab2 (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
9a5db2063b (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