Prechádzať zdrojové kódy

implemented html text form to get user name instead of regex (still have to change css lines to bootstrap)| added welcome text to user on menu screen | french translation correction | changed some redundant code | changed some folder names and rearranged some similar content

lairaalmas 6 rokov pred
rodič
commit
b8b70e0589
100 zmenil súbory, kde vykonal 91 pridanie a 109 odobranie
  1. 0 10
      TEMPORARIOS/CODIGO DO TEXT FIELD PARA ADAPTAR.js
  2. 0 0
      TEMPORARIOS/backup-versao-inicial.zip
  3. BIN
      TEMPORARIOS/comandos do git.odt
  4. 0 0
      assets/cn/save.php
  5. 0 0
      assets/fonts/glyphicons-halflings-regular.eot
  6. 0 0
      assets/fonts/glyphicons-halflings-regular.svg
  7. 0 0
      assets/fonts/glyphicons-halflings-regular.ttf
  8. 0 0
      assets/fonts/glyphicons-halflings-regular.woff
  9. 0 0
      assets/fonts/glyphicons-halflings-regular.woff2
  10. 0 0
      assets/fx/beep.mp3
  11. 0 0
      assets/fx/beep.ogg
  12. 0 0
      assets/fx/error.mp3
  13. 0 0
      assets/fx/error.ogg
  14. 0 0
      assets/fx/ok.mp3
  15. 0 0
      assets/fx/ok.ogg
  16. 0 0
      assets/img/airballoon_base.png
  17. 0 0
      assets/img/airballoon_upper.png
  18. 0 0
      assets/img/bg.jpg
  19. 0 0
      assets/img/bg_map.png
  20. 0 0
      assets/img/birch.png
  21. 0 0
      assets/img/cloud.png
  22. 0 0
      assets/img/farm.png
  23. 0 0
      assets/img/flag.png
  24. 0 0
      assets/img/flag/BRAZ.jpg
  25. 0 0
      assets/img/flag/FRAN.jpg
  26. 0 0
      assets/img/flag/PERU.jpg
  27. 0 0
      assets/img/flag/UNST.jpg
  28. 0 0
      assets/img/floor.png
  29. 0 0
      assets/img/game/five-s.png
  30. 0 0
      assets/img/game/four-c.png
  31. 0 0
      assets/img/game/four-s.png
  32. 0 0
      assets/img/game/one-c.png
  33. 0 0
      assets/img/game/one-s.png
  34. 0 0
      assets/img/game/three-c.png
  35. 0 0
      assets/img/game/three-s.png
  36. 0 0
      assets/img/game/two-c.png
  37. 0 0
      assets/img/game/two-s.png
  38. 0 0
      assets/img/garage.png
  39. 0 0
      assets/img/help/arrow.png
  40. 0 0
      assets/img/help/double.png
  41. 0 0
      assets/img/help/down.png
  42. 0 0
      assets/img/help/error.png
  43. 0 0
      assets/img/help/ok.png
  44. 0 0
      assets/img/help/pointer.png
  45. 0 0
      assets/img/house.png
  46. 0 0
      assets/img/kid/lost.png
  47. 0 0
      assets/img/kid/run.png
  48. 0 0
      assets/img/kid/walk.png
  49. 0 0
      assets/img/menu/back.png
  50. 0 0
      assets/img/menu/block.png
  51. 0 0
      assets/img/menu/eraser.png
  52. 0 0
      assets/img/menu/help.png
  53. 0 0
      assets/img/menu/home.png
  54. 0 0
      assets/img/menu/info.png
  55. 0 0
      assets/img/menu/language.png
  56. 0 0
      assets/img/menu/list.png
  57. 0 0
      assets/img/menu/menu.png
  58. 0 0
      assets/img/menu/progressBar.png
  59. 0 0
      assets/img/menu/view.png
  60. 0 0
      assets/img/operator/add.png
  61. 0 0
      assets/img/operator/blue_block.jpg
  62. 0 0
      assets/img/operator/equal.png
  63. 0 0
      assets/img/operator/multiply.png
  64. 0 0
      assets/img/operator/red_block.jpg
  65. 0 0
      assets/img/operator/separator.png
  66. 0 0
      assets/img/operator/subtract.png
  67. 0 0
      assets/img/pgbar.png
  68. 0 0
      assets/img/place.png
  69. 0 0
      assets/img/place_a.png
  70. 0 0
      assets/img/place_b.png
  71. 0 0
      assets/img/road.png
  72. 0 0
      assets/img/rock.png
  73. 0 0
      assets/img/school (copy).png
  74. BIN
      assets/img/school.png
  75. 0 0
      assets/img/sign.png
  76. 0 0
      assets/img/tractor/frame-0.png
  77. 0 0
      assets/img/tractor/frame-1.png
  78. 0 0
      assets/img/tractor/frame-2.png
  79. 0 0
      assets/img/tractor/frame-3.png
  80. 0 0
      assets/img/tractor/frame-4.png
  81. 0 0
      assets/img/tractor/frame-5.png
  82. 0 0
      assets/img/tractor/frame-6.png
  83. 0 0
      assets/img/tractor/frame-7.png
  84. 0 0
      assets/img/tractor/frame-8.png
  85. 0 0
      assets/img/tractor/frame-9.png
  86. 0 0
      assets/img/tractor/frame.png
  87. 0 0
      assets/img/tree.png
  88. 0 0
      assets/img/tree2.png
  89. 0 0
      assets/img/tree3.png
  90. 0 0
      assets/img/tree4.png
  91. 2 1
      resource/lang/en_US.json
  92. 2 1
      resource/lang/es_PE.json
  93. 3 2
      resource/lang/fr_FR.json
  94. 2 1
      resource/lang/pt_BR.json
  95. 3 3
      css/bootstrap.css
  96. 1 1
      css/bootstrap.css.map
  97. 29 13
      index.html
  98. 4 2
      js/auxiliar.js
  99. 45 75
      js/boot.js
  100. 0 0
      js/circleOne.js

+ 0 - 10
TEMPORARIOS/CODIGO DO TEXT FIELD PARA ADAPTAR.js

@@ -1,10 +0,0 @@
-nameField: function(){
-    var x = document.createElement("INPUT");
-    x.setAttribute("type","text");
-    x.setAttribute("value","Entre seu nome");
-    
-    //var temp = game.add.???(x);
-    //temp.anchor.setTo(0.5);
-    
-    //document.body.appendChild(x);
-}, 

TEMPORARIOS/backup.zip → TEMPORARIOS/backup-versao-inicial.zip


BIN
TEMPORARIOS/comandos do git.odt


resource/cn/save.php → assets/cn/save.php


fonts/glyphicons-halflings-regular.eot → assets/fonts/glyphicons-halflings-regular.eot


fonts/glyphicons-halflings-regular.svg → assets/fonts/glyphicons-halflings-regular.svg


fonts/glyphicons-halflings-regular.ttf → assets/fonts/glyphicons-halflings-regular.ttf


fonts/glyphicons-halflings-regular.woff → assets/fonts/glyphicons-halflings-regular.woff


fonts/glyphicons-halflings-regular.woff2 → assets/fonts/glyphicons-halflings-regular.woff2


resource/fx/beep.mp3 → assets/fx/beep.mp3


resource/fx/beep.ogg → assets/fx/beep.ogg


resource/fx/error.mp3 → assets/fx/error.mp3


resource/fx/error.ogg → assets/fx/error.ogg


resource/fx/ok.mp3 → assets/fx/ok.mp3


resource/fx/ok.ogg → assets/fx/ok.ogg


resource/img/airballoon_base.png → assets/img/airballoon_base.png


resource/img/airballoon_upper.png → assets/img/airballoon_upper.png


resource/img/bg.jpg → assets/img/bg.jpg


resource/img/bg_map.png → assets/img/bg_map.png


resource/img/birch.png → assets/img/birch.png


resource/img/cloud.png → assets/img/cloud.png


resource/img/farm.png → assets/img/farm.png


resource/img/flag.png → assets/img/flag.png


resource/img/flag/BRAZ.jpg → assets/img/flag/BRAZ.jpg


resource/img/flag/FRAN.jpg → assets/img/flag/FRAN.jpg


resource/img/flag/PERU.jpg → assets/img/flag/PERU.jpg


resource/img/flag/UNST.jpg → assets/img/flag/UNST.jpg


resource/img/floor.png → assets/img/floor.png


resource/img/game/five-s.png → assets/img/game/five-s.png


resource/img/game/four-c.png → assets/img/game/four-c.png


resource/img/game/four-s.png → assets/img/game/four-s.png


resource/img/game/one-c.png → assets/img/game/one-c.png


resource/img/game/one-s.png → assets/img/game/one-s.png


resource/img/game/three-c.png → assets/img/game/three-c.png


resource/img/game/three-s.png → assets/img/game/three-s.png


resource/img/game/two-c.png → assets/img/game/two-c.png


resource/img/game/two-s.png → assets/img/game/two-s.png


resource/img/garage.png → assets/img/garage.png


resource/img/help/arrow.png → assets/img/help/arrow.png


resource/img/help/double.png → assets/img/help/double.png


resource/img/help/down.png → assets/img/help/down.png


resource/img/help/error.png → assets/img/help/error.png


resource/img/help/ok.png → assets/img/help/ok.png


resource/img/help/pointer.png → assets/img/help/pointer.png


resource/img/house.png → assets/img/house.png


resource/img/kid/lost.png → assets/img/kid/lost.png


resource/img/kid/run.png → assets/img/kid/run.png


resource/img/kid/walk.png → assets/img/kid/walk.png


resource/img/menu/back.png → assets/img/menu/back.png


resource/img/menu/block.png → assets/img/menu/block.png


resource/img/menu/eraser.png → assets/img/menu/eraser.png


resource/img/menu/help.png → assets/img/menu/help.png


resource/img/menu/home.png → assets/img/menu/home.png


resource/img/menu/info.png → assets/img/menu/info.png


resource/img/menu/language.png → assets/img/menu/language.png


resource/img/menu/list.png → assets/img/menu/list.png


resource/img/menu/menu.png → assets/img/menu/menu.png


resource/img/menu/progressBar.png → assets/img/menu/progressBar.png


resource/img/menu/view.png → assets/img/menu/view.png


resource/img/operator/add.png → assets/img/operator/add.png


resource/img/operator/blue_block.jpg → assets/img/operator/blue_block.jpg


resource/img/operator/equal.png → assets/img/operator/equal.png


resource/img/operator/multiply.png → assets/img/operator/multiply.png


resource/img/operator/red_block.jpg → assets/img/operator/red_block.jpg


resource/img/operator/separator.png → assets/img/operator/separator.png


resource/img/operator/subtract.png → assets/img/operator/subtract.png


resource/img/global/pgbar.png → assets/img/pgbar.png


resource/img/place.png → assets/img/place.png


resource/img/place_a.png → assets/img/place_a.png


resource/img/place_b.png → assets/img/place_b.png


resource/img/road.png → assets/img/road.png


resource/img/rock.png → assets/img/rock.png


resource/img/school.png → assets/img/school (copy).png


BIN
assets/img/school.png


resource/img/sign.png → assets/img/sign.png


resource/img/tractor/frame-0.png → assets/img/tractor/frame-0.png


resource/img/tractor/frame-1.png → assets/img/tractor/frame-1.png


resource/img/tractor/frame-2.png → assets/img/tractor/frame-2.png


resource/img/tractor/frame-3.png → assets/img/tractor/frame-3.png


resource/img/tractor/frame-4.png → assets/img/tractor/frame-4.png


resource/img/tractor/frame-5.png → assets/img/tractor/frame-5.png


resource/img/tractor/frame-6.png → assets/img/tractor/frame-6.png


resource/img/tractor/frame-7.png → assets/img/tractor/frame-7.png


resource/img/tractor/frame-8.png → assets/img/tractor/frame-8.png


resource/img/tractor/frame-9.png → assets/img/tractor/frame-9.png


resource/img/tractor/frame.png → assets/img/tractor/frame.png


resource/img/tree.png → assets/img/tree.png


resource/img/tree2.png → assets/img/tree2.png


resource/img/tree3.png → assets/img/tree3.png


resource/img/tree4.png → assets/img/tree4.png


+ 2 - 1
resource/lang/en_US.json

@@ -18,5 +18,6 @@
     "with_name": "WITH",
     "without_name": "WITHOUT",
     "insert_name" : "ENTER YOUR NAME",
-    "ready" : "READY"
+    "ready" : "READY",
+    "welcome" : "Welcome"
 }

+ 2 - 1
resource/lang/es_PE.json

@@ -18,5 +18,6 @@
     "with_name": "CON",
     "without_name": "SIN",
     "insert_name" : "INGRESA TU NOMBRE",
-    "ready" : "LISTO"
+    "ready" : "LISTO",
+    "welcome" : "Bienvenido"
 }

+ 3 - 2
resource/lang/fr_FR.json

@@ -1,7 +1,7 @@
 {
     "loading":"CHARGEMENT",
     "title":"Fractions",
-    "menu_title":"GAME SELECT",
+    "menu_title":"SÉLECTIONNER UN JEU",
     "difficulty": "Difficulté",
     "level": "Niveau",
     "game_menu_title": "OPERATION SELECT ET DIFFICULTÉ",
@@ -18,5 +18,6 @@
     "with_name": "AVEC",
     "without_name": "SANS",
     "insert_name" : "ENTREZ VOTRE NOM",
-    "ready" : "PRET"
+    "ready" : "PRET",
+    "welcome" : "Bienvenue"
 }

+ 2 - 1
resource/lang/pt_BR.json

@@ -18,5 +18,6 @@
     "with_name": "COM",
     "without_name": "SEM",
     "insert_name" : "DIGITE SEU NOME",
-    "ready" : "PRONTO"
+    "ready" : "PRONTO",
+    "welcome" : "Bem vindo"
 }

+ 3 - 3
css/bootstrap.css

@@ -263,8 +263,8 @@ th {
 @font-face {
   font-family: 'Glyphicons Halflings';
 
-  src: url('../fonts/glyphicons-halflings-regular.eot');
-  src: url('../fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../fonts/glyphicons-halflings-regular.woff2') format('woff2'), url('../fonts/glyphicons-halflings-regular.woff') format('woff'), url('../fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg');
+  src: url('..assets/fonts/glyphicons-halflings-regular.eot');
+  src: url('..assets/fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('..assets/fonts/glyphicons-halflings-regular.woff2') format('woff2'), url('..assets/fonts/glyphicons-halflings-regular.woff') format('woff'), url('..assets/fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('..assets/fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg');
 }
 .glyphicon {
   position: relative;
@@ -6757,4 +6757,4 @@ button.close {
     display: none !important;
   }
 }
-/*# sourceMappingURL=bootstrap.css.map */
+/*# sourceMappingURL=bootstrap.css.map */

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 1 - 1
css/bootstrap.css.map


+ 29 - 13
index.html

@@ -16,12 +16,33 @@
         <script type="text/javascript" src="js/squareOne.js"></script>
         <script type="text/javascript" src="js/squareTwo.js"></script>
         <script type="text/javascript" src="js/auxiliar.js"></script>
-    
+
+        <style>
+        	#text-field-div{
+			  position: absolute;
+			  top: 300px;
+			  margin-left: 340px;
+			  visibility: hidden;
+			}
+
+			input[type=text] {
+			  background-color: rgb(239, 245, 245);
+			  padding: 15px 40px;
+			  box-sizing: border-box;
+			  border: 3px solid #ccc;
+			  font-size: 44px;
+			  font-family: Arial;
+			  color: rgb(0, 0, 0);
+			  text-align: center;
+			}
+        </style>
+
     </head>
 
     <body>
 
 	    <div class="container">
+
 	    	<div class="clearfix"></div>
 	        
 	        <div class="panel panel-primary">
@@ -70,21 +91,16 @@
 	          </div>
 	        </div>
 
-	        <!--
-			<div class="panel panel-danger">
-	          <div class="panel-heading">TESTE</div>
-	          <div class="panel-body">
-	            <center>
-			        <form action="" method="">
-						<legend>DIGITE SEU NOME</legend>
-						><input type="name_textfield" name="name" value="" size="22" maxlength="20"><<br><br>
-					</form>
-				</center>
+	        <div id="text-field-div">
+				<form onsubmit="return false">
+					<input type="text" id="name_id" value="" size="13" maxlength="40">
+				</form>
 			</div>
-			-->
 
 	    </div>
-        
+
     </body>
 
+
+
 </html>

+ 4 - 2
js/auxiliar.js

@@ -13,7 +13,8 @@
     name = ""; //player name
     lang = ""; //language
 
-    // Game One 
+    // Game One : kid and truck
+
     onePosition = 0; //Map position
     oneMove = false; //Move to next position
     oneDifficulty = 0; //From one to five 
@@ -23,7 +24,8 @@
     oneType = ""; // A - Place distance; B - Select blocks
     oneMenu = true;
 
-    // Game Two
+    // Game Two : fractions association
+
     twoPosition = 0; //Map position
     twoMove = false; //Move to next position
     twoDifficulty = 0; //From one to five 

+ 45 - 75
js/boot.js

@@ -1,17 +1,16 @@
 
-var nameLbl;
+var username;
 
 /*
     var bootState = {
         preload: function(){},
         create: function(){},
-        setLang: function(){}
+        setLang: function(){} //calls loadState
     };
     
     var loadState = {
         preload: function(){},
-        preload: function(){},
-        create: function(){}
+        create: function(){} //calls nameState
     };
         
     var nameState = {
@@ -19,21 +18,22 @@ var nameLbl;
         create: function(){},
         clearName: function(){},
         keyPressed: function( char ){},
-        ready: function(){}
+        ready: function(){} //calls menu.js -> menuState
     };
 */
 
 // choose language screen
 var bootState = {
     
-    preload: function () {
+    preload: function() {
         //Progress bar image
-        game.load.image('progressBar', 'resource/img/global/pgbar.png');
+        game.load.image('progressBar', 'assets/img/pgbar.png');
+
         //loading flags (manually)
-        game.load.image('flag_BR', 'resource/img/flag/BRAZ.jpg');
-        game.load.image('flag_PE', 'resource/img/flag/PERU.jpg');
-        game.load.image('flag_US', 'resource/img/flag/UNST.jpg');
-        game.load.image('flag_FR', 'resource/img/flag/FRAN.jpg');
+        game.load.image('flag_BR', 'assets/img/flag/BRAZ.jpg');
+        game.load.image('flag_PE', 'assets/img/flag/PERU.jpg');
+        game.load.image('flag_US', 'assets/img/flag/UNST.jpg');
+        game.load.image('flag_FR', 'assets/img/flag/FRAN.jpg');
     },
 
     create: function() {
@@ -95,13 +95,7 @@ var bootState = {
 // loading screen (+loading assets)
 var loadState = {
     
-    //called on setPreloadImage
-    preload: function () {
-        //Progress bar image
-        game.load.image('progressBar', 'resource/img/global/pgbar.png');
-    },
-    
-    preload: function () {
+    preload: function() {
         
         // Displaying the progress bar
         var progressBar = game.add.sprite(game.world.centerX, game.world.centerY, 'progressBar');
@@ -114,10 +108,10 @@ var loadState = {
         }
         
         // Loading dictionary
-        game.load.json('dictionary', 'resource/lang/'+lang+'.json');
+        game.load.json('dictionary', 'assets/languages/'+lang+'.json');
                 
         // Loading global assets (sprites and images)
-        var imgsrc = 'resource/img/';
+        var imgsrc = 'assets/img/';
         
         game.load.image('bgimage', imgsrc+'bg.jpg');
         game.load.image('bgmap', imgsrc+'bg_map.png');
@@ -181,9 +175,9 @@ var loadState = {
         game.load.image('tree4', imgsrc+'tree4.png');
         
         // Loadind Sound Effects
-        game.load.audio('sound_ok', ['resource/fx/ok.ogg', 'resource/fx/ok.mp3']);
-        game.load.audio('sound_error', ['resource/fx/error.ogg', 'resource/fx/error.mp3']);
-        game.load.audio('sound_beep', ['resource/fx/beep.ogg', 'resource/fx/beep.mp3']);
+        game.load.audio('sound_ok', ['assets/fx/ok.ogg', 'assets/fx/ok.mp3']);
+        game.load.audio('sound_error', ['assets/fx/error.ogg', 'assets/fx/error.mp3']);
+        game.load.audio('sound_beep', ['assets/fx/beep.ogg', 'assets/fx/beep.mp3']);
         
     },
 
@@ -196,46 +190,25 @@ var loadState = {
 var nameState = {
 
     preload: function () {
-        //textbox
-
     },
 
     create: function() {
-        //game settings
         game.stage.backgroundColor = '#cce5ff';
         
+        // gets selected language from json
         var words =  game.cache.getJSON('dictionary');
         
         game.physics.startSystem(Phaser.Physics.ARCADE);
+        
         var style = { font: '30px Arial', fill: '#00804d', align: 'center' };
         var styleName = { font: '44px Arial', fill: '#000000', align: 'center' };
         
-        //generating language selection
-        var titulo = game.add.text(this.game.world.centerX, this.game.world.centerY - 100, words.insert_name, style);
-        titulo.anchor.setTo(0.5);
-        
-        var lineColor = 0x000000;
-        var fillColor = 0xfffff0;
-        
-        var nameBox = game.add.graphics(this.game.world.centerX - 200, this.game.world.centerY - 50);
-        nameBox.lineStyle(2, lineColor);
-        nameBox.beginFill(fillColor);
-        nameBox.drawRect(0, 0, 400, 100);
-        nameBox.alpha = 0.5;
-        nameBox.endFill();
-
-        nameLbl = game.add.text(this.game.world.centerX, this.game.world.centerY, "", styleName);
-        nameLbl.anchor.setTo(0.5);
-        
-        var clear = game.add.sprite(game.world.centerX + 250, game.world.centerY, 'eraser');
-        clear.scale.setTo(0.8);
-        clear.anchor.setTo(0.5);
-        
-        clear.inputEnabled = true;
-        clear.input.useHandCursor = true;
-        clear.events.onInputDown.add(this.clearName, null);
+        // title
+        var title = game.add.text(this.game.world.centerX, this.game.world.centerY - 100, words.insert_name, style);
+        title.anchor.setTo(0.5);
         
-        var btn = game.add.graphics(this.game.world.centerX - 84, this.game.world.centerY +70);
+        // "READY" button
+        var btn = game.add.graphics(this.game.world.centerX - 84, this.game.world.centerY + 70);
         btn.lineStyle(1, 0x293d3d);
         btn.beginFill(0x3d5c5c);
         btn.drawRect(0, 0, 168, 60);
@@ -246,37 +219,34 @@ var nameState = {
         btn.input.useHandCursor = true;
         btn.events.onInputDown.add(this.ready, null);
         
-        var listo = game.add.text(this.game.world.centerX+1, this.game.world.centerY + 102, words.ready, { font: '34px Arial', fill: '#f0f5f5', align: 'center' });
-        listo.anchor.setTo(0.5);
+        var ready = game.add.text(this.game.world.centerX + 1, this.game.world.centerY + 102, words.ready, { font: '34px Arial', fill: '#f0f5f5', align: 'center' });
+        ready.anchor.setTo(0.5);  
         
-        game.input.keyboard.addCallbacks(this, null, null, this.keyPress);
+        document.getElementById("text-field-div").style.visibility = "visible";
         
-
+        document.getElementById("name_id").addEventListener('keypress', function(e){
+            var keycode = e.keycode ? e.keycode : e.which; 
+            //se apertar enter vai para ready, assim como o botão
+            if(keycode == 13){ 
+                nameState["ready"]();
+            }     
+        });
     },
+         
+    //var ready = function readyFunction() {...},
+    //var ready = function() {...},                
+    ready: function() {
 
-    clearName: function(){
-        nameLbl.text  = "";
-    },
-    
-    keyPress: function(char) {
+        
+        // saves the typed name on username variable
+        username = document.getElementById("name_id").value;
+        console.log("user is " + username);        
 
-        var RegExpression = /^[a-zA-Z\s]*$/; 
+        document.getElementById("text-field-div").style.visibility = "hidden";
 
-        if (RegExpression.test(char)) {
-            nameLbl.text += char;
-        }        
-    },
+        //clears the text field again
+        document.getElementById("name_id").value = "";
 
-    ready: function(){
-        //var txt = nameLbl.text.trim;
-        console.log(nameLbl.text.length);
-        if(nameLbl.text.trim().length==0){
-            nameLbl.text  = "";
-            return;
-        }
-        name = nameLbl.text.trim();
-        console.log("name is " + name);
-        
         if(oneMenu){ //If menu, normal game
             // Go to the menu state
             game.state.start('menu');

+ 0 - 0
js/circleOne.js


Niektoré súbory nie sú zobrazené, pretože je v týchto rozdielových dátach zmenené mnoho súborov