Compare commits
3 Commits
8be6e381d8
...
0.6.1-alph
| Author | SHA1 | Date | |
|---|---|---|---|
| 09cc2ceee4 | |||
| 7620d49489 | |||
| 381ef354c6 |
@@ -4,12 +4,11 @@ namespace Common {
|
||||
|
||||
std::string getGameVersionString(const std::string& versionSuffix /* = "" */)
|
||||
{
|
||||
std::string result = std::string("v0.6.1") + versionSuffix;
|
||||
std::string result = std::string("v0.1.0 (forked from v0.6.1 alpha)") + versionSuffix;
|
||||
// append 64-bit port marker only on Android 64‑bit targets
|
||||
#if defined(ANDROID) && (defined(__aarch64__) || defined(__x86_64__))
|
||||
result += " (64-bit port)";
|
||||
result += " (64-bit)";
|
||||
#endif
|
||||
result += " alpha";
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
@@ -293,7 +293,7 @@ void Minecraft::setLevel(Level* level, const std::string& message /* ="" */, Loc
|
||||
|
||||
level->ops.emplace(op);
|
||||
_hasSignaledGeneratingLevelFinished = false;
|
||||
#ifdef STANDALONE_SERVER
|
||||
#if defined(STANDALONE_SERVER) || defined(PLATFORM_WEB)
|
||||
const bool threadedLevelCreation = false;
|
||||
#else
|
||||
const bool threadedLevelCreation = true;
|
||||
|
||||
@@ -65,17 +65,13 @@ OptionBool useVignette("useVignette", true);
|
||||
OptionBool useTouchscreen("useTouchscreen", true);
|
||||
|
||||
OptionBool serverVisible("servervisible", true);
|
||||
#ifndef __APPLE__
|
||||
OptionBool foliageTint("foliagetint", false);
|
||||
#endif
|
||||
OptionInt fogType("fogType", 0, 0, 2);
|
||||
|
||||
OptionBool javaHud("javaHud", false);
|
||||
|
||||
OptionBool betaSky("betaSky", false);
|
||||
#ifndef __APPLE__
|
||||
OptionBool tintedSide("tintedSide", false);
|
||||
#endif
|
||||
OptionBool blockOutline("blockOutline", false);
|
||||
|
||||
OptionBool restoredAnims("restoredAnims", true);
|
||||
@@ -199,18 +195,14 @@ void Options::initTable() {
|
||||
m_options[OPTIONS_BAR_ON_TOP] = &barOnTop;
|
||||
m_options[OPTIONS_ALLOW_SPRINT] = &allowSprint;
|
||||
m_options[OPTIONS_RPI_CURSOR] = &rpiCursor;
|
||||
#ifndef __APPLE__
|
||||
m_options[OPTIONS_FOLIAGE_TINT] = &foliageTint;
|
||||
#endif
|
||||
// more options yay
|
||||
m_options[OPTIONS_FOG_TYPE] = &fogType;
|
||||
|
||||
m_options[OPTIONS_DEBUG_STYLE] = &debugStyle;
|
||||
|
||||
m_options[OPTIONS_BETA_SKY] = &betaSky;
|
||||
#ifndef __APPLE__
|
||||
m_options[OPTIONS_TINTED_SIDE] = &tintedSide;
|
||||
#endif
|
||||
m_options[OPTIONS_JAVA_HUD] = &javaHud;
|
||||
|
||||
m_options[OPTIONS_AUTOJUMP] = &autoJump;
|
||||
|
||||
@@ -88,15 +88,11 @@ enum OptionId {
|
||||
OPTIONS_LAST_IP,
|
||||
|
||||
OPTIONS_RPI_CURSOR,
|
||||
#ifndef __APPLE__
|
||||
OPTIONS_FOLIAGE_TINT,
|
||||
#endif
|
||||
OPTIONS_FOG_TYPE,
|
||||
OPTIONS_JAVA_HUD,
|
||||
OPTIONS_RESTORED_ANIMS,
|
||||
#ifndef __APPLE__
|
||||
OPTIONS_TINTED_SIDE,
|
||||
#endif
|
||||
OPTIONS_BETA_SKY,
|
||||
OPTIONS_BEAUTIFUL_SKY,
|
||||
OPTIONS_VIGNETTE,
|
||||
|
||||
Reference in New Issue
Block a user