Commit Graph

8224 Commits (babe98cdb1d56e0d51f29c2820c5e036ea0f3166)

Author SHA1 Message Date
Jonathan G Rennison babe98cdb1 Merge branch 'master' into jgrpp
# Conflicts:
#	src/network/network_server.h
#	src/pathfinder/yapf/yapf_road.cpp
#	src/viewport.cpp
4 years ago
translators a499e9acdd Update: Translations from eints
russian: 2 changes by Lone_Wolf
4 years ago
translators 58c8ff456e Update: Translations from eints
korean: 2 changes by telk5093
4 years ago
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.
4 years ago
translators ac7cc18ab9 Update: Translations from eints
czech: 22 changes by djst
4 years ago
translators be9ca4689e Update: Translations from eints
korean: 4 changes by telk5093
4 years ago
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
4 years ago
Jonathan G Rennison ab1b8ab209 Scheduled dispatch: Add schedule end time to info line 4 years ago
Jonathan G Rennison 9917a1daef Scheduled dispatch: Add hints about dispatch order to timetable window
Adjust condition for dispatch order
4 years ago
translators 791eaedb64 Update: Translations from eints
tamil: 13 changes by aswn
4 years ago
translators f88ac83408 Update: Translations from eints
indonesian: 1 change by fanioz
4 years ago
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
5 years ago
Jonathan G Rennison 09b13dd484 Add conditional orders for cargo load percentage and waiting cargo amount
See: #90
5 years ago
Jonathan G Rennison ee6d808578 TBTR: Template replacements now also apply to child groups 5 years ago
translators 4366f8e46a Update: Translations from eints
finnish: 8 changes by ln
italian: 25 changes by AlphaJack
5 years ago
translators 5a4b27d73a Update: Translations from eints
finnish: 54 changes by ln
5 years ago
translators f2d230d91c Update: Translations from eints
russian: 14 changes by Lone_Wolf
5 years ago
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
5 years ago
Jonathan G Rennison c50ee4efec Merge branch 'master' into jgrpp
# Conflicts:
#	src/linkgraph/mcf.cpp
5 years ago
translators 34b7cb6c03 Update: Translations from eints
finnish: 3 changes by ln
spanish (mexican): 7 changes by Absay
5 years ago
Jonathan G Rennison 278ddc1f58 Fix missing string code from vehicle list mass action button setting text 5 years ago
translators 190e074287 Update: Translations from eints
russian: 2 changes by Lone_Wolf
5 years ago
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
5 years ago
translators 5a31efd98d Update: Translations from eints
finnish: 1 change by hpiirai
5 years ago
Niels Martin Hansen 7413d65c2a Cleanup: Unused music GUI strings 5 years ago
stormcone eb07e174f1 Fix #7908, b524f1a: "Show the NewGRF name in the build vehicle window" is missing the "On/Off" display. 5 years ago
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
5 years ago
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
5 years ago
stormcone 70f9c3c655 Feature: Industry directory cargo filtering 5 years ago
translators 12f4602f57 Update: Translations from eints
finnish: 3 changes by hpiirai
5 years ago
translators 7be9c28037 Update: Translations from eints
korean: 2 changes by telk5093
5 years ago
stormcone b524f1ae21 Feature: Show the name of the NewGRF in the build vehicle window. 5 years ago
TELK e04ca904a9 Feature: Minimap screenshot 5 years ago
translators e7922cd078 Update: Translations from eints
spanish (mexican): 18 changes by Absay
5 years ago
translators 9e4533dc8f Update: Translations from eints
luxembourgish: 131 changes by Phreeze
french: 6 changes by arikover
spanish (mexican): 20 changes by Absay
5 years ago
translators 3a557b0336 Update: Translations from eints
finnish: 11 changes by hpiirai
korean: 6 changes by telk5093
5 years ago
pnda e558aa8ff4 Feature: Screenshot window 5 years ago
translators f6ce5c4563 Update: Translations from eints
french: 4 changes by arikover
korean: 5 changes by telk5093
5 years ago
translators e18f1703d2 Update: Translations from eints
spanish (mexican): 1 change by Absay
russian: 4 changes by Lone_Wolf
5 years ago
Niels Martin Hansen 2fd871e2af Feature: Configurable game ending year
Functionally reverts 683b65ee1
5 years ago
translators a6901f8ae8 Update: Translations from eints
russian: 1 change by Lone_Wolf
5 years ago
translators 16537b472c Update: Translations from eints
dutch: 1 change by JanWillem
5 years ago
translators d427559eba Update: Translations from eints
french: 1 change by arikover
5 years ago
translators dbe44e80f1 Update: Translations from eints 5 years ago
stormcone 798e9ee93e Feature: Add a button to the vehicle advisory news window to open the group window. 5 years ago
translators b0d443d525 Update: Translations from eints
korean: 1 change by telk5093
5 years ago
translators 379402f02e Update: Translations from eints
croatian: 9 changes by VoyagerOne
5 years ago
translators e54184d18b Update: Translations from eints
portuguese: 16 changes by mcbanhas
5 years ago
translators 94cc0edb70 Update: Translations from eints
portuguese: 225 changes by mcbanhas
5 years ago
translators df2a19ec87 Update: Translations from eints
german: 9 changes by planetmaker
portuguese: 19 changes by mcbanhas
5 years ago