dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
51,697 Commits 1 Branch 0 Tags
f65ec3b797bbd4588b4fb6fe87ae1ce8dde1514c
Commit Graph

51697 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jonathan G Rennison
24fdc8331b Add CheckCaches mode to emit a log/save/screenshot on detected issue 2021-10-03 23:57:27 +01:00
Jonathan G Rennison
1b8bbdaf76 Add chicken bit for CheckCaches call after DoCommandP 2021-10-03 23:03:39 +01:00
Jonathan G Rennison
5ed7aee8d3 Add flags field to CheckCaches for which checks to run 
Add header file for CheckCaches
 2021-10-03 23:03:39 +01:00
Loïc Guilloux
c408007575 Fix #9548, e5fedcd: [Squirrel] Crash during engine cleanup after reaching memory limit on realloc (#9592) 
(cherry picked from commit a53cfeef13)
 2021-10-03 21:19:27 +01:00
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)
 2021-10-03 21:19:12 +01:00
Tyler Trahan
cd97ca95f2 Fix: Changing raw industry funding method redraws GUI (#9572) 
(cherry picked from commit 4aa63ce8f3)
 2021-10-03 21:18:43 +01:00
PeterN
f5561ac212 Fix #9562: Handle case of invalid action2 with zero results. (#9564) 
(cherry picked from commit 7e70ead396)
 2021-10-03 21:18:16 +01:00
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
 2021-10-03 15:06:58 +01:00
Jonathan G Rennison
8f2582e0ff Update help text for check_caches console command 2021-10-03 02:17:52 +01:00
Jonathan G Rennison
d4d54c9b90 Add a chicken bit setting to enable periodic CheckCaches 2021-10-03 01:58:54 +01:00
Jonathan G Rennison
96ea775b24 Avoid undefined behaviour in saveload chunk handlers 
Use data() instead of &[0] to avoid issues with empty vectors
 2021-10-02 22:43:55 +01:00
Jonathan G Rennison
c47fd30330 Include docking tiles in station debug window 2021-10-02 22:43:55 +01:00
Jonathan G Rennison
2df744db79 OSX: Fix CoreTextFontCache not setting font_height_cache 
See: #323
 2021-10-02 11:55:25 +01:00
Jonathan G Rennison
513f6db718 Increase command log ring buffer size to 256 2021-09-30 18:42:51 +01:00
Jonathan G Rennison
65c20edde7 Settings: Merge orderproc into guiproc 2021-09-29 20:10:38 +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
47156122fa Settings: Add a guiproc callback for general settings GUI operations 2021-09-29 19:32:32 +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
Jonathan G Rennison
1820408bf6 Merge pull request #322 from WoelfiVW/patch-2 
Fix typos
 2021-09-26 19:49:59 +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