Merge branch 'master' of github.com:restorer/gloomy-dungeons-2

README.md

@@ -8,6 +8,11 @@ Second part still use wolf-like engine (but *not* raycasting), but this time eng
   - Extruded ceiling and doors
   - Rocket launcher
 
+<a href="https://f-droid.org/packages/org.zamedev.gloomydungeons2.opensource" target="_blank">
+<img src="https://f-droid.org/badge/get-it-on.png" alt="Get it on F-Droid" height="100"/></a>
+<a href="https://play.google.com/store/apps/details?id=org.zamedev.gloomydungeons2.fullnfree" target="_blank">
+<img src="https://play.google.com/intl/en_us/badges/images/generic/en-play-badge.png" alt="Get it on Google Play" height="100"/></a>
+
 Credits, as usual:
 
   - Code: restorer

build.gradle

@@ -3,10 +3,11 @@
 buildscript {
     repositories {
         mavenCentral()
+        jcenter()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.5.0'
+        classpath 'com.android.tools.build:gradle:2.2.3'
     }
 }
 
@@ -21,8 +22,8 @@ allprojects {
 }
 
 android {
-    compileSdkVersion Integer.parseInt(project.ANDROID_BUILD_SDK_VERSION)
-    buildToolsVersion project.ANDROID_BUILD_TOOLS_VERSION
+    compileSdkVersion 22
+    buildToolsVersion '25.0.2'
     // useLibrary 'org.apache.http.legacy'
 
     defaultConfig {
@@ -122,7 +123,7 @@ android {
 dependencies {
     compile project(':libraries:holoeverywhere')
     compile project(':libraries:holoeverywhere-preferences')
-    compile fileTree(dir: 'src/main/libs', include: ['*.jar'])
+    compile fileTree(include: ['*.jar'], dir: 'src/main/libs')
     withgplayCompile fileTree(dir: 'src/withgplay/libs', include: ['*.jar'])
     withzeemoteCompile fileTree(dir: 'src/withzeemote/libs', include: ['*.jar'])
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Fri Dec 04 18:38:18 MSK 2015
+#Tue Mar 21 17:38:00 MSK 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.8-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip

src/main/java/zame/game/engine/Game.java

@@ -384,7 +384,9 @@ public void hitHero(int hits, Monster mon) {
 			return;
 		}
 
-		overlay.showOverlay(Overlay.BLOOD);
+		// overlay.showOverlay(Overlay.BLOOD);
+
+		overlay.showHitSide(mon.x, mon.y);
 
 		if (!state.godMode && nextLevelTime == 0) {
 			if (state.heroArmor > 0) {
@@ -1110,6 +1112,7 @@ protected void render(GL10 gl) {
 		}
 
 		overlay.renderOverlay(gl);
+		overlay.renderHitSide(gl);
 
 		if (!engine.inWallpaperMode) {
 			engine.stats.render(gl);