Commit Graph

3927 Commits (424e4691ce2122ccfe42d19aad4edb6b71b5c689)

Author SHA1 Message Date
frosch 050271ed2d (svn r27732) -Change: Turn the message about 'missing baseset sprites' from a popup into a static message that only shows in non-release versions, just like the 'missing translations' message. 8 years ago
translators 9f858cefd1 (svn r27728) -Update from Eints:
latin: 1 change by Supercheese
8 years ago
translators 43ee8e8d38 (svn r27720) -Update from Eints:
turkish: 25 changes by barisdemirdelen
8 years ago
Jonathan G Rennison d361120fa0 Merge branch 'master' into jgrpp 8 years ago
translators 12d17ed62b (svn r27719) -Update from Eints:
polish: 25 changes by nouwak
8 years ago
translators a8496153d6 (svn r27718) -Update from Eints:
spanish (mexican): 25 changes by Absay
8 years ago
translators 151956d471 (svn r27717) -Update from Eints:
spanish: 2 changes by SilverSurferZzZ
8 years ago
translators 9bbc6e7ab5 (svn r27716) -Update from Eints:
catalan: 1 change by juanjo
8 years ago
translators db6e65f4f3 (svn r27715) -Update from Eints:
spanish: 2 changes by SilverSurferZzZ
8 years ago
Jonathan G Rennison 5c7f36ef4b Merge branch 'enhanced_viewport_overlay' into jgrpp
Further fixes for viewport lines/marker for multiplayer clients.

# Conflicts:
#	src/lang/russian.txt
8 years ago
Jonathan G Rennison 0d1e08ed75 Merge branch 'save_ext' into enhanced_viewport_overlay
# Conflicts:
#	src/clear_cmd.cpp
8 years ago
translators 1c7e978b09 (svn r27714) -Update from Eints:
catalan: 2 changes by juanjo
russian: 1 change by Lone_Wolf
8 years ago
translators c917ed2112 (svn r27708) -Update from Eints:
catalan: 26 changes by juanjo
russian: 9 changes by Lone_Wolf
8 years ago
translators 2507487877 (svn r27704) -Update from Eints:
welsh: 29 changes by kazzie
spanish: 2 changes by SilverSurferZzZ
russian: 13 changes by Lone_Wolf
8 years ago
translators 6de1225894 (svn r27702) -Update from Eints:
russian: 16 changes by Lone_Wolf
8 years ago
translators ca65ea003d (svn r27701) -Update from Eints:
russian: 37 changes by Lone_Wolf
8 years ago
translators be21109989 (svn r27699) -Update from Eints:
russian: 1 change by Lone_Wolf
8 years ago
translators 2171a56c15 (svn r27698) -Update from Eints:
spanish: 3 changes by SilverSurferZzZ
russian: 3 changes by Lone_Wolf
8 years ago
translators 37b6bd5702 (svn r27697) -Update from Eints:
urdu: 9 changes by siphr
spanish: 3 changes by SilverSurferZzZ
8 years ago
translators 5d5d020103 (svn r27696) -Update from Eints:
urdu: 11 changes by siphr
spanish: 6 changes by SilverSurferZzZ
russian: 10 changes by Lone_Wolf
8 years ago
translators 8a41b36cd8 (svn r27695) -Update from Eints:
spanish: 4 changes by SilverSurferZzZ
french: 26 changes by glx
8 years ago
translators 1808557b45 (svn r27694) -Update from Eints:
spanish: 4 changes by SilverSurferZzZ
8 years ago
Jonathan G Rennison cea0d42548 Merge branch 'master' into jgrpp 8 years ago
translators 01059a7f75 (svn r27693) -Update from Eints:
korean: 2 changes by telk5093
spanish: 21 changes by SilverSurferZzZ
russian: 14 changes by Lone_Wolf
8 years ago
translators 3f78d271b2 (svn r27692) -Update from Eints:
croatian: 25 changes by VoyagerOne
english (us): 2 changes by Supercheese
russian: 1 change by Lone_Wolf
latin: 25 changes by Supercheese
8 years ago
translators 7c7913c986 (svn r27691) -Update from Eints:
italian: 9 changes by lorenzodv
8 years ago
Jonathan G Rennison 478ff2538e Merge branch 'master' into jgrpp
# Conflicts:
#	src/lang/english.txt
#	src/lang/korean.txt
8 years ago
frosch 4753097c3d (svn r27686) -Change: List railtype of rail tiles explicitly in the tile info window. 8 years ago
frosch f294258b18 (svn r27685) -Change: Preemptively invalidate translation changes of next commit for eints. 8 years ago
translators cf04ca5db3 (svn r27684) -Update from Eints:
italian: 1 change by lorenzodv
8 years ago
Jonathan G Rennison 58381a3ea2 Merge branch 'master' into jgrpp 8 years ago
Jonathan G Rennison 20a090b077 Show warning dialog if NewGRFs use too many string IDs.
Show when reloading/changing NewGRF config, or starting new game.
8 years ago
frosch da76191afc (svn r27683) -Change: Rearrange the autoreplace GUI for trains, and do not filter it by railtype by default. 8 years ago
kiwitreekor a30e15d683 Korean Translation Update 8 years ago
Jonathan G Rennison eae7334ac0 Lang: Korean: Adjust a string/string2 and trailing whitespace. 8 years ago
kiwitreekor dc192be09d Add files via upload 8 years ago
Jonathan G Rennison 55e57fd07d Add shift-clicking on vehicle depot button to select specific depot. 8 years ago
Jonathan G Rennison 1b5c3b4027 Merge branch 'master' into jgrpp 8 years ago
Jonathan G Rennison ddae95addb Rescale town cargo adj setting by 10x, for finer adjustment.
Use DECIMAL1 instead of an integer.
8 years ago
Jonathan G Rennison f5212b27e4 Add a DECIMAL1 string code, which is DECIMAL with a fixed param of 1. 8 years ago
Jonathan G Rennison 55057110a5 Linkgraph GUI: Add hover tool-tips to graph legend window. 8 years ago
Jonathan G Rennison 37a58fd11d Add setting to increase station catchment radius.
Update acceptance and refresh screen when catchment settings change.
8 years ago
translators fd7852cbdf (svn r27680) -Update from Eints:
romanian: 1 change by kneekoo
8 years ago
Jonathan G Rennison 10ae23d3b9 Merge branch 'departure-boards' into jgrpp
VehicleListIdentifier API changes.

# Conflicts:
#	src/departures.cpp
#	src/vehicle_gui.cpp
8 years ago
Jonathan G Rennison 31b2a39d02 Merge branch 'save_ext' into departure-boards
Adjust calls to GenerateVehicleSortList due to API change.
8 years ago
translators 4ea93bc8ef (svn r27679) -Update from Eints:
romanian: 10 changes by kneekoo
8 years ago
translators 7e2e63094b (svn r27678) -Update from Eints:
romanian: 20 changes by kneekoo
8 years ago
Jonathan G Rennison 7f10d83a4a Merge branch 'template_train_replacement' into jgrpp
# Conflicts:
#	src/linkgraph/linkgraphjob.cpp
#	src/saveload/extended_ver_sl.cpp
#	src/train_cmd.cpp
#	src/vehicle_base.h
8 years ago
Jonathan G Rennison d204062300 Merge branch 'master' into template_train_replacement 8 years ago
translators f8f2c9d3a5 (svn r27669) -Update from Eints:
thai: 11 changes by angelix
8 years ago
Jonathan G Rennison 13694c30cf Merge branch 'master' into jgrpp
# Conflicts:
#	src/clear_cmd.cpp
8 years ago
Jonathan G Rennison bebed03c7e Merge branch 'enhanced_viewport_overlay' into jgrpp
# Conflicts:
#	src/viewport.cpp
8 years ago
Jonathan G Rennison 3975305f04 Limit number of vehicle route step markers for a single station to 10.
If more than 10, draw an overflow marker instead.
Minor refactoring.
8 years ago
translators 8c1bf8f16d (svn r27661) -Update from Eints:
portuguese: 1 change by Samu
8 years ago
translators b080b86574 (svn r27660) -Update from Eints:
portuguese: 7 changes by Samu
8 years ago
translators 3ee07f37d8 (svn r27659) -Update from Eints:
portuguese: 25 changes by Samu
8 years ago
translators 169468a857 (svn r27658) -Update from Eints:
danish: 1 change by Knogle
8 years ago
Jonathan G Rennison c83903ddb0 Merge branch 'master' into jgrpp 8 years ago
Jonathan G Rennison f0bcec77fb Import patch for random town road reconstruction.
From https://www.tt-forums.net/viewtopic.php?f=33&t=36438

Change scale from 0-100 to 0-1000
Adjust strings, settings GUI placement, etc.
8 years ago
Jonathan G Rennison c20cf31514 Merge branch 'cpp-11' into enhanced_viewport_overlay
# Conflicts:
#	src/rail_gui.cpp
#	src/saveload/saveload.cpp
#	src/smallmap_gui.cpp
8 years ago
Jonathan G Rennison 9ea018abc5 Merge branch 'cargo_type_order' into jgrpp
# Conflicts:
#	src/order_base.h
#	src/order_gui.cpp
#	src/order_type.h
#	src/saveload/extended_ver_sl.cpp
#	src/saveload/extended_ver_sl.h
#	src/vehicle_base.h
8 years ago
translators 737897653a (svn r27655) -Update from Eints:
romanian: 2 changes by kkmic
8 years ago
Jonathan G Rennison 7178ef22e5 Adjust order line load/unload by cargo type strings. 8 years ago
Jonathan G Rennison c1c983ea16 Import cargo type orders patch
https://www.tt-forums.net/viewtopic.php?p=1047749#p1047749

Port to current trunk, resolve various conflicts, etc.
Adjust bit allocations for CmdModifyOrder.
Use save_ext framework for added order flags.
8 years ago
Jonathan G Rennison 761463d134 Merge branch 'template_train_replacement-sx' into jgrpp
# Conflicts:
#	src/window.cpp
8 years ago
Jonathan G Rennison 23a1c07378 Merge branch 'master' into template_train_replacement
Fix Template creation window vehicle drag cursor.
8 years ago
translators 9d5ed2c469 (svn r27624) -Update from Eints:
spanish (mexican): 24 changes by Absay
8 years ago
Jonathan G Rennison 7b56097f50 Merge branch 'master' into jgrpp
# Conflicts:
#	config.lib
#	src/linkgraph/demands.cpp
#	src/linkgraph/mcf.cpp
#	src/linkgraph/refresh.cpp
#	src/linkgraph/refresh.h
#	src/smallmap_gui.cpp
8 years ago
translators aa140bb928 (svn r27618) -Update from Eints:
latvian: 19 changes by Parastais
8 years ago
translators c6ac52e71a (svn r27617) -Update from Eints:
latvian: 6 changes by Parastais
8 years ago
translators 18bbe02337 (svn r27615) -Update from Eints:
spanish: 7 changes by SilverSurferZzZ
8 years ago
Jonathan G Rennison d5ee260daf Update changed format code in translation. 8 years ago
Jonathan G Rennison f0fee802a9 Merge branch 'tracerestrict-sx' into jgrpp
# Conflicts:
#	src/lang/english.txt
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/table/settings.ini
#	src/vehicle_gui.cpp
8 years ago
Jonathan G Rennison ed33a62bcd Merge branch 'tracerestrict' into tracerestrict-sx 8 years ago
Jonathan G Rennison 0ab2abbc23 Add client setting to show train weight ratios in details header.
Off by default.
8 years ago
Jonathan G Rennison 8ec1b2200e Change tracerestrict weight ratio properties to use decimals, and the weight unit.
Add {POWER_WEIGHT_RATIO} and {FORCE_WEIGHT_RATIO} string codes.
8 years ago
translators 8f2461cdfb (svn r27610) -Update from Eints:
korean: 1 change by telk5093
8 years ago
Jonathan G Rennison 80e3af6bf5 Merge branch 'tracerestrict-sx' into jgrpp
# Conflicts:
#	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 e4b932d53a Merge branch 'tracerestrict' into tracerestrict-sx 8 years ago
Jonathan G Rennison f942de699c Add power/weight and max TE/weight ratio tracerestrict conditionals.
Minor refactorings.
8 years ago
Jonathan G Rennison b5531975da Add train weight, power, and max TE tracerestrict conditionals.
Minor refactorings.
8 years ago
translators 932951982f (svn r27604) -Update from Eints:
spanish: 3 changes by SilverSurferZzZ
8 years ago
translators 60d05aa27d (svn r27603) -Update from Eints:
spanish: 12 changes by SilverSurferZzZ
8 years ago
translators 3d54c33180 (svn r27601) -Update from Eints:
spanish (mexican): 4 changes by Absay
8 years ago
Jonathan G Rennison 6bcd6aec76 Merge branch 'master' into jgrpp 8 years ago
translators 1234b7d0f8 (svn r27599) -Update from Eints:
persian: 2 changes by rkarimabadi
8 years ago
Jonathan G Rennison 09291a3b74 Merge branch 'master' into jgrpp
# Conflicts:
#	src/blitter/32bpp_anim.cpp
#	src/rail_gui.cpp
#	src/saveload/saveload.cpp
#	src/train_cmd.cpp
#	src/vehicle_base.h
8 years ago
translators 39d588fa60 (svn r27582) -Update from Eints:
spanish (mexican): 18 changes by Absay
8 years ago
translators f5c5783fac (svn r27569) -Update from Eints:
spanish (mexican): 3 changes by Absay
8 years ago
translators dd2f369e9d (svn r27568) -Update from Eints:
dutch: 1 change by habell
8 years ago
translators e71afa0c10 (svn r27567) -Update from Eints:
finnish: 1 change by jpx_
8 years ago
translators 101a63c3f5 (svn r27566) -Update from Eints:
spanish (mexican): 6 changes by Absay
8 years ago
translators 724dd44355 (svn r27565) -Update from Eints:
spanish (mexican): 13 changes by Absay
8 years ago
Jonathan G Rennison 4c0423d6d8 Merge branch 'master' into jgrpp 8 years ago
Jonathan G Rennison f6d374ade4 Merge branch 'house_placing' into jgrpp
This reverts the house picking/placing patch back to v2.
This is to fix house placement/town growth desync issues introduced in v4.

# Conflicts:
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/town_gui.cpp
8 years ago
Jonathan G Rennison 95b65163e3 Revert back to v2 of house picking/placing patch. 8 years ago
frosch bd71bcc616 (svn r27564) -Update: Ownname of es_MX. 8 years ago
translators edfe26f2ee (svn r27563) -Update from Eints:
korean: 1 change by Gimel3830
spanish (mexican): 93 changes by Absay
8 years ago
translators f0db8a16d5 (svn r27556) -Update from Eints:
spanish (mexican): 36 changes by Absay
8 years ago
Jonathan G Rennison eac2f0720c Merge branch 'master' into jgrpp 8 years ago
translators 3d476cf432 (svn r27555) -Update from Eints:
croatian: 3 changes by VoyagerOne
8 years ago
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
8 years ago
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.
8 years ago
translators 3ae6dab58b (svn r27554) -Update from Eints:
korean: 1 change by Gimel3830
8 years ago
Jonathan G Rennison efcdd6c36f Remove global automated timetable setting. 8 years ago
Jonathan G Rennison ff5ee52b94 Add a company setting to control auto-fill timetable rounding. 8 years ago
Jonathan G Rennison 04b188bd7d Add client setting to show leftover ticks in timetable. 8 years ago
frosch a3ffac0025 (svn r27552) -Feature: Mexican Spanish (Absay) 8 years ago
translators 806d97435e (svn r27551) -Update from Eints:
ukrainian: 3 changes by odisseus
8 years ago
translators 729a03ea67 (svn r27550) -Update from Eints:
frisian: 7 changes by BAJansen
8 years ago
translators d23bcc13b1 (svn r27549) -Update from Eints:
chinese (traditional): 1 change by ww9980
8 years ago
translators fa83b145c8 (svn r27548) -Update from Eints:
korean: 1 change by telk5093
8 years ago
Jonathan G Rennison 3da991bf9b Merge branch 'master' into jgrpp
# Conflicts:
#	src/rail_gui.cpp
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 41a06e698f Merge branch 'house_placing' into jgrpp
# Conflicts:
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/town_gui.cpp
8 years ago
patch-import 0fd34a17a5 Update to v4 of house placing patch. 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 9ed3dc2581 Merge branch 'tracerestrict' into tracerestrict-sx 8 years ago
Jonathan G Rennison 213b0e7e3a Tracerestrict: Add a group membership conditional. 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 636ecc9f23 Merge branch 'master' into jgrpp 8 years ago
translators 518eeac55f (svn r27525) -Update from Eints:
latin: 18 changes by Supercheese
8 years ago
translators 177c61477a (svn r27524) -Update from Eints:
esperanto: 3 changes by LaPingvino
8 years ago
Jonathan G Rennison 9f82f00f7a Enable bulk timetable change actions for clear time, and set/clear speed. 8 years ago
translators fe4d076dd8 (svn r27523) -Update from Eints:
latvian: 1 change by Jancs
8 years ago
Heiko August aee3b77d99 translate-de: translation for lifetime profit strings 8 years ago
Heiko August af036f3c52 translate-de: translation for ship collision avoidance patch 8 years ago
Heiko August aabecf3998 translate-de: add translation for repair cost patch 8 years ago
Heiko August 40985ccb44 translate-de: add first strings of restricted signals patch 8 years ago
Jonathan G Rennison ca9f6411cc Implement adding a vehicle list to a new group. 8 years ago
translators 20373af117 (svn r27522) -Update from Eints:
slovenian: 72 changes by Necrolyte
8 years ago
translators 3912258035 (svn r27521) -Update from Eints:
malay: 5 changes by rionix88
8 years ago
Jonathan G Rennison c0cc72ad96 Implement change timetable waiting time for all stations.
Loosely based on http://www.tt-forums.net/viewtopic.php?f=32&t=50274
8 years ago
Jonathan G Rennison 57cbecb0e0 Merge branch 'master' into jgrpp 8 years ago
frosch a8b5756718 (svn r27516) -Update: Documentation 8 years ago
translators 8284c69a61 (svn r27515) -Update from Eints:
polish: 1 change by lion
thai: 11 changes by ityellow
8 years ago
translators 815fce8bd9 (svn r27514) -Update from Eints:
turkish: 2 changes by wakeup
8 years ago
translators 4a64ced9b5 (svn r27513) -Update from Eints:
spanish: 5 changes by SilverSurferZzZ
8 years ago
Jonathan G Rennison 7bc407e2f8 Merge branch 'infrastructure_sharing-sx' into jgrpp
# Conflicts:
#	src/settings_type.h
#	src/table/settings.ini
8 years ago