mirrors/Mindustry
1
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2026-03-15 19:30:51 -07:00
Code Issues 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
commit b721d7a10f
109 changed files with 1495 additions and 1370 deletions
Download patch file Download diff file Expand all files Collapse all files

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?
}
}
}