Android inset support, API level upgrade & editor inset fix
This commit is contained in:
@@ -30,8 +30,8 @@ task deploy(type: Copy){
|
|||||||
|
|
||||||
android{
|
android{
|
||||||
namespace = "io.anuke.mindustry"
|
namespace = "io.anuke.mindustry"
|
||||||
buildToolsVersion = '34.0.0'
|
buildToolsVersion = '36.0.0'
|
||||||
compileSdk = 34
|
compileSdk = 36
|
||||||
sourceSets{
|
sourceSets{
|
||||||
main{
|
main{
|
||||||
manifest.srcFile 'AndroidManifest.xml'
|
manifest.srcFile 'AndroidManifest.xml'
|
||||||
@@ -57,7 +57,7 @@ android{
|
|||||||
|
|
||||||
applicationId "io.anuke.mindustry"
|
applicationId "io.anuke.mindustry"
|
||||||
minSdkVersion 14
|
minSdkVersion 14
|
||||||
targetSdkVersion 34
|
targetSdkVersion 36
|
||||||
|
|
||||||
versionName versionNameResult
|
versionName versionNameResult
|
||||||
versionCode = vcode
|
versionCode = vcode
|
||||||
|
|||||||
@@ -90,6 +90,9 @@ public class EditorRenderer implements Disposable{
|
|||||||
boolean prev = renderer.animateWater;
|
boolean prev = renderer.animateWater;
|
||||||
renderer.animateWater = false;
|
renderer.animateWater = false;
|
||||||
|
|
||||||
|
Tmp.m4.set(Draw.trans());
|
||||||
|
Draw.trans().idt();
|
||||||
|
|
||||||
Tmp.v3.set(Core.camera.position);
|
Tmp.v3.set(Core.camera.position);
|
||||||
Core.camera.position.set(world.width()/2f * tilesize, world.height()/2f * tilesize);
|
Core.camera.position.set(world.width()/2f * tilesize, world.height()/2f * tilesize);
|
||||||
Core.camera.width = 999999f;
|
Core.camera.width = 999999f;
|
||||||
@@ -144,7 +147,9 @@ public class EditorRenderer implements Disposable{
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
Core.camera.position.set(Tmp.v3);
|
Core.camera.position.set(Tmp.v3);
|
||||||
|
Draw.trans(Tmp.m4);
|
||||||
}
|
}
|
||||||
|
|
||||||
void updateStatic(int x, int y){
|
void updateStatic(int x, int y){
|
||||||
|
|||||||
@@ -26,4 +26,4 @@ org.gradle.caching=true
|
|||||||
org.gradle.internal.http.socketTimeout=100000
|
org.gradle.internal.http.socketTimeout=100000
|
||||||
org.gradle.internal.http.connectionTimeout=100000
|
org.gradle.internal.http.connectionTimeout=100000
|
||||||
android.enableR8.fullMode=false
|
android.enableR8.fullMode=false
|
||||||
archash=caf89c8fee
|
archash=cde6d76804
|
||||||
|
|||||||
Reference in New Issue
Block a user