Commit Graph

49748 Commits

Author SHA1 Message Date
Pavel Stupnikov
ba4626d450 Add: new economy "frozen" that stops production changes and industry closures (#8282)
(cherry picked from commit c9fd85528a)
2020-12-27 20:32:34 +00:00
Patric Stout
488187a423 Fix: next 67 savegame versions are used in PatchPacks; skip them (#8411)
Various of PatchPacks (Spring 2013, Joker, ChillPP) used versions
slightly higher than ours. Of course, as time went by, this
caught up with us, and we are now almost pushing a new version
that would conflict with them. To avoid users creating unneeded
issues about "why can I not load my savegame", lets be ahead of
the curve and flat-out refuse to load them.

Version-wise, this is totally fine. We have ~32k versions to go
before we run out (0x8000 is masked by JGRPP; we should avoid
using that). At the rate we bump savegames, this is not going to
happen in any sane reality.

(cherry picked from commit d8c8f4e72d)
2020-12-27 20:29:25 +00:00
Jonathan G Rennison
483ed2f468 Merge branch 'master' into jgrpp
# Conflicts:
#	.github/workflows/ci-build.yml
#	.github/workflows/commit-checker.yml
#	src/openttd.cpp
2020-12-27 20:16:16 +00:00
Jonathan G Rennison
aefefb61c2 Fix GetSpriteMainColour with non-default zoom sprites
This fixes viewport map mode with extra zoom ground tile sets
2020-12-27 03:03:05 +00:00
Jonathan G Rennison
ad5a97b7a1 Add console command to dump cargo types 2020-12-27 00:44:55 +00:00
Jonathan G Rennison
9906916b7b Debug: Include aircraft fields and station XY in debug window 2020-12-27 00:43:39 +00:00
Jonathan G Rennison
e5d4fab138 Debug: Fix disabling auto-refresh not updating button 2020-12-26 20:12:22 +00:00
Jonathan G Rennison
3f3d5c106f Console: Add commands for conditional execution from game date 2020-12-26 12:06:31 +00:00
Jonathan G Rennison
5fe5884613 Debug: Add experimental command to switch baseset 2020-12-26 10:54:01 +00:00
Jonathan G Rennison
78b06ddc40 TBTR: Fix palette recolouring of templates
Fix group overrides affecting template image when cloning vehicle
Update template when changing company colours

Update template images on demand instead of at load
2020-12-26 09:37:26 +00:00
Jonathan G Rennison
369c98e3e0 TBTR: Fix editing a template not refitting the head and artic/dual parts 2020-12-26 09:08:43 +00:00
Jonathan G Rennison
7b445cd436 Debug: Show vehicle cargo subtype in debug window 2020-12-26 08:51:37 +00:00
Jonathan G Rennison
3ea0ffa46b Debug: Add auto-refresh functionality to the debug window 2020-12-24 19:43:41 +00:00
Jonathan G Rennison
c82f31bf03 Fix industry production scaling of periodic production callback 2020-12-24 19:11:10 +00:00
Jonathan G Rennison
5665d88067 Debug: Industries are now always inspectable in the debug window 2020-12-24 19:09:57 +00:00
Jonathan G Rennison
7b75fcf487 Show industry production callback mask values in industry debug window 2020-12-23 23:03:56 +00:00
Jonathan G Rennison
8ac436f507 Add setting to scale primary industry cargo production 2020-12-21 20:47:44 +00:00
Jonathan G Rennison
c7fa284db4 Move scale factor setting scaling to common function 2020-12-21 20:43:14 +00:00
Jonathan G Rennison
bfbd2de477 Fix decimal settings not permitting typing a '-' character 2020-12-21 20:34:38 +00:00
Jonathan G Rennison
93e7899c7f Debug: Show cargo in/out values in industry debug window 2020-12-21 20:30:04 +00:00
Jonathan G Rennison
f0c3a4b42e Saveload: Store NewGRF name in savegame, include in missing GRF message 2020-12-16 02:06:48 +00:00
Jonathan G Rennison
d328f359c9 Add string function to strip all SCC characters 2020-12-16 02:04:57 +00:00
Jonathan G Rennison
207c79a736 Saveload: Fix SLE*_CONDSSTR* macros 2020-12-16 01:31:46 +00:00
Jonathan G Rennison
d818630c34 Debug: Show company ratings in town debug window 2020-12-15 17:57:53 +00:00
Jonathan G Rennison
8b94d92158 CMake: Suppress warning messages when Fcitx is not found 2020-12-15 17:47:57 +00:00
Patric Stout
b7851e51ad Fix: set SP_WORKING_DIR earlier with '-c'
On Windows, relative folders don't work so well. So we need to
lookup the full path. This is best done in DetermineBasePaths()
and as a bonus that only sets SP_WORKING_DIR once.
2020-12-13 22:45:50 +01:00
Michael Lutz
a660dce295 Fix: [CMake, MSVC] Don't copy regression exe's into a subfolder as they need have their lang files next to them. 2020-12-13 22:45:50 +01:00
Patric Stout
abb746fae3
Fix: [Actions] cleanup ci-build workflow to be up-to-date (#8375)
Also, while at it, make it more like the upcoming release-workflow,
so they look a lot more similar.

Functional it should be the same, except that Windows should
now also output when a test fails.
2020-12-13 22:32:44 +01:00
Patric Stout
5d0331ecdc
Fix 8bef06a2: don't use "extern" when you want to implement a global (#8373) 2020-12-13 16:56:33 +01:00
Patric Stout
da7c74ba7e Fix: change the working-dir searchpath when using '-c'
Basically, with '-c' you now create a sandbox. It will still use
your personal-dir and global-dir to find files you installed there,
but all new files are stored with a base folder identical to the
folder the configuration is in.

This is a bit of an old bug, that we many have tried to solve in
various of different ways. The code has grown sufficiently complex
that it is hard to see what consequences of actions are. This is
in my opinion the most harmless solution, while increasing the
usefulness of the '-c' flag.

In essence, the problem was that empty folders were always created
in the directory where the configuration was, but as that directory
wasn't added to any searchpath, files weren't stored there, unless
by accident it was a folder already on the searchpath. For example,
if you do './openttd -c local.cfg', it did work as expected. But
in the more generic variant, it did not.

With this patch, you can run './openttd -c /new/folder/local.cfg',
and it will create and prepare that folder to receive new files.

'content_download' is also stored in the directory the
configuration is in; this was already the case. Important to
note that there is only one search-path for 'content_download'.
In other words, when using '-c', it will not look in '~/.openttd'
inside the 'content_download' folder.
2020-12-13 16:40:56 +01:00
Patric Stout
4e12aac9c0 Codechange: to create or not to create a folder, that is the question
This was just weird. With XDG _personal_dir was created already,
but later on it was checked if it was different from config_dir,
and the creation was skipped. All this checking and validation
makes my head spin .. let's make it a bit more simple.
2020-12-13 16:40:56 +01:00
Jonathan G Rennison
5aac3d71ee Github: Remove regression tests from build workflow 2020-12-13 15:32:29 +00:00
Jonathan G Rennison
0d46b5e88a Github: Remove commit checker workflow 2020-12-13 15:32:11 +00:00
Patric Stout
c66bd18a10
Add: save openttd.cfg immediately on changing a setting (#8358)
Formally it was only done on exit. This means that if it crashes
changes in settings were not stored. This is often rather
frustrating. Additionally, targets (like emscripten) where people
are unlike to use "Exit Game", will never see their configuration
stored.

The drawback is that on every setting change there is some minor
I/O of writing the ini file to disk again.
2020-12-13 16:28:06 +01:00
Yourself
cbaceb62d2 Fix: overflow in CloneVehicleName 2020-12-12 14:37:17 -08:00
translators
40edc2863c Update: Translations from eints
finnish: 1 change by hpiirai
2020-12-12 17:52:42 +00:00
glx22
6fae0b83d9 Add: [CMake] targets to generate documentation 2020-12-12 15:48:04 +01:00
Jonathan G Rennison
bad2cd0677 CMake: Do not look for fctix on Apple 2020-12-12 00:10:52 +00:00
Jonathan G Rennison
a64b4c794c Documentation: Improve formatting of low-level changes doc 2020-12-10 19:37:54 +00:00
translators
7f5afbfdf5 Update: Translations from eints
slovak: 2 changes by FuryPapaya
2020-12-10 17:53:08 +00:00
glx22
e2eafd86de Fix: Prevent infinite recursion in commit checker 2020-12-10 01:08:44 +01:00
Jonathan G Rennison
6ecf232edd Fix rendering artefacts in colour news window viewports
Off by one error in applying dimming recolour created
doubly-dimmed lines on dirty block redrawing boundaries.
2020-12-09 22:56:49 +00:00
translators
20151e41ea Update: Translations from eints
korean: 1 change by telk5093
french: 1 change by glx22
2020-12-09 17:50:24 +00:00
translators
819ce1bf49 Update: Translations from eints
slovak: 30 changes by FuryPapaya
lithuanian: 37 changes by devastatorius
2020-12-09 13:42:08 +00:00
Owen Rudge
535e18b54e Change: Don't display OS name when the user is exiting the game 2020-12-09 09:21:34 +00:00
Patric Stout
2864d019f0
Fix: useless warning with -snull and no BaseSounds available (#8361)
If I explicitly tell the system I do not want sound, I still get
presented a nice message I do not have any BaseSounds available
on my system, and that I should download one to enjoy sound. Well,
let me tell you, with "-snull" that is really really not going to
help. So please, be quiet, and let me enjoy the game without
"boooooo" and "DING DING DING".

Thank you.
2020-12-08 10:24:59 +01:00
Owen Rudge
6e689e2038 Fix: FreeType is still required on macOS 2020-12-08 09:24:15 +00:00
Jonathan G Rennison
840e459601 Revert "Fix 63ccb36ef3: Crash trying to load TTO/TTD savegames. (#8356)"
This is not necessary due to 5243cfd6d0.

This reverts commit c558936ec3.
2020-12-07 18:19:54 +00:00
Jonathan G Rennison
4436da7436 Saveload: Skip GetVariableAddress asserts if _DEBUG not defined 2020-12-07 18:12:33 +00:00
Jonathan G Rennison
4da3cfcf56 Merge branch 'master' into jgrpp
# Conflicts:
#	CMakeLists.txt
#	src/bootstrap_gui.cpp
2020-12-07 17:56:44 +00:00