Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Anuken/Mindustry into rendering-optimizations

Browse Source 
# Conflicts:
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/src/io/anuke/mindustry/core/Renderer.java
#	core/src/io/anuke/mindustry/entities/units/types/Drone.java
#	core/src/io/anuke/mindustry/graphics/CacheLayer.java
#	core/src/io/anuke/mindustry/world/blocks/Floor.java
This commit is contained in:
Anuken
2018-11-26 13:23:38 -05:00
parent 46c6b2168c ef85d1d83e
commit b721d7a10f
109 changed files with 1495 additions and 1370 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
android/AndroidManifest.xml
View File

@@ -20,7 +20,7 @@
<activity
android:name="io.anuke.mindustry.AndroidLauncher"
android:label="@string/app_name"
android:screenOrientation="user"
android:screenOrientation="sensor"
android:configChanges="keyboard|keyboardHidden|orientation|screenSize|screenLayout">
<intent-filter>

2
android/build.gradle
View File

@@ -93,7 +93,7 @@ android {
applicationId "io.anuke.mindustry"
minSdkVersion 14
targetSdkVersion 27
targetSdkVersion 28
versionCode code
versionName versionNameResult
}

1
android/src/io/anuke/mindustry/DonationsActivity.java
View File

@@ -68,7 +68,6 @@ public class DonationsActivity extends FragmentActivity{
Fragment fragment = fragmentManager.findFragmentByTag("donationsFragment");
if(fragment != null){
fragment.onActivityResult(requestCode, resultCode, data);
//TODO donation event, set settings?
}
}
}