dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
52,329 Commits 1 Branch 0 Tags
58d8418f8399ce6fdd6ebd6ed683cdc39010251d
Commit Graph

9015 Commits

Author SHA1 Message Date
Jonathan G Rennison
58d8418f83 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/lang/arabic_egypt.txt
 2021-11-10 01:05:30 +00:00
translators
236f71640c Update: Translations from eints 
english (us): 2 changes by 2TallTyler
arabic (egypt): 49 changes by AviationGamerX
korean: 17 changes by telk5093
catalan: 2 changes by J0anJosep
danish: 4 changes by nielsmh
french: 2 changes by glx22
portuguese: 2 changes by azulcosta
 2021-11-09 18:50:34 +00:00
translators
0ad40ee868 Update: Translations from eints 
arabic (egypt): 35 changes by AviationGamerX
 2021-11-08 18:50:01 +00:00
Jonathan G Rennison
3d4261a33a Merge branch 'master' into jgrpp 
# Conflicts:
#	src/order_cmd.cpp
#	src/table/settings/news_display_settings.ini
 2021-11-08 00:44:18 +00:00
Guillaume Renoult
c38af72978 Update: add setting to hide news about competitors vehicle crash (#9653) 2021-11-07 19:54:50 +01:00
translators
73001ae1a9 Update: Translations from eints 
english (au): 3 changes by LordAro
 2021-11-06 18:47:14 +00:00
Jonathan G Rennison
9e946d4c5d Merge branch 'master' into jgrpp-beta 
# Conflicts:
#	src/command.cpp
#	src/console_cmds.cpp
#	src/group_gui.cpp
#	src/lang/catalan.txt
#	src/lang/czech.txt
#	src/lang/danish.txt
#	src/lang/greek.txt
#	src/lang/hungarian.txt
#	src/lang/irish.txt
#	src/lang/japanese.txt
#	src/lang/luxembourgish.txt
#	src/lang/norwegian_bokmal.txt
#	src/lang/romanian.txt
#	src/lang/russian.txt
#	src/lang/serbian.txt
#	src/lang/simplified_chinese.txt
#	src/lang/slovak.txt
#	src/lang/spanish_MX.txt
#	src/lang/swedish.txt
#	src/lang/tamil.txt
#	src/lang/traditional_chinese.txt
#	src/lang/turkish.txt
#	src/lang/ukrainian.txt
#	src/lang/vietnamese.txt
#	src/network/network.cpp
#	src/network/network_client.cpp
#	src/network/network_func.h
#	src/network/network_internal.h
#	src/network/network_server.cpp
#	src/network/network_server.h
#	src/saveload/afterload.cpp
#	src/saveload/newgrf_sl.cpp
#	src/saveload/saveload.h
#	src/script/script_instance.cpp
#	src/toolbar_gui.cpp
#	src/toolbar_gui.h
#	src/vehicle_gui.cpp
#	src/widgets/rail_widget.h
#	src/widgets/vehicle_widget.h
#	src/window.cpp
 2021-11-03 00:45:12 +00:00
Jonathan G Rennison
3ef1a0943b Merge branch 'master' into jgrpp-beta 
# Conflicts:
#	src/lang/chuvash.txt
#	src/lang/czech.txt
#	src/lang/english_AU.txt
#	src/lang/english_US.txt
#	src/lang/german.txt
#	src/lang/japanese.txt
#	src/lang/korean.txt
#	src/lang/latvian.txt
#	src/lang/russian.txt
#	src/tree_gui.cpp
#	src/vehicle.cpp
 2021-11-02 21:11:11 +00:00
Jonathan G Rennison
324e90e5ac Merge branch 'master' into jgrpp-beta 
# Conflicts:
#	src/lang/arabic_egypt.txt
#	src/lang/english.txt
#	src/lang/greek.txt
#	src/network/core/tcp_connect.cpp
#	src/network/network_client.cpp
#	src/network/network_client.h
#	src/pathfinder/npf/npf.cpp
#	src/pathfinder/yapf/yapf_ship.cpp
#	src/rail_gui.cpp
#	src/settings_table.cpp
#	src/settings_type.h
#	src/station_cmd.cpp
#	src/table/settings/gui_settings.ini
#	src/town_cmd.cpp
#	src/widgets/rail_widget.h
 2021-11-02 19:23:24 +00:00
translators
9edb75ec0b Update: Translations from eints 
arabic (egypt): 7 changes by AviationGamerX
 2021-11-02 18:49:30 +00:00
Jonathan G Rennison
9e1bb3eea7 Merge tag '12.0-beta2' into jgrpp-beta 
# Conflicts:
#	docs/landscape_grid.html
#	src/lang/simplified_chinese.txt
#	src/network/network_server.cpp
#	src/station_cmd.cpp
 2021-11-02 18:02:37 +00:00
Jonathan G Rennison
faf32200cf Merge tag '12.0-beta1' into jgrpp-beta 
# Conflicts:
#	CMakeLists.txt
#	bin/ai/CMakeLists.txt
#	bin/game/CMakeLists.txt
#	src/build_vehicle_gui.cpp
#	src/console_cmds.cpp
#	src/core/overflowsafe_type.hpp
#	src/fios.cpp
#	src/lang/english.txt
#	src/lang/german.txt
#	src/lang/korean.txt
#	src/lang/polish.txt
#	src/network/core/game_info.cpp
#	src/network/core/game_info.h
#	src/network/core/tcp_game.cpp
#	src/network/core/tcp_game.h
#	src/network/network.cpp
#	src/network/network_client.cpp
#	src/network/network_client.h
#	src/network/network_coordinator.cpp
#	src/network/network_gui.cpp
#	src/network/network_server.cpp
#	src/network/network_server.h
#	src/newgrf_engine.cpp
#	src/openttd.cpp
#	src/rev.cpp.in
#	src/settings_type.h
#	src/train.h
#	src/train_cmd.cpp
 2021-11-02 17:51:38 +00:00
Jonathan G Rennison
f764fcfb1f Merge branch 'master' into jgrpp-beta 
# Conflicts:
#	src/console_cmds.cpp
#	src/debug.cpp
#	src/lang/vietnamese.txt
#	src/network/core/address.cpp
#	src/network/core/address.h
#	src/network/core/config.h
#	src/network/core/os_abstraction.cpp
#	src/network/core/os_abstraction.h
#	src/network/core/tcp_listen.h
#	src/network/core/udp.cpp
#	src/network/core/udp.h
#	src/network/network.cpp
#	src/network/network_client.cpp
#	src/network/network_gamelist.cpp
#	src/network/network_server.cpp
#	src/network/network_udp.cpp
#	src/newgrf.cpp
#	src/openttd.cpp
#	src/saveload/saveload.h
#	src/settings.cpp
#	src/settings_table.cpp
#	src/settings_type.h
#	src/table/settings/network_settings.ini
 2021-11-02 00:51:54 +00:00
Jonathan G Rennison
f54d69a60a Merge branch 'master' into jgrpp-beta 
# Conflicts:
#	src/economy.cpp
#	src/elrail.cpp
#	src/graph_gui.cpp
#	src/linkgraph/linkgraph_gui.cpp
#	src/network/core/game_info.cpp
#	src/newgrf_station.cpp
#	src/saveload/saveload.cpp
#	src/settings.cpp
#	src/station_cmd.cpp
#	src/station_gui.cpp
#	src/strings_func.h
#	src/table/settings/network_settings.ini
#	src/table/settings/settings.ini
 2021-11-01 21:18:24 +00:00
Jonathan G Rennison
62afd94b47 Merge branch 'master' into jgrpp-beta 
# Conflicts:
#	src/company_cmd.cpp
#	src/economy.cpp
#	src/lang/swedish.txt
#	src/network/network_command.cpp
#	src/news_gui.cpp
#	src/saveload/saveload.h
#	src/script/api/script_list.cpp
#	src/video/cocoa/cocoa_v.mm
#	src/video/sdl2_v.cpp
 2021-11-01 18:54:43 +00:00
translators
00a6287f97 Update: Translations from eints 
arabic (egypt): 2 changes by AviationGamerX
 2021-11-01 18:49:20 +00:00
Jonathan G Rennison
61cc60099a Merge branch 'jgrpp' into jgrpp-beta 
# Conflicts:
#	src/network/core/packet.cpp
#	src/network/core/udp.cpp
 2021-10-29 22:22:54 +01:00
translators
ccf70fc4b3 Update: Translations from eints 
dutch: 2 changes by Afoklala
 2021-10-29 18:49:23 +00:00
TELK
afe7824270 Update: Korean translation up to aff6dbec2d 2021-10-29 19:16:09 +09:00
TELK
ed1c0c70ea Update: Korean translation up to 9254be5 2021-10-29 19:16:09 +09:00
TELK
7b12d23e4f Update: Korean translation 2021-10-29 19:16:09 +09:00
Jonathan G Rennison
da282c3ecc Merge branch 'master' into jgrpp-beta 
# Conflicts:
#	.github/workflows/ci-build.yml
#	CMakeLists.txt
#	src/lang/finnish.txt
#	src/lang/french.txt
#	src/lang/korean.txt
#	src/lang/norwegian_bokmal.txt
#	src/lang/russian.txt
#	src/lang/spanish.txt
#	src/misc_gui.cpp
#	src/newgrf.cpp
 2021-10-28 23:51:24 +01:00
translators
edf7b02ddb Update: Translations from eints 
german: 2 changes by Wuzzy2
 2021-10-28 18:48:40 +00:00
Jonathan G Rennison
81290df946 Merge branch 'master' into jgrpp-beta 
# Conflicts:
#	src/lang/spanish.txt
#	src/network/core/tcp_content_type.h
#	src/network/network_content.cpp
#	src/saveload/cheat_sl.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
#	src/saveload/station_sl.cpp
#	src/saveload/vehicle_sl.cpp
#	src/settings.cpp
#	src/settings_internal.h
#	src/table/settings.h.preamble
#	src/table/settings/company_settings.ini
#	src/table/settings/currency_settings.ini
#	src/table/settings/gameopt_settings.ini
#	src/table/settings/misc_settings.ini
#	src/table/settings/settings.ini
#	src/table/settings/win32_settings.ini
#	src/table/settings/window_settings.ini
 2021-10-28 01:07:51 +01:00
translators
488cf26406 Update: Translations from eints 
swedish: 44 changes by joeax910
japanese: 1 change by clzls
chinese (simplified): 2 changes by clzls
 2021-10-27 18:50:25 +00:00
Jonathan G Rennison
53139c2405 Add current day/month to tracerestrict and conditional order conditionals 2021-10-26 23:39:40 +01:00
translators
4487ad1a5e Update: Translations from eints 
korean: 1 change by telk5093
polish: 2 changes by pAter-exe
 2021-10-25 18:49:13 +00:00
Jonathan G Rennison
ffef1c9e44 Merge branch 'master' into jgrpp-beta 
# Conflicts:
#	src/saveload/cargopacket_sl.cpp
#	src/saveload/cheat_sl.cpp
#	src/saveload/company_sl.cpp
#	src/saveload/engine_sl.cpp
#	src/saveload/map_sl.cpp
#	src/saveload/order_sl.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
#	src/saveload/station_sl.cpp
#	src/saveload/vehicle_sl.cpp
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/settings_internal.h
#	src/stdafx.h
#	src/table/settings/settings.ini
#	src/town_cmd.cpp
#	src/vehicle.cpp
 2021-10-25 18:10:15 +01:00
Jonathan G Rennison
944f090b46 Add settings for minimum contiguous landmass size for town/city placement 2021-10-25 00:30:25 +01:00
translators
a0831cec39 Update: Translations from eints 
swedish: 1 change by joeax910
 2021-10-24 18:46:47 +00:00
translators
279fe11b03 Update: Translations from eints 
indonesian: 2 changes by hadyatmo
 2021-10-23 18:47:57 +00:00
translators
bf0210229c Update: Translations from eints 
english (us): 2 changes by 2TallTyler
vietnamese: 2 changes by KhoiCanDev
catalan: 2 changes by J0anJosep
portuguese (brazilian): 2 changes by Vimerum
 2021-10-22 18:53:01 +00:00
translators
ae340f415e Update: Translations from eints 
russian: 2 changes by Ln-Wolf
 2021-10-21 18:47:48 +00:00
translators
b043d58b92 Update: Translations from eints 
swedish: 4 changes by joeax910
spanish: 1 change by MontyMontana
 2021-10-20 18:49:34 +00:00
translators
e68a51eced Update: Translations from eints 
korean: 3 changes by telk5093
french: 2 changes by glx22
portuguese: 2 changes by azulcosta
 2021-10-19 18:47:37 +00:00
translators
6289b4dd81 Update: Translations from eints 
greek: 2 changes by dionisis84
russian: 1 change by Ln-Wolf
finnish: 2 changes by hpiirai
tamil: 88 changes by Aswn
 2021-10-18 18:48:12 +00:00
Jonathan G Rennison
544da99102 Merge branch 'master' into jgrpp-beta 
# Conflicts:
#	src/cargopacket.h
#	src/lang/korean.txt
#	src/linkgraph/linkgraph.h
#	src/linkgraph/linkgraphjob.h
#	src/linkgraph/linkgraphschedule.h
#	src/network/network_admin.h
#	src/network/network_func.h
#	src/network/network_server.cpp
#	src/network/network_server.h
#	src/order_base.h
#	src/rail_cmd.cpp
#	src/saveload/company_sl.cpp
#	src/saveload/depot_sl.cpp
#	src/saveload/economy_sl.cpp
#	src/saveload/linkgraph_sl.cpp
#	src/saveload/map_sl.cpp
#	src/saveload/newgrf_sl.cpp
#	src/saveload/order_sl.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
#	src/saveload/signs_sl.cpp
#	src/saveload/station_sl.cpp
#	src/saveload/subsidy_sl.cpp
#	src/saveload/town_sl.cpp
#	src/saveload/vehicle_sl.cpp
#	src/script/api/script_object.cpp
#	src/settings.cpp
#	src/string.cpp
#	src/string_func.h
#	src/table/CMakeLists.txt
#	src/table/settings/settings.ini
#	src/viewport_sprite_sorter_sse4.cpp
 2021-10-18 18:01:27 +01:00
Charles Pigott
53e17d07d2 Fix #9595: Always use plural forms of cargo for subsidy strings (#9619) 2021-10-18 09:43:14 +01:00
Jonathan G Rennison
406b81abb1 Merge branch 'master' into jgrpp-beta 
# Conflicts:
#	src/economy.cpp
#	src/lang/traditional_chinese.txt
#	src/order_gui.cpp
#	src/settings.cpp
#	src/settings_internal.h
#	src/table/company_settings.ini
#	src/table/currency_settings.ini
#	src/table/gameopt_settings.ini
#	src/table/misc_settings.ini
#	src/table/settings.h.preamble
#	src/table/settings.ini
#	src/table/win32_settings.ini
#	src/table/window_settings.ini
 2021-10-18 00:43:50 +01:00
Charles Pigott
0853c1979b Feature: Button to toggle showing advanced signal types (#9617) 2021-10-17 19:24:50 +01:00
Charles Pigott
3b7daca832 Change: Don't use 'server address' string in server list when displaying an invite code (#9615) 2021-10-17 18:14:25 +01:00
translators
d66dea5d83 Update: Translations from eints 
indonesian: 9 changes by bsuseno
 2021-10-15 18:47:17 +00:00
translators
4b96244b4d Update: Translations from eints 
romanian: 6 changes by kneekoo
 2021-10-12 18:47:28 +00:00
translators
d0092925c9 Update: Translations from eints 
romanian: 9 changes by kneekoo
 2021-10-11 18:48:06 +00:00
translators
7d831be3ab Update: Translations from eints 
indonesian: 6 changes by bsuseno
 2021-10-10 18:46:33 +00:00
translators
eaeab34e7a Update: Translations from eints 
norwegian (bokmal): 10 changes by Anolitt
korean: 9 changes by telk5093
russian: 9 changes by Ln-Wolf
finnish: 10 changes by hpiirai
spanish: 8 changes by MontyMontana
french: 9 changes by glx22

(cherry picked from commit 8dd846bad4)
 2021-10-08 18:19:31 +01:00
translators
33a55c5fd4 Update: Translations from eints 
hindi: 67 changes by ritwikraghav14

(cherry picked from commit c562b4c527)
 2021-10-08 18:19:25 +01:00
translators
9831644112 Update: Translations from eints 
spanish (mexican): 2 changes by absay

(cherry picked from commit 37b285ad83)
 2021-10-08 18:18:51 +01:00
translators
7119903c94 Update: Translations from eints 
german: 1 change by Wuzzy2
spanish: 1 change by ilyabakhlin

(cherry picked from commit 12de256b72)
 2021-10-08 18:18:44 +01:00
translators
de83640d77 Update: Translations from eints 
english (us): 1 change by 2TallTyler
catalan: 5 changes by J0anJosep

(cherry picked from commit d835a42c05)
 2021-10-08 18:18:35 +01:00