Merge branch 'server-side' of https://github.com/Lost-Fly/PackAndGo-A…

…ndroidMultiplayerGame into server-side

android/src/com/aqwsxlostfly/packandgo/client/AndroidLauncher.java

@@ -80,7 +80,7 @@ private WebSocketListener getWebsocketListener(EventListenerCallback callback) {
         WebSocketListener webSocketListener = new WebSocketListener() {
             @Override
             public void onMessageReceived(String message) {
-                Gdx.app.log("MESSAGE RECEIVED", "MESSAGE: " + message);
+//                Gdx.app.log("MESSAGE RECEIVED", "MESSAGE: " + message);
                 WsEvent wsEvent = new WsEvent();
                 wsEvent.setData(message);
                 callback.onEvent(wsEvent);

android/src/com/aqwsxlostfly/packandgo/client/MessageProcessor.java

@@ -16,7 +16,7 @@ public MessageProcessor(Main main) {
 
     public void processEvent(WsEvent event) {
         String data = event.getData();
-        Gdx.app.log("PROCESSED EVENT", data);
+//        Gdx.app.log("PROCESSED EVENT", data);
         if (data != null) {
 
             JsonReader jsonReader = new JsonReader();
@@ -65,7 +65,6 @@ private void processObject(JsonValue object) {
                     String id = object.getString("id");
                     float x = object.getFloat("x");
                     float y = object.getFloat("y");
-                    Gdx.app.log("CASE PLAYER MSGPROC", "id " + id + " x " +x  + " y " + y );
 
                     main.renderer.getGameScreen().updatePlayerArray(id, x, y);
                     break;

assets/Map.tmx

@@ -25,10 +25,21 @@
  <tileset firstgid="11991" source="hero.tsx"/>
  <layer id="1" name="background" width="48" height="48">
   <data encoding="base64" compression="zlib">
-   eJztmVlsVFUYxz+S0lJpCy6Jxg4z05Z2KLglaiguD+IuSNIWWXyagi8u4BYB8cm6RMFXoLhO4gJlirGFoPiksmgMLl1mphSNCyq4vKiJ+4O/6703cz1zOnPPnUtsEx9++b77nTPn+8+535x7v3Zoqrw1CMMwNIl811ocqZbk1diFcBVMBh/N4nyPFLHUH5UiYZCbKkk19if8pfgjTk7dmB+f75IctEnhpzZViehoj4t0QCcsjevneMmyphrbDE8pfsbJqRvz47PnSfY+yT1IcT9S504TsWiIiTRCU8y+7kfzAOyBvXE75jI/KtIGCyAJXbClRpJnJ0TOSeTn1UNE8bNOTt2YH3+hrT3p1s8uYhYXoPtCuChmXxfjGvReC9fBGljr6F+P9g2J/Lw09Cl+zsmpG/Pjq/XTPUXkEbgc3VfAlTH72o3rbDt6O6ATNsJD0EI8h/bRhD3nUQX3syOenC+S66VYfu0e/O3wNDwDz8Jz8Dy8AKlYYf0U02liW3zOzXhyvoaefo/+l/FfgR2wE3qtWoA09MHuWGH9nCr9WxtFtkEPbG/Mx7MBc+5H+5ux8etHtU9QE0/CJtgcNdf/C5p/hd/gd4/+XJl75rd+tqB5K2yDHh/6rfPfG1vWJLIcVsDKJn39B7F+6+db9uw7+B5+aCy9dlbRvw/Nr8MbsN+jP1Omfr/1cyM5b4JFsLip9NoZRf94drzfeYXzO45h484ZWKE5C/3WTy+ad0Ea+nzoHylTv2vPQ/P5Rc5wv/VTPVvkNJgONbPN6z/o/i/AXlZk//3Wj6lV6z/o/od1/phav/Uf9Pw3rR9T67f+yz3/T1X9+K3/cs9/tX5Yz7r31n21NEgY191T8ji1Fdr6av2U6nc+dfoqkx5J3bNi663hfXVtQr/e3cTvSRTvv3Q9zvX0KzfEbf8Tp68y6ZFU/d4xdz03xwfo+zBhjy3iejHcDEvgI+IfJ+zPu/PV+tH1ODuYtzNu+8eYq/ZCvXN4tkEa+uYUft46I714x9z13BzesTTXfbAbXo3/O6c7X62fLO9mORiN5nucIfzhqO2PMVfthapbebbBdKhpLeyR1P33junWOzRX5PDcwp5LF1fr5zg6v4Kvo/l8n+F/7lwfZa6q53Y03wF3wl2tZmeIbr3medyneYXzdXHT59eoJl85tkUTfwyNj2v06+Jq/Yyxz8ec93tdz6TLF6b+rgaRVbAabmsoHVfr5wTaTzr6dT1T2Pqzyv18G23vwAE42FA6Xqx+dD1TJuT6KXe9Yu8/up5pJGT95a7n1g/fQY5U//N3UStmfS8J03dRnwXesSDrozllabcYdhj0XIflu6j6h0PKO79CpK3CzJrQNs46D/A8WgcP8l6wEfp5fgzAHtjbmo+X0vMuvGdog+hX18mgPQtH0TgGp+OfAWfCWZ54KT1B9n8i2SD7P5Hsf71/fm17s0hH8+Td/360DzRP3v3/v/4npu2qDM4qWK34h+tFLq4VuQQurTX33683y/9jGfwEPyu+pf8AOg7CoVpz39Jvkv/hquB0W39jsP5HHOFsg86Irb+zTmQp3FJn7lv6TfJ/w2dOwMm64P4X6P4SjkfCqR+T3OtmiKyHDTOC+/fOErkP7p8VTv2Y5K6cKVIF02aG44dRPyb5wqgfr7+MGloOK2BlAP/WiFm+vwFEpZ5j
   </data>
  </layer>
- <objectgroup id="7" name="floor">
+ <layer id="2" name="graphics" width="48" height="48">
+  <data encoding="base64" compression="zlib">
+  </data>
+ </layer>
+ <objectgroup id="3" name="lightObject">
+  <object id="102" type="flowers" gid="11721" x="337.995" y="544.009" width="32" height="32"/>
+  <object id="103" type="flowers" gid="11721" x="254.468" y="543.015" width="32" height="32"/>
+  <object id="110" name="tabouret" type="tabouret" gid="11567" x="469.333" y="745.333" width="32" height="32"/>
+ </objectgroup>
+ <objectgroup id="6" name="hero">
+  <object id="111" name="hero" gid="11991" x="444.667" y="721.333" width="16" height="16"/>
+ </objectgroup>
+ <objectgroup id="5" name="ground">
   <object id="34" type="floor" x="31.3333" y="92.6667" width="287.333" height="211.333"/>
   <object id="35" type="floor" x="336.667" y="94.6667" width="142.667" height="208.667"/>
   <object id="36" type="floor" x="496.667" y="95.3333" width="238.667" height="207.333"/>
@@ -43,7 +54,6 @@
  </objectgroup>
  <layer id="2" name="graphics" width="48" height="48">
   <data encoding="base64" compression="zlib">
-   eJztl0lOw0AQRStKAiwY9sACRUoOQhg2EO7AeBBYAScBEiTGezDeBVjwLWzRarpdXbJD3FY96UnVrXT5x3JiFZFSBT6miD7hV6q59tWuPbtXwnaHaNAJy3HTJLqFd/AePsDHJn/udJroDJ6nmmtf7dqzeyUMkX0UmH+1RdSHa3AdbsDNFn9ucYZoCS6nmmtf7dqze211cf/hAO50+RxPyPoMX+ArfIPvAfkvcK1LeJVqrn21a+9PL2QewhG8Dsi/2ybag/vwAB7CozZ/LuO48avks+YZs57tEc3BebjQc/c5afyY19d1naoQe34J0vyxf2/NX16GImf/K3/Zv9lJ58/2yuw3Tur2f6koCo90rgqpJdcs2ls6V4XUHNJ+eb2lc1VIzSHtl9dbOleF1BzSfnm9sxnCnCPstU3Z70lfj1jewUXmLu5ejxtulq57/qoQS9b+yqQTKDGTPD8hVpXY8ytxEfvzFHt+RVEURakT3zUj56E=
   </data>
  </layer>
  <objectgroup id="3" name="lightObject">
@@ -76,7 +86,7 @@
   <object id="135" name="wall" type="wall" x="0" y="655" width="321" height="52"/>
   <object id="136" name="wall" type="wall" x="320" y="653" width="15" height="115"/>
   <object id="137" name="wall" type="wall" x="321" y="751" width="271" height="16"/>
-  <object id="139" name="wall" type="wall" x="577" y="656" width="19" height="114"/>
+  <object id="139" name="wall" type="wall" x="575.5" y="656" width="20.5" height="114"/>
   <object id="140" name="wall" type="wall" x="383" y="32" width="67" height="82"/>
  </objectgroup>
  <objectgroup id="4" name="heavyObjects"/>