Merge remote-tracking branch 'origin/master' into master

app/src/main/java/com/iutlaval/myapplication/Game/COMMAND.java

@@ -4,4 +4,12 @@ public final class COMMAND {
     public static final String YOURTURN="yourturn";
     public static final String DRAW = "draw";
     public static final String GET_DECK = "getDeck";
+    public static final String PUT_CARD = "putCard";
+    public static final String SHUFFLE_DECK = "shuffleDeck";
+    public static final String SELECT_CARD = "selectCard";
+    public static final String ATTACK = "attack";
+    public static final String DEFEND = "defend";
+    public static final String CAST_SPELL = "castSpell";
+    public static final String PASS_TURN = "passTurn";
+
 }

app/src/main/java/com/iutlaval/myapplication/Game/GameLogicThread.java

@@ -124,6 +124,29 @@ public class GameLogicThread extends Thread{
                         renderer.addToDraw(new DrawableSelfRemoving(new DrawableBitmap(bitmapYourTurn,0,0,"yourTurn",100F,50F),1));
                         break;
 
+                    case COMMAND.PUT_CARD:
+                        //TODO put card on the battlefield
+                        break;
+
+                    case COMMAND.SHUFFLE_DECK:
+                        //TODO shuffle deck
+                        break;
+
+                    case COMMAND.SELECT_CARD:
+                        //TODO select a card
+                        break;
+                    case COMMAND.ATTACK:
+                        //TODO attack
+                        break;
+                    case COMMAND.DEFEND:
+                        //TODO defend
+                        break;
+                    case COMMAND.CAST_SPELL:
+                        //TODO cast spell
+                        break;
+                    case COMMAND.PASS_TURN:
+                        //TODO pass turn
+                        break;
                     default:
                         Log.e("UNKOWN COMMAND",serveurCmd);
                 }