Commit Graph

23125 Commits (cf59b4fcabf3bf48703a4ca0113cd5e80a3cf2f4)
 

Author SHA1 Message Date
Jonathan G Rennison cf59b4fcab Merge branch 'signal_tunnels_bridges-sx' into jgrpp 8 years ago
Jonathan G Rennison 6e545d1138 Merge branch 'infrastructure_sharing-sx' into jgrpp 8 years ago
Jonathan G Rennison 16de93413e Merge branch 'infrastructure_sharing' into infrastructure_sharing-sx 8 years ago
Jonathan G Rennison 22f9e3b97c Merge branch 'signal_tunnels_bridges' into signal_tunnels_bridges-sx 8 years ago
Jonathan G Rennison 17f74e4c51 Fix signalled bridge/tunnel not always being redrawn on (un)reservation. 8 years ago
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.
8 years ago
Jonathan G Rennison 781bf73c6d Fix incorrect calculation of final delivery payment.
Calculation was incorrect for partial packet delivery after a transfer.
8 years ago
Jonathan G Rennison 1a01115101 Fix create group from veh list being shown (non-functional) in group GUI.
Remove and only show in vehicle list.
8 years ago
Jonathan G Rennison 24a85d1c99 Version: Committing version data for tag: jgrpp-0.13.0 8 years ago
Jonathan G Rennison 3da991bf9b Merge branch 'master' into jgrpp
# Conflicts:
#	src/rail_gui.cpp
8 years ago
frosch 34b68c7a82 (svn r27547) -Fix: Use a more appropiate sound effect for convert-rail. (andythenorth) 8 years ago
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. 8 years ago
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. 8 years ago
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 '/*'. 8 years ago
frosch d70da28365 (svn r27543) -Fix (r27379): ScriptExec/TestMode::FinalRelease is not part of the API. 8 years ago
frosch e7e6b45d89 (svn r27542) -Fix (r27367) [FS#6427]: ICU got disabled for Windows builds. 8 years ago
frosch 4cfa482786 (svn r27541) -Update: Baseset translations 8 years ago
translators c723ef85ff (svn r27540) -Update from Eints:
hebrew: 40 changes by dnd_man
8 years ago
translators 35aa952c36 (svn r27539) -Update from Eints:
hebrew: 66 changes by dnd_man
8 years ago
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
8 years ago
patch-import 01cf154f51 Import polyline rail tool patch v10b
http://www.tt-forums.net/viewtopic.php?f=33&t=57080
8 years ago
translators bff29d86b5 (svn r27538) -Update from Eints:
hebrew: 18 changes by dnd_man
luxembourgish: 1 change by Phreeze
8 years ago
translators 6ed602fab2 (svn r27537) -Update from Eints:
korean: 2 changes by telk5093
8 years ago
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.
8 years ago
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)
8 years ago
keldorkatarn 4c37aad393 Make sure we the custom track type based signals for bridges and tunnels also.
(cherry picked from commit 1dc478cb654f88eab3c760bdc9f305ce3f039ec3)
8 years ago
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.
8 years ago
Jonathan G Rennison 59677d5c6f Merge branch 'signal_tunnels_bridges-sx' into jgrpp 8 years ago
Jonathan G Rennison a974db6ade Merge branch 'signal_tunnels_bridges' into signal_tunnels_bridges-sx 8 years ago
Jonathan G Rennison 41a06e698f Merge branch 'house_placing' into jgrpp
# Conflicts:
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/town_gui.cpp
8 years ago
Jonathan G Rennison 6ebea4b49c Merge v4 of house picking/placing patch. 8 years ago
patch-import 0fd34a17a5 Update to v4 of house placing patch. 8 years ago
keldorkatarn 095229128d Fix crash when dragging two-directional block signals onto a bridge or tunnel
(cherry picked from commit 4199ba5981b2761d5226ebc89b315f00e62e1a3a)
8 years ago
translators 0badab6d8e (svn r27536) -Update from Eints:
belarusian: 1 change by KorneySan
malay: 1 change by rionix88
8 years ago
translators 9a5db2063b (svn r27535) -Update from Eints:
norwegian (bokmal): 16 changes by Leifbk
8 years ago
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
8 years ago
Jonathan G Rennison faf8dab12a Bump tracerestrict version due to group conditional. 8 years ago
Jonathan G Rennison 9ed3dc2581 Merge branch 'tracerestrict' into tracerestrict-sx 8 years ago
Jonathan G Rennison 213b0e7e3a Tracerestrict: Add a group membership conditional. 8 years ago
frosch 76fc242666 (svn r27534) -Fix [FS#6435]: [NewGRF] Station spritelayouts did not accept the var10 flag for the palette. 8 years ago
frosch e580d9e623 (svn r27533) -Update: Baseset translations 8 years ago
translators 05b5c945cc (svn r27530) -Update from Eints:
catalan: 2 changes by juanjo
8 years ago
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
8 years ago
translators c5aee2ac52 (svn r27528) -Update from Eints:
catalan: 233 changes by juanjo
portuguese (brazilian): 1 change by Tucalipe
8 years ago
translators 692458d8f5 (svn r27527) -Update from Eints:
tamil: 13 changes by aswn
8 years ago
translators 927d1a9490 (svn r27526) -Update from Eints:
malay: 2 changes by rionix88
8 years ago
Jonathan G Rennison 0cca19da9f Version: Committing version data for tag: jgrpp-0.12.1 8 years ago
Jonathan G Rennison ec62878758 Merge branch 'crashlog_improvements' into jgrpp 8 years ago
Jonathan G Rennison 2a2ff30c3f Fix Pool verbose assertion format string on Windows platforms. 8 years ago
Jonathan G Rennison 636ecc9f23 Merge branch 'master' into jgrpp 8 years ago