Merge remote-tracking branch 'origin/master'

This commit is contained in:
2019-03-24 20:15:28 -06:00

View File

@@ -535,6 +535,8 @@ public class AnimationTesting extends Player {
else{
report.setVisible(true);
continueButton.setVisible(true);
usAgainstEnemyDivisor.setVisible(false);
cannon.setVisible(false);
shotsFired.stop();
}
@@ -564,6 +566,10 @@ public class AnimationTesting extends Player {
}
});
}
}