Commit Graph

8282 Commits

Author SHA1 Message Date
Jonathan G Rennison
f8d6e781ba Merge branch 'master' into jgrpp
# Conflicts:
#	projects/openttd_vs140.vcxproj.filters
#	projects/openttd_vs141.vcxproj.filters
#	projects/openttd_vs142.vcxproj.filters
#	src/base_consist.h
#	src/company_base.h
#	src/newgrf_config.cpp
#	src/newgrf_config.h
#	src/openttd.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
#	src/saveload/station_sl.cpp
#	src/settings.cpp
#	src/signs_base.h
#	src/string.cpp
#	src/string_func.h
#	src/table/misc_settings.ini
#	src/table/settings.h.preamble
#	src/town_cmd.cpp
#	src/vehicle.cpp
#	src/vehicle_cmd.cpp
#	src/video/cocoa/cocoa_v.mm
#	src/video/null_v.cpp
2020-05-21 22:24:01 +01:00
translators
7309bdec48 Update: Translations from eints
latvian: 9 changes by Tranzistors
2020-05-20 19:45:39 +02:00
translators
b8a896d52c Update: Translations from eints
latvian: 35 changes by Tranzistors
2020-05-18 19:45:41 +02:00
translators
d11bae58a0 Update: Translations from eints
spanish (mexican): 7 changes by Absay
2020-05-17 19:45:39 +02:00
translators
70ccd34fa0 Update: Translations from eints
latvian: 13 changes by Tranzistors
2020-05-16 19:45:38 +02:00
translators
edc7ee2cda Update: Translations from eints
indonesian: 1 change by fanioz
dutch: 1 change by JanWillem
latvian: 39 changes by Tranzistors
spanish (mexican): 1 change by Absay
2020-05-15 19:45:40 +02:00
translators
9b8d5ea074 Update: Translations from eints
spanish (mexican): 16 changes by Absay
russian: 3 changes by Lone_Wolf
2020-05-14 19:45:40 +02:00
Jonathan G Rennison
d37d08ebb3 Merge branch 'master' into jgrpp
# Conflicts:
#	src/industry_cmd.cpp
#	src/station_cmd.cpp
#	src/station_func.h
2020-05-14 00:40:16 +01:00
translators
83cd040c61 Update: Translations from eints
latvian: 21 changes by Tranzistors
korean: 5 changes by telk5093
2020-05-13 19:45:39 +02:00
Jonathan G Rennison
77673b731c Merge branch 'master' into jgrpp
# Conflicts:
#	src/industry_cmd.cpp
#	src/openttd.cpp
#	src/station_cmd.cpp
#	src/station_func.h
2020-05-13 11:17:09 +01:00
translators
6dcc99edab Update: Translations from eints
latvian: 45 changes by Tranzistors
spanish (mexican): 9 changes by Absay
2020-05-12 19:45:38 +02:00
translators
48c61c1da1 Update: Translations from eints
latvian: 54 changes by Tranzistors
spanish (mexican): 4 changes by Absay
2020-05-11 19:45:38 +02:00
Ilayaraja
48d2eb703c Add: INR currency (#8136)
Co-authored-by: ilayarja97 <ilayarja97@gmail.com>
2020-05-11 14:31:03 +01:00
Jonathan G Rennison
763a2826b6 Merge branch 'master' into jgrpp
# Conflicts:
#	src/gamelog.cpp
2020-05-11 00:45:24 +01:00
Jonathan G Rennison
0202211514 Conditional orders: Add slot acquire modes to train in slot conditional 2020-05-10 21:06:09 +01:00
translators
3ba34a72aa Update: Translations from eints
latvian: 80 changes by Tranzistors
spanish (mexican): 10 changes by Absay
2020-05-10 19:45:39 +02:00
Jonathan G Rennison
0100ea4e32 Conditional orders: Add mode to check waiting station cargo via next node 2020-05-10 15:32:12 +01:00
translators
61e1a45100 Update: Translations from eints
latvian: 8 changes by Tranzistors
spanish (mexican): 1 change by Absay
2020-05-09 19:45:37 +02:00
Jonathan G Rennison
07c9621fcf Merge branch 'master' into jgrpp 2020-05-07 20:57:47 +01:00
translators
170f3f9b2b Update: Translations from eints
latvian: 38 changes by Tranzistors
2020-05-07 19:45:39 +02:00
translators
364f6806c8 Update: Translations from eints 2020-05-06 19:45:39 +02:00
glx
f0747c8c51 Update: Lang files 2020-05-06 09:54:36 +01:00
glx
e0d20a44d2 Codechange: Use a dynamic copyright year 2020-05-06 09:54:36 +01:00
translators
aa91c0666e Update: Translations from eints
korean: 1 change by telk5093
2020-05-04 19:45:38 +02:00
Jonathan G Rennison
74b6981d97 Merge branch 'master' into jgrpp
# Conflicts:
#	src/os/macosx/macos.mm
#	src/video/cocoa/cocoa_v.mm
#	src/video/cocoa/fullscreen.mm
#	src/video/cocoa/wnd_quartz.mm
#	src/video/cocoa/wnd_quickdraw.mm
2020-04-30 23:59:06 +01:00
Jonathan G Rennison
ad72fad68e Fix #148: Rename STR_MONEY_CHEAT_MULTIPLAYER* strings 2020-04-26 20:08:44 +01:00
TELK
951b687f5e ko-KR: Fix typo 2020-04-20 18:23:10 +09:00
TELK
e236d938a9 ko-KR: Update translations 2020-04-20 13:26:34 +09:00
Jonathan G Rennison
1506479f56 Cheat: Add cheats to set inflation income and cost factors
See: #124
2020-04-18 10:53:49 +01:00
translators
e45bccb833 Update: Translations from eints
welsh: 4 changes by kazzie
2020-04-17 19:45:39 +02:00
translators
0b8100b46f Update: Translations from eints
tamil: 16 changes by aswn
2020-04-16 19:45:38 +02:00
Jonathan G Rennison
ab99c16601 Add support for money cheat in multiplayer
Add a setting for whether this is permitted by multiplayer clients
2020-04-14 22:04:41 +01:00
Jonathan G Rennison
a4bf068c6c Merge branch 'master' into jgrpp
# Conflicts:
#	src/toolbar_gui.cpp
2020-04-12 11:25:34 +01:00
translators
7aab7642bf Update: Translations from eints
catalan: 30 changes by juanjo
2020-04-08 19:45:39 +02:00
translators
d50e4641ae Update: Translations from eints
luxembourgish: 9 changes by Phreeze
2020-04-07 19:45:39 +02:00
Jonathan G Rennison
f077c3bf6e Merge branch 'master' into jgrpp 2020-04-06 20:58:54 +01:00
translators
71e79edfc1 Update: Translations from eints
estonian: 32 changes by taavi
2020-04-04 19:45:40 +02:00
Jonathan G Rennison
d210bc4d14 Merge branch 'master' into jgrpp
# Conflicts:
#	src/lang/korean.txt
#	src/saveload/afterload.cpp

Recalculate docking tile cache due to 57553cd8
2020-04-01 00:32:45 +01:00
translators
2cc9afe057 Update: Translations from eints
danish: 2 changes by Knogle
2020-03-27 19:45:41 +01:00
translators
55e81d3973 Update: Translations from eints
polish: 22 changes by MaksOPENTTD1
2020-03-22 19:45:41 +01:00
translators
e7da6616ba Update: Translations from eints
polish: 20 changes by MaksOPENTTD1
2020-03-21 19:45:42 +01:00
translators
4a079407e7 Update: Translations from eints
hungarian: 26 changes by Brumi
korean: 3 changes by telk5093
2020-03-20 19:45:41 +01:00
Jonathan G Rennison
568dec5b57 Merge branch 'pr-135' into jgrpp 2020-03-18 20:38:37 +00:00
translators
6fde854759 Update: Translations from eints
french: 3 changes by glx
2020-03-18 19:45:40 +01:00
translators
ce7374ec25 Update: Translations from eints
korean: 1 change by telk5093
2020-03-17 19:45:41 +01:00
greengaeru5122f
182fcccaa4 updated translation and more translation 2020-03-14 02:39:33 +09:00
Jonathan G Rennison
8fb0b638fa Merge branch 'master' into jgrpp
# Conflicts:
#	src/network/network.cpp
2020-03-11 23:16:32 +00:00
Jonathan G Rennison
475a3651b2 Lang: Delete stray line 2020-02-28 01:44:55 +00:00
TELK
f5ca33328c ko-KR: Fix #133 2020-02-28 02:34:48 +09:00
TELK
199f0ac3e8 ko-KR: Update for 0.33.2 2020-02-28 02:34:48 +09:00