Merge tag '15.0-beta3' into openttd

This commit is contained in:
dP
2025-09-01 23:08:18 +05:00
900 changed files with 37551 additions and 26727 deletions

View File

@@ -7,11 +7,11 @@
/** @file rev.cpp Autogenerated file with the revision and such of OpenTTD. */
#include "/home/dp/Downloads/openttd-15.0-beta2/src/stdafx.h"
#include "/home/dp/Downloads/openttd-15.0-beta2/src/core/bitmath_func.hpp"
#include "/home/dp/Downloads/openttd-15.0-beta2/src/rev.h"
#include "/tmp/tmp.dmyBCceCMb/openttd-15.0-beta3/src/stdafx.h"
#include "/tmp/tmp.dmyBCceCMb/openttd-15.0-beta3/src/core/bitmath_func.hpp"
#include "/tmp/tmp.dmyBCceCMb/openttd-15.0-beta3/src/rev.h"
#include "/home/dp/Downloads/openttd-15.0-beta2/src/safeguards.h"
#include "/tmp/tmp.dmyBCceCMb/openttd-15.0-beta3/src/safeguards.h"
/**
* Is this version of OpenTTD a release version?
@@ -35,7 +35,7 @@ bool IsReleasedVersion()
*
* <modified> shows a "M", if the binary is made from modified source code.
*/
const char _openttd_revision[] = "15.0-beta2";
const std::string _openttd_revision = "15.0-beta3";
/**
* The text version of OpenTTD's build date.
@@ -43,17 +43,17 @@ const char _openttd_revision[] = "15.0-beta2";
* updated for each revision in contrary to most other files that only see
* updates when they are actually changed themselves.
*/
const char _openttd_build_date[] = __DATE__ " " __TIME__;
const std::string_view _openttd_build_date = __DATE__ " " __TIME__;
/**
* The git revision hash of this version.
*/
const char _openttd_revision_hash[] = "369983846a82bdd87e911bdd940ec49f3316c6ac";
const std::string_view _openttd_revision_hash = "24a4a1652b572c4c07dc97bc7efcbf9d391be7d2";
/**
* The year of this version.
*/
const char _openttd_revision_year[] = "2025";
const std::string_view _openttd_revision_year = "2025";
/**
* Let us know if current build was modified. This detection
@@ -77,7 +77,7 @@ const uint8_t _openttd_revision_tagged = 1;
* It should never contain things like "beta", but only the release version
* we are compatible with.
*/
const char _openttd_content_version[] = "15.0";
const std::string_view _openttd_content_version = "15.0";
/**
* The NewGRF revision of OTTD: