Merge branch 'dev'

backend/api/rounds.js

@@ -449,7 +449,7 @@ function roundcheck(client, tournament, roundid) {
         // fetched the round objects of the active round
         let activePlayer;
         for (let i = 0; i < rounds.length; i++) {
-          if (rounds[i]._id === roundid) {
+          if (rounds[i]._id.str == roundid.str) {
             activePlayer = rounds[i].playerId;
             break;
           }
@@ -526,7 +526,8 @@ function roundcheck(client, tournament, roundid) {
                               tourny = result.value;
                               const game =
                                 tourny.games[
-                                  tourny.currentRound % tourny.games.length
+                                  (tourny.currentRound % tourny.games.length) -
+                                    1
                                 ];
                               const date = new Date();
                               date.setTime(

backend/api/tournament.js

@@ -512,7 +512,8 @@ function roundcheck(client, tournament) {
                               tourny = result.value;
                               const game = // Finds the next game of the round
                                 tourny.games[
-                                  tourny.currentRound % tourny.games.length
+                                  (tourny.currentRound % tourny.games.length) -
+                                    1
                                 ];
                               const date = new Date();
                               date.setTime(

frontend/core/src/com/gameware/game/states/CreateNewTournamentState.java

@@ -147,7 +147,7 @@ public class CreateNewTournamentState extends State {
         innerTable.setBackground(backgroundTableBlueRounded);
 
         innerTable.add(makeRow(nameLabel, nameDialog));
-        nameInputField.setMaxLength(15);
+        nameInputField.setMaxLength(10);
         innerTable.add(nameInputField).size(nameFieldWidth, inputFieldHeight);
         innerTable.row();
         removeKeyPadAtTouch();