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 +1 -1
2 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 935577462b - Show all commits

1
Projekte/mdga/client/src/main/java/pp/mdga/client/board/BoardHandler.java
View File

@@ -529,7 +529,6 @@ private void throwPiece(UUID uuid){
* @param uuid the UUID of the piece to shield * @param uuid the UUID of the piece to shield
*/ */
public void shieldPiece(UUID uuid){ public void shieldPiece(UUID uuid){
pieces.get(uuid).activateShield(); pieces.get(uuid).activateShield();
} }

1
Projekte/mdga/client/src/main/java/pp/mdga/client/board/PieceControl.java
View File

@@ -113,6 +113,7 @@ public Vector3f getLocation(){
protected void controlUpdate(float delta) { protected void controlUpdate(float delta) {
if(shieldRing != null){ if(shieldRing != null){
shieldRing.rotate(0, 0, delta * SHIELD_SPEED); shieldRing.rotate(0, 0, delta * SHIELD_SPEED);
shieldRing.setLocalTranslation(spatial.getLocalTranslation().add(new Vector3f(0,0,SHIELD_Z)));
} }
} }