Jonathan G Rennison
ec8512e2ea
When declining to buy a company, ask the next company immediately
2021-10-24 00:07:54 +01:00
Jonathan G Rennison
a9c2c7288a
Fix compilation when ENABLE_NETWORK_SYNC_EVERY_FRAME is defined
...
This is set by RANDOM_DEBUG
See also: https://github.com/OpenTTD/OpenTTD/issues/9624
2021-10-19 00:50:05 +01:00
Jonathan G Rennison
b58ff65c5c
Debug: Fix company money state checksum being logged with wrong company
2021-10-19 00:39:41 +01:00
Jonathan G Rennison
4a1e347f8e
Fix desync when using "perfect" tree placement mode in arctic climate
2021-10-19 00:38:57 +01: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
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
Jonathan G Rennison
784fcbd1e7
Merge branch 'master' into jgrpp-beta
...
# Conflicts:
# src/settings.cpp
# src/settings_gui.cpp
# src/settings_internal.h
# src/table/currency_settings.ini
# src/table/gameopt_settings.ini
# src/table/misc_settings.ini
# src/table/settings.h.preamble
2021-10-17 22:55:50 +01:00
Jonathan G Rennison
b00d5e07d2
Fix fb0549ea: Incorrect cherry-pick removed end marker
2021-10-17 01:45:51 +01:00
Jonathan G Rennison
781aaa4fe5
Merge branch 'master' 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-17 01:44:45 +01:00
Jonathan G Rennison
900b9fdf3b
Fix crash with wrong-way running on signalled tunnel/bridge
...
When using the ignore signals buttons, and exiting the bridge/tunnel
in some cases
2021-10-16 19:59:43 +01:00
Jonathan G Rennison
9254be5b3c
Debug: Show info of all aircraft parts in vehicle debug window
2021-10-12 20:35:07 +01:00
Jonathan G Rennison
c64f48f2bd
Debug: Add direction and spritenum info to vehicle debug window
2021-10-12 20:26:13 +01:00
Jonathan G Rennison
71a5abd42b
Fix aircraft shadows being drawn facing the wrong direction
2021-10-12 20:19:53 +01: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
translators
f7ca8bd6ae
Update: Translations from eints
...
spanish (mexican): 1 change by absay
latvian: 2 changes by osprinkis
(cherry picked from commit 3559e55b91
2021-10-08 18:18:28 +01:00
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
2021-10-08 18:18:21 +01:00
translators
cda901ff04
Update: Translations from eints
...
korean: 1 change by telk5093
(cherry picked from commit d816ff0361
2021-10-08 18:18:13 +01:00
translators
7ec6db1808
Update: Translations from eints
...
swedish: 1 change by joeax910
(cherry picked from commit 48ecc481ee
2021-10-08 18:18:04 +01:00
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
PeterN
32571a0ccd
Fix: Wrong cargo line position in IndustryCargo window. ( #9383 )
...
Resolved by changing calculation to determine the offset based on centring the cargo lines in the available space.
(cherry picked from commit ce7ef4d824
2021-10-08 18:11:02 +01:00
SamuXarick
48b287a22f
Fix #9358 : Don't skip empty files in tar ( #9367 )
...
(cherry picked from commit 1e6a2163a5
2021-10-08 18:11:02 +01:00
Patric Stout
0550ca0854
Fix: on startup, NewGRF scan could case race-condition ( #9382 )
...
Creating a thread was not thread-safe. The irony.
The video-driver has a function GameLoopPause() which first checks
if the thread is the game-thread or not. For this it needs access
to this->game_thread. This variable is set in StartNewThread().
However, due to timing, it is well possible GameLoopPause() is
called from the thread well before this->game_thread is assigned.
And so we have a race-condition!
Simply solve this by preventing a thread to start till we are
done with our bookkeeping.
(cherry picked from commit b45c006ab9
2021-10-08 18:11:02 +01:00
Patric Stout
441ff7e436
Fix: thread safety issue during exiting the game ( #9380 )
...
_exit_game is read by the draw-thread to know when to exit, but
most of the time written by the game-thread.
(cherry picked from commit c12a152ec9
2021-10-08 18:11:02 +01:00
Patric Stout
573ab48e9c
Fix 81062163: for (really) old games, station bus/truck station cache was not updated ( #9366 )
...
(cherry picked from commit 1e432fbd71
2021-10-08 18:11:02 +01:00
TELK
3e78624965
Fix #9362 : Hover in online players window was slightly too big ( #9364 )
...
This causes graphical glitches at the bottom of the window.
(cherry picked from commit 2d0abf5a76
2021-10-08 18:11:02 +01:00
rubidium42
057e858d32
Fix #9353 : [Script] Garbage collecting on priority queues could crash the game
...
(cherry picked from commit 71f3c35288
2021-10-08 18:11:02 +01:00
Loïc Guilloux
d46c764d60
Fix 4079c47: Missed a file when removing generated .sq files from the repo ( #9350 )
...
(cherry picked from commit 16ebf7861f
2021-10-08 18:11:02 +01:00
Loïc Guilloux
0f05fc8573
Fix: [Script] doxygen_filter is very strict about DOXYGEN_API usage ( #9351 )
...
(cherry picked from commit ee5f23382d
2021-10-08 18:11:02 +01:00
Patric Stout
0a7a4e06ad
Add: adhere the autosave_on_exit setting for Null videodriver ( #9343 )
...
This is especially useful for automated-testing, to make a save
when the game quits while using "-vnull:ticks=N".
(cherry picked from commit 37ae6b8ae3
2021-10-08 18:11:02 +01:00
Patric Stout
364ce76d51
Change: allow pause/unpause console command in single player too ( #9342 )
...
(cherry picked from commit 849a10520c
2021-10-08 18:11:02 +01:00
Patric Stout
563884105f
Change: by default, make "unload all" leave stations empty ( #9301 )
...
(cherry picked from commit 7648483364
2021-10-08 18:11:02 +01:00
Patric Stout
3411203e5d
Fix: compatible NewGRFs in crash-log reported wrong md5 ( #9340 )
...
The text suggests it reports the original md5, but it does in fact
report the replaced md5. Now it reports both.
(cherry picked from commit f997eb6ca4
2021-10-08 18:11:02 +01:00
rubidium42
9299a29a52
Fix: limit heightmap sizes to something reasonable to prevent crafted heightmaps to OOM-crash the game
...
(cherry picked from commit 97c461d1e7
2021-10-08 18:11:02 +01:00
Jonathan G Rennison
92fc0f364b
Version: Committing version data for tag: jgrpp-0.43.1
2021-10-04 21:38:37 +01:00
Jonathan G Rennison
fe8da3ae3a
Fix missing include in header
2021-10-04 21:37:55 +01:00
Loïc Guilloux
07cc7da7fd
Revert 7ca1793: Using Trackdir keyed node is not required, Exitdir keyed node still have the correct trackdir ( #9576 )
...
(cherry picked from commit 11dece205c
2021-10-04 21:07:37 +01:00
Jonathan G Rennison
ea9a65edcd
Increase size of desync log message ring buffer
2021-10-04 21:01:03 +01:00
Jonathan G Rennison
6f16655e6e
Add "special events" log. Add console command, include in crash logs.
2021-10-04 20:54:12 +01:00
Jonathan G Rennison
2e022d5194
Move game events to new event_logs header/cpp files
2021-10-04 20:43:50 +01:00
Jonathan G Rennison
1451aa76ff
Add console command to dump vehicle info
2021-10-04 01:02:39 +01:00
Jonathan G Rennison
6b250c203c
Add chicken bit to control CheckCaches periodic/post-command flags
2021-10-03 23:58:35 +01:00
