Merge remote-tracking branch 'origin/master'

shaders/StylishShaders/HorizontalProgressBarGradientSquareFrag.glsl

@@ -15,7 +15,7 @@ void main()
     vec4 colorTemp = color;
     float ouverture = 0.8f;
     // Effet "tube"
-    float lum = -pow(fragCoord.y + height/2f, 2f) * 5f /height + ouverture;
+    float lum = -pow(fragCoord.y + height/2.0f, 2.0f) * 5.0f /height + ouverture;
     colorTemp.xyz *= lum;
 
     // Effet flash sur la surface
@@ -27,14 +27,14 @@ void main()
             FragColor = colorTemp;
         }
         else {
-            FragColor = vec4(0f);
+            FragColor = vec4(0.0f);
         }
     } else {
         if (fill < fragCoord.x){
             FragColor = colorTemp;
         }
         else {
-            FragColor = vec4(0f);
+            FragColor = vec4(0.0f);
         }
     }
 

src/engine/input/GamepadInput.java

@@ -107,8 +107,8 @@ public class GamepadInput {
         return new Vector3f(x,y);
     }
 
-    public int getGamepadName(){
-        return  this.gamepadNum;
+    public String getGamepadName(){
+        return glfwGetGamepadName(this.gamepadNum);
     }
 	
 }