Merging game lobby with game state broadcast. Merge conflicts resolved.

Port numbers updated to 4942.
This commit is contained in:
Kusal Ekanayake
2017-07-24 15:26:51 +12:00
parent 1daac842f2
commit 526c12127f
6 changed files with 8 additions and 6 deletions
@@ -47,7 +47,7 @@
<Font size="21.0" />
</font>
</Text>
<TextField fx:id="portTextField" alignment="CENTER" maxWidth="75.0" prefHeight="25.0" prefWidth="55.0" promptText="Port" text="4950" GridPane.halignment="RIGHT" GridPane.rowIndex="4">
<TextField fx:id="portTextField" alignment="CENTER" maxWidth="75.0" prefHeight="25.0" prefWidth="55.0" promptText="Port" text="4942" GridPane.halignment="RIGHT" GridPane.rowIndex="4">
<opaqueInsets>
<Insets />
</opaqueInsets>