v0.1alpha

nachoverdon · Nov 29, 2018 · 3f6b959 · 3f6b959
1 parent 02b211f
commit 3f6b959
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 18 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
-Logos/
+Logos/
+build/
diff --git a/Melee Stream Scoreboard NetBeans Project/output/output.json b/Melee Stream Scoreboard NetBeans Project/output/output.json
@@ -1,17 +1,13 @@
 {
   "general": {
-    "website": "wfdsfadsfa",
-    "twitch": "afdfdasfdasfads",
-    "round": "L. Quarters",
-    "player1": "Azu",
-    "player2": "bazoo",
-    "player3": "Brail",
-    "player4": "Akif",
-    "bracket": "231123",
-    "bestof": 2,
-    "tournament": "wtf",
-    "caster1": "Dani Norimaki",
-    "caster2": "El_Bardo"
+    "round": "",
+    "player1": "",
+    "player2": "",
+    "player3": "",
+    "player4": "",
+    "bestof": 0,
+    "caster1": "",
+    "caster2": ""
   },
   "players": {
     "player1": {
@@ -21,7 +17,7 @@
         "color": "Vanilla",
         "name": "Bowser"
       },
-      "flag": "ad",
+      "flag": "us",
       "port": 1,
       "name": ""
     },
@@ -32,9 +28,31 @@
         "color": "Vanilla",
         "name": "Bowser"
       },
-      "flag": "ad",
+      "flag": "us",
       "port": 2,
       "name": ""
     }
+  },
+  "crews": {
+    "crew1": {
+      "members": {"player1": {
+        "character": "",
+        "stocksTaken": 0,
+        "name": "Azu",
+        "stocksLeft": 4
+      }},
+      "name": "test",
+      "stocksLeft": 4
+    },
+    "crew2": {
+      "members": {"player1": {
+        "character": "",
+        "stocksTaken": 0,
+        "name": "Akif",
+        "stocksLeft": 4
+      }},
+      "name": "testata",
+      "stocksLeft": 4
+    }
   }
 }
diff --git a/Melee Stream Scoreboard NetBeans Project/src/com/nachoverdon/mss/utils/ComboBoxUtils.java b/Melee Stream Scoreboard NetBeans Project/src/com/nachoverdon/mss/utils/ComboBoxUtils.java
@@ -74,7 +74,7 @@ public static void initCharacters(JComboBox<IconItem> comboBox,
         Arrays.sort(characters);
 
         for (String character : characters) {
-
+            
             IconItem item = new IconItem(
                     character,
                     Icons.getColors().get(character + "Vanilla")

diff --git a/Melee Stream Scoreboard NetBeans Project/src/com/nachoverdon/mss/view/GeneralInfoPanel.form b/Melee Stream Scoreboard NetBeans Project/src/com/nachoverdon/mss/view/GeneralInfoPanel.form
@@ -79,7 +79,7 @@
                   <Component id="labelCaster2" min="-2" pref="255" max="-2" attributes="0"/>
                   <Component id="labelPlayerCam2" min="-2" pref="255" max="-2" attributes="0"/>
               </Group>
-              <EmptySpace max="32767" attributes="0"/>
+              <EmptySpace min="-2" pref="4" max="-2" attributes="0"/>
           </Group>
       </Group>
     </DimensionLayout>

diff --git a/Melee Stream Scoreboard NetBeans Project/src/com/nachoverdon/mss/view/GeneralInfoPanel.java b/Melee Stream Scoreboard NetBeans Project/src/com/nachoverdon/mss/view/GeneralInfoPanel.java
@@ -231,7 +231,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
                         .addComponent(labelBracket, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
                     .addComponent(labelCaster2, javax.swing.GroupLayout.PREFERRED_SIZE, 255, javax.swing.GroupLayout.PREFERRED_SIZE)
                     .addComponent(labelPlayerCam2, javax.swing.GroupLayout.PREFERRED_SIZE, 255, javax.swing.GroupLayout.PREFERRED_SIZE))
-                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+                .addGap(4, 4, 4))
         );
         layout.setVerticalGroup(
             layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)