Merge pull request #142 from j3kstrum/jars

Update jars for MVP

Author: seanbrais

jar-linux/game/CodeCarnage-all.jar

@@ -1,22 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-
 <!--
   ~ Copyright (c) 2017. Licensed under the Apache License 2.0.
   ~ For full copyright, licensing, and sourcing information,
   ~ please refer to the CodeCarnage GitHub repository's README.md file
   ~ (found on https://github.com/j3kstrum/CodeCarnage).
   -->
 
+<?import javafx.scene.control.ProgressBar?>
 <?import javafx.scene.Group?>
 <?import javafx.scene.layout.AnchorPane?>
 <?import javafx.scene.layout.Pane?>
 <AnchorPane xmlns:fx="http://javafx.com/fxml/1" fx:id="pane" maxHeight="-Infinity" maxWidth="-Infinity"
-            minHeight="-Infinity" minWidth="-Infinity" prefHeight="900.0" prefWidth="1600.0"
-            xmlns="http://javafx.com/javafx/8.0.102">
+            minHeight="-Infinity" minWidth="-Infinity" prefHeight="480.0" prefWidth="1600.0"
+            xmlns="http://javafx.com/javafx/8.0.141">
     <children>
         <Group fx:id="group" autoSizeChildren="false"/>
-        <Pane fx:id="imagePane" layoutX="400.0" layoutY="103.0" maxHeight="-Infinity" maxWidth="-Infinity"
-              minHeight="-Infinity" minWidth="-Infinity" prefHeight="480.0" prefWidth="800.0"/>
+        <Pane fx:id="_imagePane" layoutX="6.0" layoutY="14.0" maxHeight="-Infinity" maxWidth="-Infinity"
+              minHeight="-Infinity" minWidth="-Infinity" prefHeight="480.0" prefWidth="800.0">
+            <children>
+                <ProgressBar fx:id="userHeatlh" layoutX="14.0" layoutY="14.0" prefWidth="200.0" progress="0.0"/>
+                <ProgressBar fx:id="opponentHealth" layoutX="580.0" layoutY="9.0" prefWidth="200.0" progress="0.0"/>
+            </children>
+        </Pane>
     </children>
 </AnchorPane>

jar-linux/resources/main/gui/game/game.fxml

@@ -17,7 +17,7 @@
 <?import javafx.scene.text.Font?>
 <StackPane xmlns:fx="http://javafx.com/fxml/1" fx:id="stackPane" maxHeight="-Infinity" maxWidth="-Infinity"
            minHeight="-Infinity" minWidth="-Infinity" prefHeight="303.0" prefWidth="507.0"
-           stylesheets="/styles/sample.css" xmlns="http://javafx.com/javafx/8.0.102">
+           stylesheets="/styles/sample.css" xmlns="http://javafx.com/javafx/8.0.141">
     <children>
         <ImageView id="imageView" fitHeight="304.0" fitWidth="510.0" pickOnBounds="true" preserveRatio="true">
             <effect>
@@ -37,7 +37,6 @@
                 </Label>
                 <JFXButton fx:id="buttonStart" buttonType="RAISED" layoutX="113.0" layoutY="206.0" prefHeight="25.0"
                            prefWidth="281.0" text="Start Game" textFill="WHITE"/>
-                <JFXButton layoutX="113.0" layoutY="249.0" prefHeight="25.0" prefWidth="281.0" text="Settings"/>
             </children>
         </AnchorPane>
     </children>