dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
49,937 Commits 1 Branch 0 Tags
f9956d88c3fe0970ddbd75be1ab274052f3eba7b
Commit Graph

8474 Commits

Author SHA1 Message Date
Jonathan G Rennison
f9956d88c3 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/aircraft_cmd.cpp
#	src/company_gui.cpp
#	src/lang/arabic_egypt.txt
#	src/lang/czech.txt
#	src/lang/esperanto.txt
#	src/lang/faroese.txt
#	src/lang/finnish.txt
#	src/lang/german.txt
#	src/lang/korean.txt
#	src/lang/latvian.txt
#	src/lang/malay.txt
#	src/lang/polish.txt
#	src/lang/spanish.txt
#	src/lang/spanish_MX.txt
#	src/lang/unfinished/urdu.txt
#	src/main_gui.cpp
#	src/rail_cmd.cpp
#	src/rail_gui.cpp
#	src/road_cmd.cpp
#	src/settings_type.h
#	src/station_cmd.cpp
#	src/table/settings.ini
 2021-01-31 01:11:12 +00:00
Jonathan G Rennison
6c3e5642f8 Merge branch 'master' into jgrpp 
# Conflicts:
#	cmake/CompileFlags.cmake
#	src/crashlog.cpp
#	src/fileio.cpp
#	src/fileio_func.h
#	src/fios_gui.cpp
#	src/ini_load.cpp
#	src/ini_type.h
#	src/lang/english.txt
#	src/lang/german.txt
#	src/lang/korean.txt
#	src/network/network_client.cpp
#	src/order_base.h
#	src/order_cmd.cpp
#	src/os/windows/win32.cpp
#	src/road_cmd.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
#	src/settings.cpp
#	src/station_cmd.cpp
#	src/stdafx.h
#	src/table/settings.ini
#	src/tree_cmd.cpp
#	src/tree_gui.cpp
#	src/vehicle_base.h
#	src/video/cocoa/cocoa_v.mm
#	src/video/cocoa/event.mm
#	src/video/cocoa/wnd_quartz.mm
#	src/viewport.cpp
#	src/widgets/tree_widget.h
 2021-01-31 01:08:35 +00:00
Jonathan G Rennison
33d9e48bcf Add setting for inflation dates mode 2021-01-30 19:59:00 +00:00
Jonathan G Rennison
39df1c49a1 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/fileio.cpp
#	src/group_gui.cpp
#	src/industry.h
#	src/lang/korean.txt
#	src/linkgraph/linkgraphjob.cpp
#	src/linkgraph/linkgraphjob.h
#	src/linkgraph/linkgraphschedule.cpp
#	src/linkgraph/linkgraphschedule.h
#	src/openttd.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
#	src/town_cmd.cpp
#	src/vehicle_gui.cpp
#	src/vehicle_gui_base.h
 2021-01-30 18:27:35 +00:00
Jonathan G Rennison
cb69611248 Merge branch 'master' into jgrpp 
# Conflicts:
#	.github/changelog.sh
#	cmake/PackageDeb.cmake
#	src/network/network_client.cpp
#	src/settings_gui.cpp
 2021-01-29 18:27:36 +00:00
Jonathan G Rennison
dddcd6d441 Merge branch 'pr-213' into jgrpp 2021-01-29 18:18:39 +00:00
Jonathan G Rennison
09dc33022c Add client setting for vehicle naming scheme 2021-01-29 18:16:42 +00:00
Jonathan G Rennison
43980639de Merge branch 'master' into jgrpp 
# Conflicts:
#	.gitignore
#	CMakeLists.txt
#	src/3rdparty/optional/optional.hpp
#	src/group_cmd.cpp
#	src/industry_cmd.cpp
#	src/misc_gui.cpp
#	src/video/sdl2_v.cpp
 2021-01-29 17:45:15 +00:00
TELK
cd1fd5f352 Update: Korean translation for ed0ffb6 2021-01-29 14:59:30 +09:00
Jonathan G Rennison
ed0ffb6220 Add feature: realistic train braking 
Add setting to select train braking model.
 2021-01-28 19:03:18 +00:00
Jonathan G Rennison
ac6581ac8f Lang: Fix string codes in german.txt 2021-01-24 22:42:40 +00:00
kruemelmagic
7072bc2fac Update German language by Kruemelchen 
Update to be on par with v. 0.39.2
 2021-01-23 13:55:28 +01:00
translators
51e22515a8 Update: Translations from eints 
spanish (mexican): 5 changes by absay
korean: 5 changes by telk5093
finnish: 5 changes by hpiirai
latvian: 14 changes by lexuslatvia
spanish: 23 changes by SeveralCircles, 10 changes by Luis45ccs
polish: 5 changes by yazalo
 2021-01-07 18:28:27 +00:00
Kuhnovic
a3a7928372 Feature: option to auto remove signals when in the way during rail construction (#8274) 2021-01-07 10:17:05 +01:00
translators
c3faec4e9a Update: Translations from eints 
polish: 7 changes by yazalo
 2021-01-06 18:27:36 +00:00
Patric Stout
62cdadb582 Change: move "give money" from client-list to company window 
This is a much better location for this button, as you send
money from one company to another company, not from player
to player.

This is based on work done by JGRPP in:
f820543391
and surrounding commits, which took the work from estys:
https://www.tt-forums.net/viewtopic.php?p=1183311#p1183311

We did modify it to fix several bugs and clean up the code while
here anyway.

The callback was removed, as it meant a modified client could
prevent anyone from seeing money was transfered. The message
is now generated in the command itself, making that impossible.
 2021-01-05 21:56:24 +01:00
translators
0fd2108f7f Update: Translations from eints 
persian: 24 changes by alisaffari97
 2021-01-05 18:27:57 +00:00
translators
784a4ef9b5 Update: Translations from eints 
spanish (mexican): 14 changes by absay
finnish: 32 changes by hpiirai
polish: 2 changes by yazalo
 2021-01-03 18:25:04 +00:00
translators
46e13e7f0b Update: Translations from eints 
finnish: 3 changes by hpiirai
catalan: 29 changes by J0anJosep
 2021-01-02 18:24:09 +00:00
translators
a7fee48b7f Update: Translations from eints 
finnish: 4 changes by hpiirai
french: 1 change by glx22
 2020-12-31 18:27:03 +00:00
translators
18fccba410 Update: Translations from eints 
spanish (mexican): 42 changes by absay
russian: 4 changes by Ln-Wolf
finnish: 2 changes by hpiirai
french: 35 changes by glx22
polish: 25 changes by yazalo
 2020-12-30 18:26:18 +00:00
TELK
5695ca782d Update: Korean translation for v0.39.2 2020-12-31 01:41:07 +09:00
translators
80a7d0365b Update: Translations from eints 
korean: 4 changes by telk5093
german: 84 changes by UnsuspiciousGooball
finnish: 4 changes by hpiirai
slovak: 7 changes by FuryPapaya
 2020-12-29 18:26:06 +00:00
translators
b30c3f6498 Update: Translations from eints 
korean: 6 changes by telk5093
finnish: 6 changes by hpiirai
slovak: 47 changes by FuryPapaya
 2020-12-28 18:21:37 +00:00
dP
94057e9b18 Change: Add some style to GameScript question windows depending on the type 2020-12-28 11:27:42 +00:00
translators
e19b3adef3 Update: Translations from eints 
korean: 29 changes by telk5093
finnish: 8 changes by hpiirai
slovak: 6 changes by FuryPapaya
french: 6 changes by glx22

(cherry picked from commit 1a67954ff9)
 2020-12-27 21:07:41 +00:00
translators
316cccf301 Update: Translations from eints 
french: 1 change by glx22

(cherry picked from commit 8c42f3a8d4)
 2020-12-27 21:07:41 +00:00
Patric Stout
cc5ccc3b45 Fix: a cargos sneaked in; should be cargoes for consistency (#8383) 
(cherry picked from commit e07afaeffb)
 2020-12-27 20:36:13 +00:00
jostephd
3088d41ac8 Feature: new velocity unit "tiles/day" (#8278) 
(cherry picked from commit b1cf79da5b)
 2020-12-27 20:33:24 +00:00
Pavel Stupnikov
ba4626d450 Add: new economy "frozen" that stops production changes and industry closures (#8282) 
(cherry picked from commit c9fd85528a)
 2020-12-27 20:32:34 +00:00
Patric Stout
488187a423 Fix: next 67 savegame versions are used in PatchPacks; skip them (#8411) 
Various of PatchPacks (Spring 2013, Joker, ChillPP) used versions
slightly higher than ours. Of course, as time went by, this
caught up with us, and we are now almost pushing a new version
that would conflict with them. To avoid users creating unneeded
issues about "why can I not load my savegame", lets be ahead of
the curve and flat-out refuse to load them.

Version-wise, this is totally fine. We have ~32k versions to go
before we run out (0x8000 is masked by JGRPP; we should avoid
using that). At the rate we bump savegames, this is not going to
happen in any sane reality.

(cherry picked from commit d8c8f4e72d)
 2020-12-27 20:29:25 +00:00
Jonathan G Rennison
483ed2f468 Merge branch 'master' into jgrpp 
# Conflicts:
#	.github/workflows/ci-build.yml
#	.github/workflows/commit-checker.yml
#	src/openttd.cpp
 2020-12-27 20:16:16 +00:00
translators
1bb0e6ed8c Update: Translations from eints 
russian: 19 changes by lexuslatvia
finnish: 1 change by hpiirai
latvian: 19 changes by lexuslatvia
 2020-12-27 18:18:16 +00:00
Niels Martin Hansen
2d9fa81bd0 Feature: Plant clumps of trees in editor by dragging on the landscape 2020-12-27 01:03:27 +01:00
translators
2c8c6d423c Update: Translations from eints 
korean: 18 changes by telk5093
 2020-12-26 18:16:26 +00:00
translators
9add62796c Update: Translations from eints 
finnish: 10 changes by hpiirai
 2020-12-25 18:16:29 +00:00
translators
7b515fa0e2 Update: Translations from eints 2020-12-25 13:07:40 +00:00
frosch
ba49fa3b82 Codechange: Rename strings to match their usage. 2020-12-25 00:40:35 +01:00
frosch
2bb691f50e Change: Remove the LAN/Internet combobox from the server list in favour of adding two separate search buttons. 2020-12-25 00:40:35 +01:00
Pavel Stupnikov
22b9dec960 Feature: Add an option to disable tree growth completely (#8415) 2020-12-25 00:36:54 +01:00
Jonathan G Rennison
3ea0ffa46b Debug: Add auto-refresh functionality to the debug window 2020-12-24 19:43:41 +00:00
translators
ad47e3d9e6 Update: Translations from eints 
finnish: 1 change by hpiirai
 2020-12-24 18:19:47 +00:00
translators
2e6f37ecf1 Update: Translations from eints 
arabic (egypt): 15 changes by AviationGamerX
korean: 15 changes by telk5093
finnish: 12 changes by hpiirai
 2020-12-23 18:17:50 +00:00
translators
cc8301449e Update: Translations from eints 
korean: 2 changes by telk5093
catalan: 13 changes by perezdidac
 2020-12-22 18:13:57 +00:00
Jonathan G Rennison
0c5dc5d41e Change: [Linkgraph] Pause the game when linkgraph jobs lag (#6470) 
Check if the job is still running two date fract ticks before it is due
to join, and if so pause the game until its done.
When loading a game, check if the game would block immediately due to
a job which is scheduled to be joined within two date fract ticks,
and if so pause the game until its done.
This avoids the main thread being blocked on a thread join, which appears
to the user as if the game is unresponsive, as the UI does not repaint
and cannot be interacted with.
Show if pause is due to link graph job in status bar, update network
messages.
This does not apply for network clients.
 2020-12-22 15:17:57 +01:00
Patric Stout
547e5fdb65 Fix 86e08aa: STR_CARGO_PLURAL_CANDY with cases was not renamed (#8412) 2020-12-22 13:12:47 +01:00
Patric Stout
d8c8f4e72d Fix: next 67 savegame versions are used in PatchPacks; skip them (#8411) 
Various of PatchPacks (Spring 2013, Joker, ChillPP) used versions
slightly higher than ours. Of course, as time went by, this
caught up with us, and we are now almost pushing a new version
that would conflict with them. To avoid users creating unneeded
issues about "why can I not load my savegame", lets be ahead of
the curve and flat-out refuse to load them.

Version-wise, this is totally fine. We have ~32k versions to go
before we run out (0x8000 is masked by JGRPP; we should avoid
using that). At the rate we bump savegames, this is not going to
happen in any sane reality.
 2020-12-22 10:44:07 +01:00
Bernard Teo
e59c400ca6 Feature: Option to group vehicle lists by shared orders 
This applies to all kinds of vehicle lists, as well as the "vehicle groups" window.
 2020-12-21 23:15:53 +01:00
Xaroth Brook
86e08aa8ef Update: Apply name changes to all languages. 2020-12-21 23:12:58 +01:00
Xaroth Brook
d05be2cff5 Cleanup: Rework the CargoSpec macro for improved readability. 2020-12-21 23:12:58 +01:00