Jonathan G Rennison
b25cbc969c
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/lang/brazilian_portuguese.txt
# src/lang/tamil.txt
# src/station_cmd.cpp
2021-03-07 21:59:33 +00:00
Dídac Pérez Parera
8d9aeb3d4e
Fix: keep NewGRF order for object class sorting
...
(cherry picked from commit 83d67fe46bd24cf88272fe2774954c8dc9bb6497)
2021-03-07 21:36:19 +00:00
translators
f70aa8fabe
Update: Translations from eints
...
estonian: 6 changes by siimsoni
catalan: 3 changes by J0anJosep
latvian: 37 changes by lexuslatvia
portuguese (brazilian): 8 changes by Greavez
polish: 1 change by azabost
2021-03-07 19:02:12 +00:00
Jonathan G Rennison
25909b06d2
Fix #8809 : Crash when removing airport when hangar window open
2021-03-07 17:59:38 +00:00
Jonathan G Rennison
1b146b3bff
Fix crash when removing/upgrading airport with hangar window open
...
See: https://github.com/OpenTTD/OpenTTD/issues/8809
2021-03-07 00:10:46 +00:00
translators
2860de7bf4
Update: Translations from eints
...
chinese (traditional): 5 changes by benny30111
estonian: 1 change by siimsoni
italian: 1 change by AlphaJack
ukrainian: 4 changes by StepanIvasyn
tamil: 37 changes by Aswn
portuguese (brazilian): 19 changes by Greavez
2021-03-06 19:01:58 +00:00
Jonathan G Rennison
9bf6d1407f
Add screenshot type: whole map at current zoom level
2021-03-06 02:33:02 +00:00
Jonathan G Rennison
d6e2b32132
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/screenshot.h
2021-03-06 01:36:41 +00:00
Jonathan G Rennison
dc7ffb5dc6
Add unset hotkey for industry chains window
2021-03-06 00:22:26 +00:00
Jonathan G Rennison
1c51b7253f
Allow following vehicles at all non-map zoom levels
2021-03-05 19:57:14 +00:00
translators
f536fd55d8
Update: Translations from eints
...
swedish: 1 change by kustridaren
spanish (mexican): 4 changes by absay
estonian: 80 changes by siimsoni
arabic (egypt): 13 changes by AviationGamerX
ukrainian: 1 change by StepanIvasyn
dutch: 1 change by Afoklala
portuguese (brazilian): 15 changes by Greavez
2021-03-05 19:02:54 +00:00
Patric Stout
06a3c0cb26
Fix dddf885f
: use IConsoleError to produce console errors
2021-03-04 22:23:05 +01:00
Patric Stout
8c6b5e52fd
Add: allow making heightmap screenshot via console
2021-03-04 22:23:05 +01:00
Patric Stout
ac5e77ea3b
Feature: allow custom width/height of screenshot via console
...
Reworked how the screenshot command works while keeping it backwards
compatible. It can now more freely understand arguments, and has
the ability to make SC_DEFAULTZOOM screenshots.
2021-03-04 22:23:05 +01:00
translators
879eb9c348
Update: Translations from eints
...
estonian: 22 changes by siimsoni
korean: 1 change by telk5093
serbian: 41 changes by nkrs
german: 1 change by Wuzzy2
romanian: 14 changes by ALEX11BR
russian: 5 changes by Ln-Wolf
finnish: 5 changes by hpiirai
ukrainian: 2 changes by StepanIvasyn
lithuanian: 105 changes by devbotas
spanish: 3 changes by MontyMontana
french: 5 changes by MalaGaM
portuguese (brazilian): 13 changes by Greavez
2021-03-04 19:00:02 +00:00
Jonathan G Rennison
70f3993a55
CMake: Fix host strgen/settingsgen importing
2021-03-04 18:50:29 +00:00
Jonathan G Rennison
5a364d3e8c
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/blitter/32bpp_optimized.cpp
# src/lang/serbian.txt
2021-03-04 00:17:10 +00:00
Jonathan G Rennison
d566a152bb
Skip GfxDetermineMainColours contents in dedicated compiles
...
Fixes linker error
2021-03-03 18:01:34 +00:00
Patric Stout
0243ae4654
Fix #8799 : NGameAllowedSorter() is not imposing strict weak ordering relation ( #8801 )
...
In other words, it should only (!) return true if A comes for B.
This promise was broken for the situation where two values are
identical. It would return true in these cases too. This is of
course not possible: if two values are identical, neither come
before the other. As such, the sorter was not imposing strict
weak ordering relations.
libstdc++ handled this scenario just fine, but libc++ crashes
badly on this, as it allowed comparing of [begin, end] instead
of [begin, end).
libc++ considered this not a bug (and by specs, they are correct;
just this way of crashing is of course a bit harsh):
https://bugs.llvm.org/show_bug.cgi?id=47903
2021-03-03 12:12:29 +00:00
Jonathan G Rennison
5724f6e3db
Merge pull request #219 from telk5093/jgrpp
...
Update: Korean translation
2021-03-03 11:28:06 +00:00
Lastorder
f3b850623c
Fix #220 build fail due to missing var
...
Removed from merge commit dfecdf3afb
2021-03-03 19:29:49 +09:00
TELK
6f4d45f61f
Update: Korean - GUI setting for shading trees on slopes
2021-03-03 19:19:37 +09:00
TELK
3b135935c7
Change: Improve Korean translation
2021-03-03 19:19:37 +09:00
Jonathan G Rennison
7e62af94ee
Remove OVEERIDE macro
2021-03-02 23:45:08 +00:00
Jonathan G Rennison
865cf79915
Fix missing override keywords
2021-03-02 23:45:08 +00:00
Jonathan G Rennison
3e1589eeae
Fix name collision in template replacement enum definition
2021-03-02 23:45:08 +00:00
Jonathan G Rennison
13b34b9917
Fix code style in Town::UpdateLabel
2021-03-02 23:45:08 +00:00
Jonathan G Rennison
3e017ddaa9
Remove unused dirty block size constants
2021-03-02 23:45:08 +00:00
Jonathan G Rennison
32dcc0d484
Linkgraph: Fix unused expression result warning
2021-03-02 23:45:08 +00:00
Jonathan G Rennison
9ca1c04330
Build: Fix use of xmmintrin.h on non-x86 MSVC builds
2021-03-02 22:57:29 +00:00
Jonathan G Rennison
59741b9f3c
CMake: Fix HOST_BINARY_DIR cross compiling
2021-03-02 22:57:29 +00:00
Michael Lutz
937d60f239
Fix #8774 : Black screenshots when using 40bpp-blitter. ( #8791 )
...
This affected all screenshot types that render to an off-screen
buffer and don't copy the actual screen contents.
2021-03-02 20:55:39 +01:00
translators
95462493ef
Update: Translations from eints
...
english (us): 4 changes by 2TallTyler
italian: 4 changes by troccoli
serbian: 251 changes by nkrs
german: 6 changes by ebla71, 2 changes by Wuzzy2
romanian: 3 changes by ALEX11BR
russian: 11 changes by Ln-Wolf
ukrainian: 2 changes by StepanIvasyn
lithuanian: 15 changes by devbotas
spanish: 2 changes by perezdidac
2021-03-02 18:56:54 +00:00
Jonathan G Rennison
2df9c97884
Revert "Change: Zero out the gameloop timers when the game is paused"
...
This reverts commit 64686b53ff
.
2021-03-02 18:55:30 +00:00
Jonathan G Rennison
f81c71e15b
OpenGL: Temporarily reduce OpenGL driver priorities
2021-03-02 14:10:39 +00:00
Jonathan G Rennison
84a7ab180e
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/company_cmd.cpp
# src/lang/greek.txt
# src/table/settings.ini
2021-03-02 13:46:42 +00:00
Jonathan G Rennison
fdfd9753d6
Fix tree shading with 40bpp blitter
2021-03-02 13:38:59 +00:00
Jonathan G Rennison
f4e29071be
Merge tag '1.11.0-beta2' into jgrpp
...
# Conflicts:
# .github/workflows/ci-build.yml
# .github/workflows/release.yml
# CMakeLists.txt
# src/blitter/32bpp_optimized.cpp
# src/debug.cpp
# src/gfx.cpp
# src/gfx_func.h
# src/lang/czech.txt
# src/lang/english.txt
# src/lang/italian.txt
# src/lang/swedish.txt
# src/lang/ukrainian.txt
# src/network/network_server.cpp
# src/os/windows/crashlog_win.cpp
# src/os/windows/win32.cpp
# src/pathfinder/follow_track.hpp
# src/screenshot.cpp
# src/settings_type.h
# src/spritecache.cpp
# src/vehicle_gui.cpp
# src/video/sdl2_v.cpp
# src/video/video_driver.cpp
# src/video/video_driver.hpp
# src/video/win32_v.cpp
2021-03-02 11:59:03 +00:00
Michael Lutz
c656633bea
Fix #8775 : [Win32] Don't create the main window when alt-tabbing back into fullscreen.
2021-03-01 23:41:39 +01:00
Michael Lutz
b7a44983b4
Fix: [Win32] Original window size was lost when tabbing in and out of fullscreen.
2021-03-01 23:41:39 +01:00
Patric Stout
74aa934441
Codechange: validate that "max" value of settings fit in their storage
...
This is an easy mistake to make, so protect us against making such
mistakes, by validating it doesn't happen.
2021-03-01 23:17:47 +01:00
Patric Stout
d7a70c67ba
Fix: old snow_line_height had a higher maximum value than could be stored
...
So any old game made with this setting was overflowing anyway;
not really a lot we can do about that now.
2021-03-01 23:17:47 +01:00
Patric Stout
a0c298a539
Fix: three max-values for settings could exceed their storage size
2021-03-01 23:17:47 +01:00
Patric Stout
abac4b1758
Fix c4df0f95
: bootstrap was only showing a black screen ( #8788 )
...
The bootstrap has the _switch_mode to SM_MENU, and never leaves
this mode. Neither is it considered a modal window (while in some
sense it really is). So .. we need to add another "draw anyway"
exception, to make sure bootstrap is being drawn.
2021-03-01 23:17:30 +01:00
Limyx826
47e899cf75
Add: Malaysia Ringgit as Currency
...
Cause why not
*Update the formating
2021-03-01 21:56:26 +00:00
Charles Pigott
64686b53ff
Change: Zero out the gameloop timers when the game is paused
2021-03-01 21:55:51 +00:00
Charles Pigott
ef5cea0e06
Change: De-limit framerate window's framerate
2021-03-01 21:55:51 +00:00
Owen Rudge
838fd61f29
Fix: [OSX] Hide dock when entering fullscreen
2021-03-01 21:03:18 +00:00
Jonathan G Rennison
44d786d8ce
MinGW: Fix define fallback for missing SHGFP_TYPE_CURRENT
2021-03-01 19:18:46 +00:00
Jonathan G Rennison
a7ed477185
Log savegame compression format used at debug level sl 3
2021-03-01 19:06:25 +00:00