merge the new developmentbranch into the test branch #39

Closed
j23f0712 wants to merge 431 commits from development2 into dev/test
261 changed files with 13929 additions and 2638 deletions
Showing only changes of commit 935577462b - Show all commits

View File

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

View File

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