Commit Graph

39339 Commits (168dc4678d1473a8b664dcb0d3317c3a446235b1)

Author SHA1 Message Date
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
Jonathan G Rennison 55620ff162 Add general function for checking size of contiguous tile area 3 years ago
translators a0831cec39 Update: Translations from eints
swedish: 1 change by joeax910
3 years ago
Jonathan G Rennison 8b5b96af77 Fix typos in PostProcessNetworks 3 years ago
Jonathan G Rennison 28fd549808 Decline company takeover offer on company's behalf if company has no client 3 years ago
Jonathan G Rennison 296987153b Add console command to offer a company for sale 3 years ago
Jonathan G Rennison ec8512e2ea When declining to buy a company, ask the next company immediately 3 years ago
translators 279fe11b03 Update: Translations from eints
indonesian: 2 changes by hadyatmo
3 years ago
frosch e8bff0ad03
Change: Suppress panning in intro game, while user is interacting with the GUI. (#9645) 3 years ago
frosch 111a47af0d Codechange: rename 'info_view' to 'rotor_in_gui', because it is only used by helicopters. 3 years ago
frosch bc984d9af5 Codechange: remove redundant 'info_view' parameter, it can be derived from 'image_type'. 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
Joan Josep b2e83b4da6
Fix: Draw rotor in cursor when dragging helicopters. (#9612) 3 years ago
Loïc Guilloux 08c048e0a1
Fix #9643, 95386dc: Incorrect determination of screenshot format (#9644) 3 years ago
translators ae340f415e Update: Translations from eints
russian: 2 changes by Ln-Wolf
3 years ago
Loïc Guilloux f2c03a77f0
Change: Don't store not to be activated newGRFs in savegames (#9627) 3 years ago
Loïc Guilloux bc1b84cbbb
Fix #9630: intro game could zoom in/out more than allowed by settings (#9633)
Also fixes #9622
3 years ago
translators b043d58b92 Update: Translations from eints
swedish: 4 changes by joeax910
spanish: 1 change by MontyMontana
3 years ago
Loïc Guilloux eed49d7792
Fix #9626, ddafc0d: Incorrect loading of script saved data (#9629) 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
glx22 1c0700e0c0 Fix #9624: compilation with RANDOM_DEBUG 3 years ago
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
3 years ago
Jonathan G Rennison b58ff65c5c Debug: Fix company money state checksum being logged with wrong company 3 years ago
Jonathan G Rennison 4a1e347f8e Fix desync when using "perfect" tree placement mode in arctic climate 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
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
3 years ago
Charles Pigott 86c295bb3b Change: Ignore refresh_rate setting when vsync is enabled 3 years ago
Charles Pigott e09f251fc6 Fix #9614: Refresh rate dropdown was still active when vsync was enabled 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
Jonathan G Rennison b00d5e07d2 Fix fb0549ea: Incorrect cherry-pick removed end marker 3 years ago
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
3 years ago
Patric Stout 78eece71d9
Codechange: "set but not used" warning when disabling assert() (#9613)
DebugCheckSanity() is unused when asserts are disabled. While at it,
use WITH_ASSERT over NDEBUG, as that means we also run this code
during beta/RC.
3 years ago
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
3 years ago
translators d66dea5d83 Update: Translations from eints
indonesian: 9 changes by bsuseno
3 years ago
Jonathan G Rennison 9254be5b3c Debug: Show info of all aircraft parts in vehicle debug window 3 years ago
Jonathan G Rennison c64f48f2bd Debug: Add direction and spritenum info to vehicle debug window 3 years ago
Jonathan G Rennison 71a5abd42b Fix aircraft shadows being drawn facing the wrong direction 3 years ago
translators 4b96244b4d Update: Translations from eints
romanian: 6 changes by kneekoo
3 years ago
glx22 cbe00ec651 Fix: Try all possible reverse directions when a ship reaches a dead end 3 years ago
glx22 207cf7bbdd Change: Reverse ship when leaving docks if a better path exists 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
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)
3 years ago
SamuXarick 48b287a22f Fix #9358: Don't skip empty files in tar (#9367)
(cherry picked from commit 1e6a2163a5)
3 years ago
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)
3 years ago
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)
3 years ago
Patric Stout 573ab48e9c Fix 81062163: for (really) old games, station bus/truck station cache was not updated (#9366)
(cherry picked from commit 1e432fbd71)
3 years ago
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)
3 years ago
rubidium42 057e858d32 Fix #9353: [Script] Garbage collecting on priority queues could crash the game
(cherry picked from commit 71f3c35288)
3 years ago
Loïc Guilloux d46c764d60 Fix 4079c47: Missed a file when removing generated .sq files from the repo (#9350)
(cherry picked from commit 16ebf7861f)
3 years ago
Loïc Guilloux 0f05fc8573 Fix: [Script] doxygen_filter is very strict about DOXYGEN_API usage (#9351)
(cherry picked from commit ee5f23382d)
3 years ago
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)
3 years ago
Patric Stout 364ce76d51 Change: allow pause/unpause console command in single player too (#9342)
(cherry picked from commit 849a10520c)
3 years ago
Patric Stout 563884105f Change: by default, make "unload all" leave stations empty (#9301)
(cherry picked from commit 7648483364)
3 years ago
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)
3 years ago
rubidium42 9299a29a52 Fix: limit heightmap sizes to something reasonable to prevent crafted heightmaps to OOM-crash the game
(cherry picked from commit 97c461d1e7)
3 years ago
translators 8b157c9bdf Update: Translations from eints
romanian: 1 change by kneekoo
3 years ago
Jonathan G Rennison fe8da3ae3a Fix missing include in header 3 years ago
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)
3 years ago
Jonathan G Rennison ea9a65edcd Increase size of desync log message ring buffer 3 years ago
Jonathan G Rennison 6f16655e6e Add "special events" log. Add console command, include in crash logs. 3 years ago
Jonathan G Rennison 2e022d5194 Move game events to new event_logs header/cpp files 3 years ago
translators d2bc32e94a Update: Translations from eints
korean: 1 change by telk5093
romanian: 15 changes by kneekoo
3 years ago
Jonathan G Rennison 1451aa76ff Add console command to dump vehicle info 3 years ago
Jonathan G Rennison 6b250c203c Add chicken bit to control CheckCaches periodic/post-command flags 3 years ago
Jonathan G Rennison 24fdc8331b Add CheckCaches mode to emit a log/save/screenshot on detected issue 3 years ago
Jonathan G Rennison 1b8bbdaf76 Add chicken bit for CheckCaches call after DoCommandP 3 years ago
Jonathan G Rennison 5ed7aee8d3 Add flags field to CheckCaches for which checks to run
Add header file for CheckCaches
3 years ago
Loïc Guilloux c408007575 Fix #9548, e5fedcd: [Squirrel] Crash during engine cleanup after reaching memory limit on realloc (#9592)
(cherry picked from commit a53cfeef13)
3 years ago
Loïc Guilloux ff67f7b311 Fix #9588, 140a96b: [Squirrel] Reaching memory limit during script registration could prevent further script detections (#9589)
Also the memory allocation triggering the limit was never freed.
And if the exception was thrown in a constructor using placement new, the pre-allocated memory was not freed either.

(cherry picked from commit ccd586a736)
3 years ago
Tyler Trahan cd97ca95f2 Fix: Changing raw industry funding method redraws GUI (#9572)
(cherry picked from commit 4aa63ce8f3)
3 years ago
PeterN f5561ac212 Fix #9562: Handle case of invalid action2 with zero results. (#9564)
(cherry picked from commit 7e70ead396)
3 years ago
translators 340a36bf1f Update: Translations from eints
romanian: 8 changes by kneekoo
irish: 55 changes by temuchie
3 years ago
Jonathan G Rennison c99eaf72b7 Fix #9591: Update station docking tiles upon placing a water object on a docking tile (#9594)
See: https://github.com/OpenTTD/OpenTTD/issues/9591
See: https://github.com/OpenTTD/OpenTTD/pull/9594

Non-extended savegame bump to be applied later

(cherry picked from commit e404d16929)

# Conflicts:
#	src/object_cmd.cpp
#	src/saveload/afterload.cpp
#	src/saveload/saveload.h
3 years ago
SamuXarick e404d16929
Fix #9591: Update station docking tiles upon placing a water object on a docking tile (#9594) 3 years ago
Patric Stout e4ad632989
Add: [Network] Keep the refresh button in lowered state while refreshing (#9600)
This gives user visual feedback that the refresh is still pending, and
prevents people from clicking again and again thinking nothing is
happening. This is especially true for connections that fall back to
TURN, as that takes a few seconds to kick in.

Additionally, prevent clicking on the button again while a refresh
is pending. This is only delaying a successful result.
3 years ago
Loïc Guilloux 2144cd98a3
Fix: Incorrect Romanian own name (#9598) 3 years ago
Jonathan G Rennison 8f2582e0ff Update help text for check_caches console command 3 years ago