Commit Graph

9305 Commits (38571cf0daea6f9e4ec56f489df0c9a282ef94f4)

Author SHA1 Message Date
translators 8d51156150 Update: Translations from eints
spanish (mexican): 20 changes by absay
italian: 7 changes by Rivarossi
2 years ago
translators 867f6a5964 Update: Translations from eints
spanish (mexican): 9 changes by absay
polish: 3 changes by pAter-exe
2 years ago
translators 9c58ea7a37 Update: Translations from eints
swedish: 2 changes by joeax910
spanish (mexican): 62 changes by absay
korean: 25 changes by telk5093
polish: 72 changes by pAter-exe
2 years ago
translators 5e5f864990 Update: Translations from eints
english (us): 1 change by 2TallTyler
italian: 1 change by Rivarossi
2 years ago
translators c6e4fa7df1 Update: Translations from eints
italian: 11 changes by Rivarossi
dutch: 24 changes by Afoklala
2 years ago
translators 142321da79 Update: Translations from eints
spanish (mexican): 1 change by absay
russian: 4 changes by Ln-Wolf
catalan: 20 changes by J0anJosep
french: 1 change by glx22
portuguese: 1 change by azulcosta
2 years ago
Jonathan G Rennison 1714773457 Adjust baseline for arctic snowline dynamic width setting to lower value 2 years ago
translators 1ed212775c Update: Translations from eints
galician: 27 changes by pvillaverde
2 years ago
Niels Martin Hansen 345dcd3c7b Add: Show current video driver info in Options window 2 years ago
translators be72f1e54b Update: Translations from eints
spanish (mexican): 18 changes by absay
italian: 30 changes by Rivarossi
russian: 17 changes by Ln-Wolf
portuguese: 25 changes by azulcosta
2 years ago
translators b8565d8cac Update: Translations from eints
spanish (mexican): 10 changes by absay
english (us): 23 changes by 2TallTyler
russian: 22 changes by Ln-Wolf
french: 24 changes by glx22
2 years ago
translators e5c1865e76 Update: Translations from eints
swedish: 5 changes by joeax910
spanish (mexican): 3 changes by absay
korean: 3 changes by telk5093
italian: 56 changes by Rivarossi
german: 3 changes by danidoedel
romanian: 1 change by ALEX11BR
ukrainian: 8 changes by StepanIvasyn
2 years ago
Jonathan G Rennison 452d22ce37 Add setting for width of dynamic snowline range for arctic tree placement
Default: 75%
2 years ago
Jonathan G Rennison c4e2175cc9 Merge branch 'master' into jgrpp 2 years ago
Tyler Trahan 41de69c5b7 Feature: Improved Finance window 2 years ago
Tyler Trahan e79724ea22
Feature: Alternative linkgraph colour schemes (#9866) 2 years ago
translators ed0b0b80d3 Update: Translations from eints
spanish (mexican): 84 changes by absay
italian: 16 changes by Rivarossi
2 years ago
translators 4e09dbc86e Update: Translations from eints
spanish (mexican): 137 changes by absay
italian: 10 changes by Rivarossi
2 years ago
translators cc4186410b Update: Translations from eints
spanish (mexican): 8 changes by absay
italian: 13 changes by Rivarossi
2 years ago
translators 869b645708 Update: Translations from eints
italian: 33 changes by Rivarossi
polish: 5 changes by pAter-exe
2 years ago
translators 6c161ad18a Update: Translations from eints
italian: 2 changes by Rivarossi
2 years ago
translators 6cb668955e Update: Translations from eints
italian: 7 changes by Rivarossi
2 years ago
translators 585e49a597 Update: Translations from eints
italian: 2 changes by Rivarossi
2 years ago
translators 98bdf01967 Update: Translations from eints
italian: 5 changes by Rivarossi
romanian: 7 changes by alexban011
2 years ago
TELK 483e2f6a74 Update: Korean translation up to 2bfa53f 2 years ago
translators a24ba6c264 Update: Translations from eints
italian: 2 changes by Rivarossi
2 years ago
Jonathan G Rennison 7ccbc6f296 Use separate tool-tip string for building rivers in game
See: #378
2 years ago
translators 3cf0e95f6e Update: Translations from eints
italian: 1 change by Rivarossi
2 years ago
translators 7c40967c1f Update: Translations from eints
polish: 14 changes by pAter-exe
2 years ago
translators 385c2f1381 Update: Translations from eints
polish: 4 changes by pAter-exe
2 years ago
translators 49b8eac2dc Update: Translations from eints
chinese (simplified): 3 changes by HansKaffee
italian: 30 changes by Rivarossi
polish: 14 changes by pAter-exe
2 years ago
translators 1ae34ca62d Update: Translations from eints
catalan: 4 changes by J0anJosep
dutch: 5 changes by Afoklala
polish: 43 changes by pAter-exe
2 years ago
translators bd6531d0d0 Update: Translations from eints
vietnamese: 4 changes by KhoiCanDev
2 years ago
translators 5dd9400fe2 Update: Translations from eints
english (us): 4 changes by 2TallTyler
2 years ago
translators ee105257ff Update: Translations from eints
russian: 4 changes by Ln-Wolf
french: 4 changes by glx22
2 years ago
translators a6ada35259 Update: Translations from eints
portuguese: 4 changes by azulcosta
2 years ago
translators c36fc98137 Update: Translations from eints 2 years ago
Tyler Trahan 1c580d1612 Change: Improve "local authority rating" setting name and helptext 2 years ago
Tyler Trahan f92cf38ab5 Feature: Allow disabling local authority control of company actions 2 years ago
Jonathan G Rennison d3efa2afe0 Show specific reason why vehicle cannot be ordered to a particular station 2 years ago
Jonathan G Rennison 358e41d471 Merge branch 'pr-375' into jgrpp 2 years ago
pvillaverde 05ef9983f2 [Feat] Updated Galician translations up to v0.47.0 2 years ago
Jonathan G Rennison 92142e5684 Add routing restriction action to make exempt from speed adaptation 2 years ago
Jonathan G Rennison 60a33feac8 Merge branch 'desert-tweaks' into jgrpp 2 years ago
reldred 59022c40f9 adjustments;
added lake tropic width adjustment
added an extra large setting to the coasts (51radius)
set minimum width for rivers and lakes to 2 (setting it to 1 actually CTD'd the game)
made max for rivers and lakes be 51 tiles to match the 51tiles of the coast setting.
2 years ago
reldred 22305e8795 Allows configuring the width of the coast in tropic maps that generates as tropiczone_normal before the desert kicks in, it does this by creating two additional arrays which house the coordinates to create a filled circle of radius of 19 tiles, and 25 tiles. the default creates a radius of 13 tiles.
I'd eventually like to add an Extra Large setting but manually creating the array of coordinates is horrible.

I wedged this setting in beside the setting for tropic width around rivers despite it not fitting into the rivers/lakes category because it still feels the most relevant place for now.
2 years ago
Jonathan G Rennison e5a421b65a Merge branch 'master' into jgrpp
# Conflicts:
#	src/economy.cpp
#	src/linkgraph/refresh.cpp
#	src/order_cmd.cpp
#	src/saveload/vehicle_sl.cpp
#	src/station.cpp
#	src/station_base.h
#	src/timetable_cmd.cpp
#	src/timetable_gui.cpp
#	src/vehicle.cpp
#	src/vehicle_base.h
#	src/vehicle_cmd.cpp
2 years ago
translators 0d8fbf647b Update: Translations from eints
latvian: 4 changes by lexuslatvia
2 years ago
translators acaea776eb Update: Translations from eints
finnish: 2 changes by RedJimi
2 years ago
translators 22f6502b14 Update: Translations from eints
chinese (traditional): 3 changes by benny30111
galician: 9 changes by mgtrad, 1 change by NicoSGF64
indonesian: 14 changes by bsuseno
2 years ago
Jonathan G Rennison 2cbbae16da Add roadstop GRF properties to set bridge heights and disallowed pillars 2 years ago
translators 81adc38176 Update: Translations from eints
japanese: 9 changes by Azusa257
2 years ago
translators a83cd9b4f5 Update: Translations from eints
turkish: 1 change by AlphenLLC
2 years ago
Jonathan G Rennison 4fde8d13a7 Merge branch 'master' into jgrpp
# Conflicts:
#	src/console_cmds.cpp
#	src/lang/belarusian.txt
2 years ago
translators 83b6defbfb Update: Translations from eints
korean: 1 change by telk5093
turkish: 5 changes by AlphenLLC
2 years ago
Jonathan G Rennison 1d885c462f Fix incorrect string parameters for dispatch schedule assigned to depot
See: #368
2 years ago
translators 09b71c97aa Update: Translations from eints
belarusian: 35 changes by KorneySan
2 years ago
Jonathan G Rennison fedc0889ac Merge branch 'master' into jgrpp
# Conflicts:
#	src/lang/korean.txt
#	src/lang/thai.txt
2 years ago
translators b59acc7e2c Update: Translations from eints
thai: 122 changes by phetoffux
2 years ago
TELK 1c7263a736 Update: Korean translation up to a7bcb7e 2 years ago
translators 4ad6b1e58d Update: Translations from eints
thai: 8 changes by phetoffux
2 years ago
Jonathan G Rennison 47f219d66d Settings GUI: Label sprite_zoom_min as should be left at default 2 years ago
Jonathan G Rennison e5c99b3601 Settings GUI: Add flag to mark a setting as should be left at default 2 years ago
Jonathan G Rennison 0a7a7ebcf0 Add build vehicle window sort mode: cargo capacity / running cost 2 years ago
translators 30da75941b Update: Translations from eints
swedish: 15 changes by joeax910
slovak: 5 changes by FuryPapaya
thai: 15 changes by phetoffux
2 years ago
Jonathan G Rennison 5a6a2400a5 Merge branch 'pr-364' into jgrpp 2 years ago
TELK 680344719b Fix: Korean translation 2 years ago
translators 61abfc9050 Update: Translations from eints
korean: 2 changes by telk5093
slovak: 14 changes by FuryPapaya
thai: 107 changes by phetoffux
2 years ago
TELK 6d9921ef72 Update: Korean translation up to 0.46-rc1 2 years ago
Jonathan G Rennison f5ef81f5ac Merge branch 'master' into jgrpp
# Conflicts:
#	src/lang/italian.txt
#	src/lang/tamil.txt
2 years ago
Jonathan G Rennison eeef6c485a Initial implementation of NewGRF feature ID mapping 2 years ago
Jonathan G Rennison c69ed1711d Allow road vehicle go to station/waypoint orders to have a direction 2 years ago
Jonathan G Rennison b4fc0b4dc5 Initial implementation of road waypoints 2 years ago
translators 9e47df298f Update: Translations from eints
italian: 61 changes by denialmac
2 years ago
Jonathan G Rennison d81cbc25b8 Add setting to allow hiding viewport labels of inidivudal waypoints 2 years ago
translators f6775a2d55 Update: Translations from eints
irish: 2 changes by temuchie
2 years ago
Jonathan G Rennison 26fb0940c6 Add client setting for whether to sync locale settings with server in multiplayer 2 years ago
TELK f0da66961a Update: Korean translation for conditional orders 2 years ago
Jonathan G Rennison 904ff6757d Add slot support to road vehicles, ships and aircraft 2 years ago
Jonathan G Rennison 0513961b2a Duplicate STR_SMALLMAP_LEGENDA_... veh type strings with format codes removed 2 years ago
translators 5239018878 Update: Translations from eints
tamil: 24 changes by Aswn
2 years ago
translators 15c9191568 Update: Translations from eints
tamil: 19 changes by Aswn
2 years ago
Jonathan G Rennison fe522f193b Show confirmation window before clearing/removing dispatch schedule 2 years ago
Jonathan G Rennison 8754e1c5d0 Show scheduled dispatch marker in yellow in timetable window 2 years ago
translators 8ac3f9a6e1 Update: Translations from eints
vietnamese: 28 changes by chupper100
2 years ago
Jonathan G Rennison 65cb4ccedf Limit number of warnings whon in timetable window 2 years ago
Jonathan G Rennison 4f7f8c5b63 Show which order schedule assigned to in scheduled dispatch window 2 years ago
Jonathan G Rennison ff3473fe6a Add support for multiple scheduled dispatch schedules per order list 2 years ago
Jonathan G Rennison a4ea155d33 Merge PR #357 into jgrpp 2 years ago
Jonathan G Rennison 309f5974e8 Merge PR #353 into jgrpp 2 years ago
Jonathan G Rennison b2c6c3b07a Merge branch 'master' into jgrpp
# Conflicts:
#	media/baseset/CMakeLists.txt
#	src/lang/croatian.txt
2 years ago
translators 93e8d4871d Update: Translations from eints
croatian: 67 changes by srekoslav
2 years ago
Yourself 7823c81597 Add: Through load speed limit setting 2 years ago
translators ad54d08abd Update: Translations from eints
croatian: 6 changes by srekoslav
thai: 2 changes by sanotti
2 years ago
translators 32a4212ef1 Update: Translations from eints
norwegian (bokmal): 2 changes by tmn
2 years ago
TELK fc8ab829f6 Update: Korean translation up to 0.45.0 2 years ago
translators 8032423bf1 Update: Translations from eints
romanian: 18 changes by Gisterecis
2 years ago
Jonathan G Rennison 2f8e63e954 Merge branch 'master' into jgrpp
# Conflicts:
#	src/gfx.cpp
#	src/lang/traditional_chinese.txt
#	src/station_cmd.cpp
2 years ago
Yourself e4fa9f8465 Add: Cargo delivery distribution modes 2 years ago
Jonathan G Rennison 89181ea9fd Add setting to increase cost/distance of aircraft linkgraph links 2 years ago
translators 21f85cac87 Update: Translations from eints
chinese (traditional): 25 changes by Tetrapod1206
italian: 12 changes by federico1564S
2 years ago
translators 3ed7910cfe Update: Translations from eints
portuguese (brazilian): 2 changes by Vimerum
2 years ago
Jonathan G Rennison f65a166308 Add client setting to show all signals using the default sprites 2 years ago
translators a97bce51c2 Update: Translations from eints
czech: 6 changes by vladoschreiner
hungarian: 5 changes by pnpBrumi
3 years ago
translators afb817fe19 Update: Translations from eints
norwegian (bokmal): 4 changes by Anolitt
3 years ago
Jonathan G Rennison 66ce6c5090 Scheduled dispatch: Add clear schedule GUI function
Add management dropdown box to window
3 years ago
translators 0c90326ada Update: Translations from eints
swedish: 1 change by joeax910
chinese (traditional): 160 changes by Tetrapod1206
galician: 21 changes by pvillaverde
irish: 5 changes by temuchie
polish: 2 changes by pAter-exe
3 years ago
Jonathan G Rennison 7953a1f8d1 Allow setting autosave interval to a custom number of real-time minutes 3 years ago
Jonathan G Rennison 583663bca1 Allow setting autosave interval to a custom number of days 3 years ago
geby 1854dc87cc
Fix some statement to make sense. 3 years ago
Jonathan G Rennison 70ca147fa4 Merge PR #341 into jgrpp 3 years ago
pvillaverde ebe0aec89a [Feat] Galician Translation 3 years ago
Jonathan G Rennison 4e25fa199c Add a "default" mode to TT autofill rounding setting, set as default
Use game ticks per minute or day ticks
3 years ago
TELK 6046852310 Update: Korean translation up to 8258289 3 years ago
Jonathan G Rennison cff3000358 Merge branch 'master' into jgrpp
# Conflicts:
#	src/lang/galician.txt
3 years ago
Jonathan G Rennison 0aeafeaf3a Allow adding multiple scheduled dispatch departure slots at once 3 years ago
Jonathan G Rennison 6f38769b73 Rename incorrectly named set time/date window strings 3 years ago
Jonathan G Rennison 10f3641d9f Adjust road vehicle quantum tunneling setting text
See: #338
3 years ago
Jonathan G Rennison 70fdb9091b Merge PR #338 into jgrpp 3 years ago
translators 6953df7b5e Update: Translations from eints
galician: 265 changes by pvillaverde
indonesian: 8 changes by indrabagus
spanish: 7 changes by MontyMontana
3 years ago
Jonathan G Rennison 0794825187 Reduce unnecessary diffs with upstream in lang/english.txt 3 years ago
Jonathan G Rennison 8bc15c10cd Fix station/waypoint vehicle tooltip showing incorrect ctrl-click text
Split ctrl-click text from original tooltip strings

See: #36
3 years ago
Jonathan G Rennison e6fbf797ff Split timetable clear/set speed/wait time tooltip strings
This is to separate the original strings from added suffixes
3 years ago
translators e0a91d7325 Update: Translations from eints
galician: 17 changes by pvillaverde
3 years ago
Jonathan G Rennison b02b154218 Also show hours and minutes for schdispatch duration in minutes mode 3 years ago
Jonathan G Rennison dd5d4c795b Fix entering schdispatch delay/duration when not in minutes mode 3 years ago
Jonathan G Rennison 2308345803 Improve labels of non-text scheduled dispatch date/time entry window 3 years ago
translators ad7bdeb73a Update: Translations from eints
chinese (simplified): 2 changes by kurax
3 years ago
reldred f461f0de08 Introduces a new setting (defaulted off) to allow preventing road vehicles from performing so-called quantum tunelling through other vehicles blocking their path. 3 years ago
translators 793de48e89 Update: Translations from eints
vietnamese: 2 changes by KhoiCanDev
3 years ago
Jonathan G Rennison 0691b25e17 Merge branch 'master' into jgrpp
# Conflicts:
#	src/saveload/afterload.cpp
3 years ago
Jonathan G Rennison 5959e1c0f9 Merge PR #336 into jgrpp 3 years ago
reldred 5a53b4d846 Additional tweaks to allow rivers to spawn in deserts (causing aditional tropic biome to spawn around them). This piggybacks off of the 'allow lakes in deserts' setting, renaming it to cover both. The actual setting name itself internally hasn't changed. 3 years ago
translators f6886754ff Update: Translations from eints
greek: 2 changes by dionisis84
german: 2 changes by danidoedel
3 years ago
reldred 904ff346c2 Initial commit to allow configuring running costs as a fraction (1/1 default thru 1/4) independently for both vehicles stopped in depots (doesn't work for planes, I'm not smart enuff), or vehicles that are stationary. 3 years ago
Jonathan G Rennison b259d04339 Add tunnel/bridge entrance/exit values to entry direction conditional 3 years ago
translators f8efab4653 Update: Translations from eints
japanese: 1 change by akaregi
dutch: 3 changes by Afoklala
3 years ago
Jonathan G Rennison dca7e7bc58 Merge branch 'master' into jgrpp 3 years ago
translators 62795a2e6d Update: Translations from eints
russian: 2 changes by Ln-Wolf
3 years ago
translators 4bcbcbc58f Update: Translations from eints
tamil: 2 changes by Aswn
3 years ago
Jonathan G Rennison 58d8418f83 Merge branch 'master' into jgrpp
# Conflicts:
#	src/lang/arabic_egypt.txt
3 years ago
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
3 years ago
translators 0ad40ee868 Update: Translations from eints
arabic (egypt): 35 changes by AviationGamerX
3 years ago
Jonathan G Rennison 3d4261a33a Merge branch 'master' into jgrpp
# Conflicts:
#	src/order_cmd.cpp
#	src/table/settings/news_display_settings.ini
3 years ago
Guillaume Renoult c38af72978
Update: add setting to hide news about competitors vehicle crash (#9653) 3 years ago
translators 73001ae1a9 Update: Translations from eints
english (au): 3 changes by LordAro
3 years ago
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
3 years ago
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
3 years ago
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
3 years ago
translators 9edb75ec0b Update: Translations from eints
arabic (egypt): 7 changes by AviationGamerX
3 years ago
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
3 years ago
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
3 years ago
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
3 years ago
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
3 years ago
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
3 years ago
translators 00a6287f97 Update: Translations from eints
arabic (egypt): 2 changes by AviationGamerX
3 years ago
Jonathan G Rennison 61cc60099a Merge branch 'jgrpp' into jgrpp-beta
# Conflicts:
#	src/network/core/packet.cpp
#	src/network/core/udp.cpp
3 years ago
translators ccf70fc4b3 Update: Translations from eints
dutch: 2 changes by Afoklala
3 years ago
TELK afe7824270 Update: Korean translation up to aff6dbec2d 3 years ago
TELK ed1c0c70ea Update: Korean translation up to 9254be5 3 years ago
TELK 7b12d23e4f Update: Korean translation 3 years ago
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
3 years ago
translators edf7b02ddb Update: Translations from eints
german: 2 changes by Wuzzy2
3 years ago
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
3 years ago
translators 488cf26406 Update: Translations from eints
swedish: 44 changes by joeax910
japanese: 1 change by clzls
chinese (simplified): 2 changes by clzls
3 years ago
Jonathan G Rennison 53139c2405 Add current day/month to tracerestrict and conditional order conditionals 3 years ago
translators 4487ad1a5e Update: Translations from eints
korean: 1 change by telk5093
polish: 2 changes by pAter-exe
3 years ago
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
3 years ago
Jonathan G Rennison 944f090b46 Add settings for minimum contiguous landmass size for town/city placement 3 years ago
translators a0831cec39 Update: Translations from eints
swedish: 1 change by joeax910
3 years ago
translators 279fe11b03 Update: Translations from eints
indonesian: 2 changes by hadyatmo
3 years ago
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
3 years ago
translators ae340f415e Update: Translations from eints
russian: 2 changes by Ln-Wolf
3 years ago
translators b043d58b92 Update: Translations from eints
swedish: 4 changes by joeax910
spanish: 1 change by MontyMontana
3 years ago
translators e68a51eced Update: Translations from eints
korean: 3 changes by telk5093
french: 2 changes by glx22
portuguese: 2 changes by azulcosta
3 years ago
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
3 years ago
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
3 years ago
Charles Pigott 53e17d07d2
Fix #9595: Always use plural forms of cargo for subsidy strings (#9619) 3 years ago
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
3 years ago
Charles Pigott 0853c1979b
Feature: Button to toggle showing advanced signal types (#9617) 3 years ago
Charles Pigott 3b7daca832
Change: Don't use 'server address' string in server list when displaying an invite code (#9615) 3 years ago
translators d66dea5d83 Update: Translations from eints
indonesian: 9 changes by bsuseno
3 years ago
translators 4b96244b4d Update: Translations from eints
romanian: 6 changes by kneekoo
3 years ago
translators d0092925c9 Update: Translations from eints
romanian: 9 changes by kneekoo
3 years ago
translators 7d831be3ab Update: Translations from eints
indonesian: 6 changes by bsuseno
3 years ago
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)
3 years ago
translators 33a55c5fd4 Update: Translations from eints
hindi: 67 changes by ritwikraghav14

(cherry picked from commit c562b4c527)
3 years ago
translators 9831644112 Update: Translations from eints
spanish (mexican): 2 changes by absay

(cherry picked from commit 37b285ad83)
3 years ago
translators 7119903c94 Update: Translations from eints
german: 1 change by Wuzzy2
spanish: 1 change by ilyabakhlin

(cherry picked from commit 12de256b72)
3 years ago
translators de83640d77 Update: Translations from eints
english (us): 1 change by 2TallTyler
catalan: 5 changes by J0anJosep

(cherry picked from commit d835a42c05)
3 years ago
translators f7ca8bd6ae Update: Translations from eints
spanish (mexican): 1 change by absay
latvian: 2 changes by osprinkis

(cherry picked from commit 3559e55b91)
3 years ago
translators b6e29de951 Update: Translations from eints
korean: 1 change by telk5093
dutch: 1 change by Afoklala
french: 1 change by MalaGaM

(cherry picked from commit ea23a9cdb6)
3 years ago
translators cda901ff04 Update: Translations from eints
korean: 1 change by telk5093

(cherry picked from commit d816ff0361)
3 years ago
translators 7ec6db1808 Update: Translations from eints
swedish: 1 change by joeax910

(cherry picked from commit 48ecc481ee)
3 years ago
translators c26682de02 Update: Translations from eints
japanese: 1 change by scabtert

(cherry picked from commit 956d761e3e)
3 years ago
translators f65ec3b797 Update: Translations from eints
korean: 2 changes by telk5093
russian: 1 change by Ln-Wolf
finnish: 1 change by hpiirai
portuguese: 1 change by azulcosta
portuguese (brazilian): 1 change by Vimerum

(cherry picked from commit 043a544248)
3 years ago
translators b24fba8a94 Update: Translations from eints
norwegian (bokmal): 3 changes by Anolitt
dutch: 3 changes by Afoklala
portuguese (brazilian): 3 changes by Vimerum

(cherry picked from commit ce1c60699a)
3 years ago
translators a702de64c3 Update: Translations from eints
chinese (traditional): 9 changes by benny30111
english (us): 3 changes by 2TallTyler

(cherry picked from commit 7b5c0b4236)
3 years ago
Tyler Trahan fb0549ea59 Feature: Configurable subsidy duration
(cherry picked from commit d09210e1c6)
3 years ago
Jonathan G Rennison 4042480806 Merge branch 'jgrpp' into jgrpp-beta
# Conflicts:
#	src/settings.cpp
#	src/settings_gui.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
3 years ago