Rativel/jeu-de-combat
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
no 2021-06-24 12:45:42 +02:00
commit ce1439003b
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/gameplay/match/match.java
View File

@ -81,8 +81,8 @@ public class match {
private static UIElementText roundWon; private static UIElementText roundWon;
// Debug // Debug
public static boolean showP1Hitbox = false; // TODO modifier pour le rendre activable public static boolean showP1Hitbox;
public static boolean showP2Hitbox = false; public static boolean showP2Hitbox;
private static List<Hitbox> listHitboxObj = new ArrayList<>(); private static List<Hitbox> listHitboxObj = new ArrayList<>();
private static float slowFactor = 1f; private static float slowFactor = 1f;
private static long timeStampFpsCounter; private static long timeStampFpsCounter;
@ -175,6 +175,8 @@ public class match {
character1 = (String) settings.get("character1"); character1 = (String) settings.get("character1");
character2 = (String) settings.get("character2"); character2 = (String) settings.get("character2");
stage = (String) settings.get("stage"); stage = (String) settings.get("stage");
showP1Hitbox = Boolean.parseBoolean((String) settings.get("hitboxes"));
showP2Hitbox = showP1Hitbox;
} catch (ParseException | IOException e) { } catch (ParseException | IOException e) {
e.printStackTrace(); e.printStackTrace();
} }