Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
ce1439003b
@ -81,8 +81,8 @@ public class match {
|
||||
private static UIElementText roundWon;
|
||||
|
||||
// Debug
|
||||
public static boolean showP1Hitbox = false; // TODO modifier pour le rendre activable
|
||||
public static boolean showP2Hitbox = false;
|
||||
public static boolean showP1Hitbox;
|
||||
public static boolean showP2Hitbox;
|
||||
private static List<Hitbox> listHitboxObj = new ArrayList<>();
|
||||
private static float slowFactor = 1f;
|
||||
private static long timeStampFpsCounter;
|
||||
@ -175,6 +175,8 @@ public class match {
|
||||
character1 = (String) settings.get("character1");
|
||||
character2 = (String) settings.get("character2");
|
||||
stage = (String) settings.get("stage");
|
||||
showP1Hitbox = Boolean.parseBoolean((String) settings.get("hitboxes"));
|
||||
showP2Hitbox = showP1Hitbox;
|
||||
} catch (ParseException | IOException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user