peet/Gruppe-01-fin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

merge the new developmentbranch into the test branch #39

Closed
j23f0712 wants to merge 431 commits from development2 into dev/test
pull from: development2
merge into: peet:dev/test
Conversation 1 Commits 431 Files Changed 269 +2480 -1595
136 changed files with 2480 additions and 1595 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4478291852 - Show all commits

2
Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/determinestartplayerstate/Intro.java
View File

@@ -43,6 +43,7 @@ public void enter() {
for(Map.Entry<Integer, Player> entry : logic.getGame().getPlayers().entrySet()){ for(Map.Entry<Integer, Player> entry : logic.getGame().getPlayers().entrySet()){
//logic.addNotification(new WaitMoveNotification(entry.getValue().getPieces()[0].getUuid())); //logic.addNotification(new WaitMoveNotification(entry.getValue().getPieces()[0].getUuid()));
logic.addNotification(new MovePieceNotification(entry.getValue().getPieces()[0].getUuid(), entry.getValue().getStartNodeIndex(), true)); logic.addNotification(new MovePieceNotification(entry.getValue().getPieces()[0].getUuid(), entry.getValue().getStartNodeIndex(), true));
logic.getGame().getBoard().getInfield()[entry.getValue().getStartNodeIndex()].setOccupant(entry.getValue().getPieces()[0]);
animationCounter++; animationCounter++;
if(entry.getKey() == logic.getOwnPlayerId()){ if(entry.getKey() == logic.getOwnPlayerId()){
//logic.addNotification(new AcquireCardNotification(entry.getValue().getHandCards().get(0))); //logic.addNotification(new AcquireCardNotification(entry.getValue().getHandCards().get(0)));
@@ -65,7 +66,6 @@ public void exit() {
*/ */
@Override @Override
public void selectAnimationEnd(){ public void selectAnimationEnd(){
System.out.println("selectAnimationEnd");
animationCounter--; animationCounter--;
if(animationCounter != 0){ if(animationCounter != 0){
return; return;