Commit Graph

8829 Commits

Author SHA1 Message Date
translators
c26682de02 Update: Translations from eints
japanese: 1 change by scabtert

(cherry picked from commit 956d761e3e)
2021-10-08 18:17:57 +01:00
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)
2021-10-08 18:17:48 +01:00
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)
2021-10-08 18:17:31 +01:00
translators
a702de64c3 Update: Translations from eints
chinese (traditional): 9 changes by benny30111
english (us): 3 changes by 2TallTyler

(cherry picked from commit 7b5c0b4236)
2021-10-08 18:17:21 +01:00
Tyler Trahan
fb0549ea59 Feature: Configurable subsidy duration
(cherry picked from commit d09210e1c6)
2021-10-08 18:13:02 +01:00
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
2021-10-08 18:12:04 +01:00
Jonathan G Rennison
db11c1d927 Add setting description help text for extra asymmetric linkgraph modes
See also: #321
2021-09-29 19:41:59 +01:00
Jonathan G Rennison
fd605e3cf3 Merge branch 'master' into jgrpp-beta
# Conflicts:
#	.github/workflows/commit-checker.yml
#	src/company_cmd.cpp
#	src/console_cmds.cpp
#	src/crashlog.cpp
#	src/lang/english.txt
#	src/lang/german.txt
#	src/lang/indonesian.txt
#	src/lang/japanese.txt
#	src/lang/korean.txt
#	src/lang/swedish.txt
#	src/linkgraph/linkgraphjob.cpp
#	src/linkgraph/mcf.cpp
#	src/network/core/tcp.cpp
#	src/network/core/tcp.h
#	src/network/core/tcp_game.h
#	src/network/core/udp.h
#	src/network/network.cpp
#	src/network/network_admin.cpp
#	src/network/network_admin.h
#	src/network/network_chat_gui.cpp
#	src/network/network_client.cpp
#	src/network/network_client.h
#	src/network/network_func.h
#	src/network/network_internal.h
#	src/network/network_server.cpp
#	src/network/network_server.h
#	src/newgrf.cpp
#	src/newgrf_station.cpp
#	src/order_gui.cpp
#	src/rail_cmd.cpp
#	src/saveload/saveload.cpp
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/settings_internal.h
#	src/settings_type.h
#	src/station_cmd.cpp
#	src/stdafx.h
#	src/table/currency_settings.ini
#	src/table/misc_settings.ini
#	src/table/settings.h.preamble
#	src/table/settings.ini
#	src/terraform_cmd.cpp
#	src/timetable_gui.cpp
#	src/train_cmd.cpp
#	src/tree_cmd.cpp
#	src/water_cmd.cpp
2021-09-27 22:47:23 +01:00
Woelfi Von Wolfhausen
f047690dc9 Fix typo, ii
Typo, a t was missing (Frach-art to Fracht-art)
2021-09-26 18:17:04 +02:00
Woelfi Von Wolfhausen
06b9881a05 Fix typos
Fix some typos regarding formality and noun-is-written-big-rules
2021-09-26 17:57:37 +02:00
Jonathan G Rennison
0b0d154788 Merge branch 'master' into jgrpp-beta
# Conflicts:
#	.github/workflows/ci-build.yml
#	src/lang/german.txt
#	src/lang/romanian.txt
#	src/lang/slovak.txt
#	src/lang/turkish.txt
#	src/network/core/address.cpp
#	src/network/core/tcp.h
#	src/network/core/udp.cpp
#	src/network/network.cpp
#	src/network/network_client.cpp
#	src/network/network_server.cpp
#	src/network/network_server.h
#	src/network/network_udp.cpp
#	src/openttd.cpp
#	src/saveload/newgrf_sl.cpp
#	src/tree_cmd.cpp
#	src/video/video_driver.hpp
#	src/window.cpp
#	src/window_gui.h
2021-09-22 21:50:02 +01:00
Jonathan G Rennison
9ad5e4baf0 Add maximum speed (fully loaded) to train window sort list 2021-09-18 23:51:08 +01:00
Jonathan G Rennison
da1ac73c02 Merge commit 'f1dfa661a1898cde06a38ab4cb230c95912b245b' into jgrpp-beta
# Conflicts:
#	src/lang/estonian.txt
#	src/lang/hungarian.txt
#	src/network/core/game_info.cpp
#	src/network/core/game_info.h
#	src/network/core/packet.h
#	src/network/network.cpp
#	src/network/network_client.cpp
#	src/network/network_server.cpp
#	src/network/network_udp.cpp
#	src/openttd.cpp
#	src/string_func.h
2021-09-18 22:10:04 +01:00
Jonathan G Rennison
2bd535e834 Merge branch 'master' into jgrpp-beta
# Conflicts:
#	src/engine_base.h
#	src/gfxinit.cpp
#	src/graph_gui.cpp
#	src/lang/brazilian_portuguese.txt
#	src/lang/dutch.txt
#	src/lang/french.txt
#	src/lang/korean.txt
#	src/lang/norwegian_bokmal.txt
#	src/lang/portuguese.txt
#	src/lang/russian.txt
#	src/lang/spanish.txt
#	src/lang/spanish_MX.txt
#	src/network/core/address.cpp
#	src/network/core/game_info.h
#	src/network/core/os_abstraction.h
#	src/network/core/udp.cpp
#	src/network/network_client.cpp
#	src/network/network_client.h
#	src/network/network_internal.h
#	src/newgrf_engine.cpp
#	src/settings_gui.cpp
#	src/station_cmd.cpp
#	src/string_func.h
#	src/town_gui.cpp
#	src/video/video_driver.cpp
#	src/widget_type.h
2021-09-18 01:28:57 +01:00
TELK
efec8cb02c Update: Korean translation up to 0748d54 2021-09-12 09:45:10 +09:00
TELK
b2245806ae Update: Korean translation up to ebab945 2021-09-12 09:45:10 +09:00
TELK
8686eaacb7 Update: Korean translation up to b8d5113c5a 2021-09-12 09:45:10 +09:00
TELK
b016811070 Update: Korean translation up to e76c5dfda7 2021-09-12 09:45:10 +09:00
Jonathan G Rennison
282f5f22e3 Partially revert "Update: Translations from eints"
This partially reverts b721787c7f

Unremove string: STR_NETWORK_COMPANY_LIST_SPECTATE
2021-09-11 00:28:34 +01:00
dP
40a6181a16 Change: Return 'New company/Spectate' option to company toolbar menu
(cherry picked from commit dc2bbfd3f4c78ea14631c2005544bb6898faf1b0)

Include spectate option part
2021-09-11 00:11:50 +01:00
Jonathan G Rennison
afd66c1631 Show linear scaling value in settings window for cargo scaling settings 2021-09-08 22:03:02 +01:00
Jonathan G Rennison
5d351a14d2 Add new signal type: no-entry signal
This is only passable in one direction, but does not have a signal
or show an aspect in the opposite direction

Add a setting for whether this is shown in the signal UI.
Off by default.
2021-09-04 11:39:54 +01:00
Jonathan G Rennison
6af182c3ca Add sort by number of vehicles calling to station list window 2021-09-02 01:02:52 +01:00
Jonathan G Rennison
16f2ef227b Store tunnel/bridge signal spacing on tile, adjust spacing to fit length 2021-08-29 02:11:58 +01:00
Jonathan G Rennison
5afa1b93eb Show buy cost and running cost in template windows
See: #312
2021-08-22 15:01:26 +01:00
Jonathan G Rennison
d67f63a04e Remove unused template replacement value strings 2021-08-22 15:01:26 +01:00
Jonathan G Rennison
b8d5113c5a Tracerestrict: Add slot action mode, try to acquire (only on reserve) 2021-08-15 22:39:52 +01:00
Jonathan G Rennison
e76c5dfda7 Revert "Temporarily mark dual pane train purchase window as experimental"
This reverts commit f9bb004b05.
2021-08-04 17:49:23 +01:00
Jonathan G Rennison
6a009686c9 Fix #299: Add estimated max speed (full) to template windows 2021-07-17 23:21:12 +01:00
Jonathan G Rennison
f9bb004b05 Temporarily mark dual pane train purchase window as experimental
See: #287, #296, #297
2021-07-09 18:12:55 +01:00
TELK
9dcc6f770c Update: Korean translation up to 158608442c 2021-07-04 22:00:06 +09:00
TELK
34e30766a3 Update: Korean translation up to 0f73fe765f 2021-07-04 22:00:06 +09:00
TELK
25e2e79bcc Update: Korean translation up to 0773dde669 2021-07-04 22:00:06 +09:00
TELK
757f140286 Update: Korean translation for drag_drop_group_name 2021-07-04 22:00:06 +09:00
TELK
2892bdde2e Update: Korean translation for 9d4d72cd1e 2021-07-04 22:00:06 +09:00
Jonathan G Rennison
158608442c Merge pull request #281 from VacuumBreather/train_speed_adaptation
# Conflicts:
#	src/saveload/extended_ver_sl.cpp
#	src/saveload/extended_ver_sl.h
2021-07-03 23:00:25 +01:00
Jonathan G Rennison
0f73fe765f Merge pull request #293 from VacuumBreather/station_cargo_history
Add station cargo history
2021-06-29 19:53:18 +01:00
Jonathan G Rennison
37c7cf9899 Remove number of days from hard-coded X axis label string
To support later day number changes and/or translations
2021-06-29 19:37:20 +01:00
Jonathan G Rennison
0773dde669 Merge pull request #287 from VacuumBreather/advanced_train_purchase_window
Advanced train purchase window
2021-06-29 00:43:26 +01:00
Jonathan G Rennison
5e418128da Add setting for whether to use dual pane train purchase window 2021-06-29 00:11:07 +01:00
Jonathan G Rennison
3bba9ef37a Fix setting name 2021-06-27 04:41:46 +01:00
Jonathan G Rennison
be9b18df59 Fix wrong string code in lang text in 6c07758c 2021-06-27 04:11:09 +01:00
Jonathan G Rennison
fdf9257649 Merge pull request #285 from VacuumBreather/drag_drop_group_name 2021-06-27 02:57:38 +01:00
Jonathan G Rennison
6c07758cc3 Do name generation at client, fix localisation
Use existing group creation command
2021-06-27 02:28:52 +01:00
Andreas Schmitt
9b1783809d Add station cargo history 2021-06-23 08:48:46 +02:00
Jonathan G Rennison
9d4d72cd1e Merge pull request #286 from VacuumBreather/vehicle_more_info
Show more details on train max speed when loaded
2021-06-22 23:37:23 +01:00
Andreas Schmitt
2370df82aa Fix string parameter 2021-06-21 07:56:58 +02:00
Andreas Schmitt
2c9619ba10 Fix string parameter 2021-06-21 07:52:26 +02:00
Andreas Schmitt
837e82f60c Add German translation 2021-06-21 01:22:50 +02:00
Andreas Schmitt
2b7a96b252 Add German translation 2021-06-21 01:18:38 +02:00