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

8231 Commits

Author SHA1 Message Date
Jonathan G Rennison
b96e7f78fb Merge branch 'master' into jgrpp 2020-02-21 21:18:01 +00:00
translators
87909855c8 Update: Translations from eints 
italian: 2 changes by AlphaJack
korean: 8 changes by telk5093
 2020-02-15 19:45:40 +01:00
translators
05b50aa437 Update: Translations from eints 
afrikaans: 179 changes by Maccie123
chinese (traditional): 4 changes by firetimer
chinese (simplified): 100 changes by firetimer
 2020-02-14 19:45:39 +01:00
translators
183c2a35bd Update: Translations from eints 
dutch: 2 changes by JanWillem
spanish (mexican): 2 changes by Absay
 2020-02-10 19:45:41 +01:00
Jonathan G Rennison
99e0229860 Merge branch 'master' into jgrpp 2020-02-10 18:24:33 +00:00
Jonathan G Rennison
bca0187aaf Schedule dispatch: Warn about and ignore departure slots outside the duration 2020-02-09 23:17:19 +00:00
translators
e31d75c926 Update: Translations from eints 
basque: 17 changes by Thadah
 2020-02-09 19:45:40 +01:00
Jonathan G Rennison
babe98cdb1 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/network/network_server.h
#	src/pathfinder/yapf/yapf_road.cpp
#	src/viewport.cpp
 2020-02-09 15:43:47 +00:00
translators
a499e9acdd Update: Translations from eints 
russian: 2 changes by Lone_Wolf
 2020-02-08 19:45:39 +01:00
translators
58c8ff456e Update: Translations from eints 
korean: 2 changes by telk5093
 2020-02-05 19:45:39 +01:00
Bjarni Thor
5880f1479f Feature #7756: Allow server to supply a reason to kicked/banned clients 
This commit adds the missing feature of allowing the server owner to
    provide a reason for kicking/banning a client, which the client sees in
    a pop-up window after being kicked. The implementation extends the
    network protocol by adding a new network action called
    NETWORK_ACTION_KICKED that is capable of having an error string, unlike
    the other network error packages.  Additionally, the kick function
    broadcasts a message to all clients about the kicked client and the
    reason for the kick.
 2020-02-04 22:17:39 +00:00
translators
ac7cc18ab9 Update: Translations from eints 
czech: 22 changes by djst
 2020-02-02 19:45:40 +01:00
translators
be9ca4689e Update: Translations from eints 
korean: 4 changes by telk5093
 2020-01-30 19:45:39 +01:00
Jonathan G Rennison
81a1094cc8 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/console_cmds.cpp
#	src/date.cpp
#	src/economy.cpp
#	src/misc.cpp
#	src/newgrf_house.cpp
 2020-01-29 19:32:06 +00:00
Jonathan G Rennison
ab1b8ab209 Scheduled dispatch: Add schedule end time to info line 2020-01-29 02:19:47 +00:00
Jonathan G Rennison
9917a1daef Scheduled dispatch: Add hints about dispatch order to timetable window 
Adjust condition for dispatch order
 2020-01-29 00:25:09 +00:00
translators
791eaedb64 Update: Translations from eints 
tamil: 13 changes by aswn
 2020-01-26 19:45:44 +01:00
translators
f88ac83408 Update: Translations from eints 
indonesian: 1 change by fanioz
 2020-01-24 19:45:40 +01:00
Jonathan G Rennison
dd99fd646d Merge branch 'master' into jgrpp 
# Conflicts:
#	src/base_station_base.h
#	src/industry.h
#	src/industry_cmd.cpp
#	src/industry_gui.cpp
#	src/lang/korean.txt
#	src/os/macosx/crashlog_osx.cpp
#	src/station_cmd.cpp
#	src/town.h
#	src/town_cmd.cpp
#	src/town_gui.cpp
 2020-01-20 18:36:55 +00:00
Jonathan G Rennison
09b13dd484 Add conditional orders for cargo load percentage and waiting cargo amount 
See: #90
 2020-01-18 20:32:42 +00:00
Jonathan G Rennison
ee6d808578 TBTR: Template replacements now also apply to child groups 2020-01-16 21:47:29 +00:00
translators
4366f8e46a Update: Translations from eints 
finnish: 8 changes by ln
italian: 25 changes by AlphaJack
 2020-01-14 19:45:39 +01:00
translators
5a4b27d73a Update: Translations from eints 
finnish: 54 changes by ln
 2020-01-13 19:45:41 +01:00
translators
f2d230d91c Update: Translations from eints 
russian: 14 changes by Lone_Wolf
 2020-01-12 19:45:41 +01:00
translators
b144258bf0 Update: Translations from eints 
finnish: 19 changes by ln
dutch: 17 changes by JanWillem
danish: 109 changes by nielsmh
spanish (mexican): 1 change by Absay
korean: 1 change by telk5093
 2020-01-11 19:45:38 +01:00
Jonathan G Rennison
c50ee4efec Merge branch 'master' into jgrpp 
# Conflicts:
#	src/linkgraph/mcf.cpp
 2020-01-10 18:46:20 +00:00
translators
34b7cb6c03 Update: Translations from eints 
finnish: 3 changes by ln
spanish (mexican): 7 changes by Absay
 2020-01-10 19:45:40 +01:00
Jonathan G Rennison
278ddc1f58 Fix missing string code from vehicle list mass action button setting text 2020-01-08 20:37:26 +00:00
translators
190e074287 Update: Translations from eints 
russian: 2 changes by Lone_Wolf
 2020-01-08 19:45:41 +01:00
Jonathan G Rennison
4adfe0c9ae Merge branch 'master' into jgrpp 
# Conflicts:
#	src/industry_gui.cpp
#	src/lang/korean.txt
#	src/town.h
#	src/town_gui.cpp
 2020-01-08 18:40:34 +00:00
translators
5a31efd98d Update: Translations from eints 
finnish: 1 change by hpiirai
 2020-01-07 19:45:39 +01:00
Niels Martin Hansen
7413d65c2a Cleanup: Unused music GUI strings 2020-01-07 18:13:58 +01:00
stormcone
eb07e174f1 Fix #7908, b524f1a: "Show the NewGRF name in the build vehicle window" is missing the "On/Off" display. 2020-01-06 19:22:42 +00:00
translators
1812b0cf49 Update: Translations from eints 
finnish: 4 changes by hpiirai
english (us): 20 changes by Supercheese
french: 7 changes by glx
korean: 7 changes by telk5093
 2020-01-06 19:45:41 +01:00
Jonathan G Rennison
7960db35f2 Merge branch 'master' into jgrpp 
# Conflicts:
#	config.lib
#	projects/openttd_vs140.vcxproj
#	projects/openttd_vs140.vcxproj.filters
#	projects/openttd_vs141.vcxproj
#	projects/openttd_vs141.vcxproj.filters
#	projects/openttd_vs142.vcxproj
#	projects/openttd_vs142.vcxproj.filters
#	src/aircraft_cmd.cpp
#	src/base_station_base.h
#	src/core/pool_type.hpp
#	src/disaster_vehicle.cpp
#	src/economy.cpp
#	src/engine.cpp
#	src/group.h
#	src/group_cmd.cpp
#	src/group_gui.cpp
#	src/lang/english.txt
#	src/lang/german.txt
#	src/linkgraph/linkgraph_gui.cpp
#	src/network/network_command.cpp
#	src/network/network_server.cpp
#	src/openttd.cpp
#	src/order_cmd.cpp
#	src/road_cmd.cpp
#	src/saveload/afterload.cpp
#	src/saveload/cargopacket_sl.cpp
#	src/saveload/linkgraph_sl.cpp
#	src/saveload/order_sl.cpp
#	src/saveload/station_sl.cpp
#	src/saveload/town_sl.cpp
#	src/saveload/vehicle_sl.cpp
#	src/screenshot.cpp
#	src/screenshot.h
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/smallmap_gui.cpp
#	src/station.cpp
#	src/station_cmd.cpp
#	src/table/settings.ini
#	src/toolbar_gui.cpp
#	src/town_cmd.cpp
#	src/train.h
#	src/train_cmd.cpp
#	src/train_gui.cpp
#	src/vehicle.cpp
#	src/vehicle_base.h
#	src/vehiclelist.cpp
#	src/window_type.h
 2020-01-06 18:45:51 +00:00
stormcone
70f9c3c655 Feature: Industry directory cargo filtering 2020-01-05 20:52:17 +00:00
translators
12f4602f57 Update: Translations from eints 
finnish: 3 changes by hpiirai
 2020-01-05 19:45:40 +01:00
translators
7be9c28037 Update: Translations from eints 
korean: 2 changes by telk5093
 2020-01-04 19:45:39 +01:00
stormcone
b524f1ae21 Feature: Show the name of the NewGRF in the build vehicle window. 2020-01-04 18:42:35 +01:00
TELK
e04ca904a9 Feature: Minimap screenshot 2020-01-04 18:21:38 +01:00
translators
e7922cd078 Update: Translations from eints 
spanish (mexican): 18 changes by Absay
 2020-01-03 19:45:40 +01:00
translators
9e4533dc8f Update: Translations from eints 
luxembourgish: 131 changes by Phreeze
french: 6 changes by arikover
spanish (mexican): 20 changes by Absay
 2020-01-02 19:45:39 +01:00
translators
3a557b0336 Update: Translations from eints 
finnish: 11 changes by hpiirai
korean: 6 changes by telk5093
 2020-01-01 19:45:41 +01:00
pnda
e558aa8ff4 Feature: Screenshot window 2020-01-01 10:19:12 +00:00
translators
f6ce5c4563 Update: Translations from eints 
french: 4 changes by arikover
korean: 5 changes by telk5093
 2019-12-30 19:45:44 +01:00
translators
e18f1703d2 Update: Translations from eints 
spanish (mexican): 1 change by Absay
russian: 4 changes by Lone_Wolf
 2019-12-28 19:45:41 +01:00
Niels Martin Hansen
2fd871e2af Feature: Configurable game ending year 
Functionally reverts 683b65ee1
 2019-12-28 12:27:39 +01:00
translators
a6901f8ae8 Update: Translations from eints 
russian: 1 change by Lone_Wolf
 2019-12-26 19:45:41 +01:00
translators
16537b472c Update: Translations from eints 
dutch: 1 change by JanWillem
 2019-12-25 19:45:40 +01:00
translators
d427559eba Update: Translations from eints 
french: 1 change by arikover
 2019-12-24 19:45:40 +01:00