Version 1.19-release
parent
62f8a63265
commit
4e9dd3f1a7
|
@ -9,8 +9,8 @@ android {
|
|||
applicationId 'com.multicraft.game'
|
||||
minSdkVersion 19
|
||||
targetSdkVersion 31
|
||||
versionCode 170
|
||||
versionName "1.16.0"
|
||||
versionCode 200
|
||||
versionName "1.19.0"
|
||||
}
|
||||
|
||||
// load properties
|
||||
|
@ -66,10 +66,10 @@ dependencies {
|
|||
implementation project(':native')
|
||||
|
||||
/* Third-party libraries */
|
||||
implementation 'androidx.appcompat:appcompat:1.3.1'
|
||||
implementation 'androidx.appcompat:appcompat-resources:1.3.1'
|
||||
implementation 'androidx.appcompat:appcompat:1.4.0'
|
||||
implementation 'androidx.appcompat:appcompat-resources:1.4.0'
|
||||
implementation 'com.google.android.material:material:1.4.0'
|
||||
implementation 'io.reactivex.rxjava3:rxjava:3.0.13'
|
||||
implementation 'io.reactivex.rxjava3:rxandroid:3.0.0'
|
||||
implementation 'net.lingala.zip4j:zip4j:2.9.0'
|
||||
implementation 'net.lingala.zip4j:zip4j:2.9.1'
|
||||
}
|
||||
|
|
|
@ -59,7 +59,6 @@ import io.reactivex.rxjava3.disposables.Disposable
|
|||
import io.reactivex.rxjava3.schedulers.Schedulers
|
||||
import java.io.File
|
||||
import java.io.IOException
|
||||
import java.util.*
|
||||
|
||||
class MainActivity : AppCompatActivity() {
|
||||
private lateinit var binding: ActivityMainBinding
|
||||
|
|
|
@ -34,7 +34,6 @@ import net.lingala.zip4j.model.LocalFileHeader
|
|||
import java.io.File
|
||||
import java.io.FileInputStream
|
||||
import java.io.IOException
|
||||
import java.util.*
|
||||
|
||||
class UnzipService : JobIntentService() {
|
||||
private val id = 1
|
||||
|
|
|
@ -7,9 +7,9 @@ buildscript {
|
|||
maven { url 'https://plugins.gradle.org/m2/' }
|
||||
}
|
||||
dependencies {
|
||||
classpath 'com.android.tools.build:gradle:7.0.3'
|
||||
classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.31'
|
||||
classpath 'de.undercouch:gradle-download-task:4.1.1'
|
||||
classpath 'com.android.tools.build:gradle:7.0.4'
|
||||
classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10'
|
||||
classpath 'de.undercouch:gradle-download-task:4.1.2'
|
||||
// NOTE: Do not place your application dependencies here; they belong
|
||||
// in the individual module build.gradle files
|
||||
}
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#Mon Sep 13 14:41:51 CEST 2021
|
||||
#Mon Dec 27 10:51:18 CET 2021
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
|
||||
distributionPath=wrapper/dists
|
||||
zipStorePath=wrapper/dists
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
|
|
|
@ -249,7 +249,7 @@ LOCAL_SRC_FILES += ../../../lib/luautf8/lutf8lib.c
|
|||
|
||||
LOCAL_STATIC_LIBRARIES += Curl Gettext Freetype Irrlicht LevelDB OpenAL mbedTLS mbedx509 mbedcrypto Vorbis LuaJIT android_native_app_glue $(PROFILER_LIBS)
|
||||
|
||||
LOCAL_LDLIBS := -lEGL -lGLESv1_CM -lGLESv2 -landroid -lOpenSLES
|
||||
LOCAL_LDLIBS := -lEGL -lGLESv1_CM -lGLESv2 -landroid -lOpenSLES -lz
|
||||
|
||||
include $(BUILD_SHARED_LIBRARY)
|
||||
|
||||
|
|
|
@ -103,6 +103,11 @@ local function get_formspec()
|
|||
menu_render_worldlist() ..
|
||||
";" .. index .. "]"
|
||||
|
||||
if PLATFORM == "Android" then
|
||||
retval = retval .. "image_button[10.6,-0.1;1.5,1.5;" ..
|
||||
core.formspec_escape(defaulttexturedir) .. "gift_btn.png;upgrade;;true;false;" ..
|
||||
core.formspec_escape(defaulttexturedir) .. "gift_btn_pressed.png]"
|
||||
end
|
||||
|
||||
if PLATFORM ~= "Android" and PLATFORM ~= "iOS" then
|
||||
retval = retval ..
|
||||
|
@ -245,6 +250,10 @@ local function main_button_handler(this, fields, name)
|
|||
return true
|
||||
end
|
||||
|
||||
if fields["upgrade"] then
|
||||
core.upgrade("")
|
||||
end
|
||||
|
||||
--[[if fields["world_configure"] ~= nil then
|
||||
local selected = core.get_table_index("sp_worlds")
|
||||
if selected ~= nil then
|
||||
|
|
|
@ -109,12 +109,6 @@ bool MyEventReceiver::OnEvent(const SEvent &event)
|
|||
if (event.MouseInput.Event == EMIE_RMOUSE_LEFT_UP) {
|
||||
rightreleased = true;
|
||||
}
|
||||
#if defined(__MACH__) && defined(__APPLE__) && !defined(__IOS__)
|
||||
if (event.MouseInput.Event == EMIE_MOUSE_WHEEL_X) {
|
||||
mouse_wheel -= event.MouseInput.Wheel;
|
||||
return true;
|
||||
}
|
||||
#endif
|
||||
if (event.MouseInput.Event == EMIE_MOUSE_WHEEL) {
|
||||
mouse_wheel += event.MouseInput.Wheel;
|
||||
}
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
#define PROJECT_NAME_C "MultiCraft"
|
||||
#define STATIC_SHAREDIR ""
|
||||
#define VERSION_MAJOR 1
|
||||
#define VERSION_MINOR 17
|
||||
#define VERSION_MINOR 19
|
||||
#define VERSION_PATCH 0
|
||||
#define VERSION_STRING STR(VERSION_MAJOR) "." STR(VERSION_MINOR) "." STR(VERSION_PATCH)
|
||||
#endif
|
||||
|
|
|
@ -884,19 +884,9 @@ bool GUITable::OnEvent(const SEvent &event)
|
|||
core::position2d<s32> p(event.MouseInput.X, event.MouseInput.Y);
|
||||
|
||||
if (event.MouseInput.Event == EMIE_MOUSE_WHEEL) {
|
||||
#if defined(__MACH__) && defined(__APPLE__) && !defined(__IOS__)
|
||||
// looks awful, works same
|
||||
float wheel = event.MouseInput.Wheel;
|
||||
if (wheel > 0.01) wheel = 2;
|
||||
else if (wheel < -0.01) wheel = -2;
|
||||
m_scrollbar->setPos(m_scrollbar->getPos() +
|
||||
(s32) wheel *
|
||||
- (s32) m_rowheight / 2);
|
||||
#else
|
||||
m_scrollbar->setPos(m_scrollbar->getPos() +
|
||||
(event.MouseInput.Wheel < 0 ? -3 : 3) *
|
||||
- (s32) m_rowheight / 2);
|
||||
#endif
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
Binary file not shown.
After Width: | Height: | Size: 68 B |
Binary file not shown.
After Width: | Height: | Size: 68 B |
Loading…
Reference in New Issue