dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
52,678 Commits 1 Branch 0 Tags
e5c99b3601425b4ba848b3f3af25c87c8c06ce9c
Commit Graph

52678 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
translators
8b157c9bdf Update: Translations from eints 
romanian: 1 change by kneekoo
 2021-10-06 18:47:23 +00: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
translators
d2bc32e94a Update: Translations from eints 
korean: 1 change by telk5093
romanian: 15 changes by kneekoo
 2021-10-04 18:48:34 +00: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
Loïc Guilloux
46123742f5 Change: [Actions] Use macOS-11 image for releases (#9605) 2021-10-03 21:14:59 +02:00
translators
340a36bf1f Update: Translations from eints 
romanian: 8 changes by kneekoo
irish: 55 changes by temuchie
 2021-10-03 18:46:14 +00:00
Patric Stout
3046a6ce39 Change: upgrade Emscripten to 2.0.31 and enable LZMA by default (#9604) 2021-10-03 16:20:05 +02: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
SamuXarick
e404d16929 Fix #9591: Update station docking tiles upon placing a water object on a docking tile (#9594) 2021-10-03 12:54:19 +02:00
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.
 2021-10-03 11:02:28 +02:00
Loïc Guilloux
2144cd98a3 Fix: Incorrect Romanian own name (#9598) 2021-10-03 09:49:03 +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
Loïc Guilloux
a53cfeef13 Fix #9548, e5fedcd: [Squirrel] Crash during engine cleanup after reaching memory limit on realloc (#9592) 2021-10-02 21:08:42 +02:00
translators
a2cf81e722 Update: Translations from eints 
romanian: 38 changes by kneekoo
 2021-10-02 18:46:31 +00:00
dP
585ad9bcab Cleanup: Swap comments for IConsoleModes (#9587) 2021-10-02 16:33:28 +02:00
Loïc Guilloux
ccd586a736 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.
 2021-10-02 15:13:58 +02:00
Jonathan G Rennison
2df744db79 OSX: Fix CoreTextFontCache not setting font_height_cache 
See: #323
 2021-10-02 11:55:25 +01:00
translators
78d66b7732 Update: Translations from eints 
romanian: 145 changes by kneekoo
 2021-10-01 18:45:29 +00:00
translators
41094b6a4a Update: Translations from eints 
spanish: 14 changes by MontyMontana
 2021-09-30 18:48:12 +00:00