Changed Collisions, and merged master

2017-09-28 13:49:27 +13:00
parent 6ec75e6ed7
commit 4ddc369dbc
2 changed files with 2 additions and 2 deletions
@@ -418,7 +418,7 @@ public class Boat extends Collider {
    @Override
    public boolean rayCast(Boat boat) {
        if(boat != this) {
-            return rayCast(boat, 50);
+            return rayCast(boat, 15);
        } else return false;
    }

@@ -62,7 +62,7 @@ public class HostGameController extends Controller {
        });

        // set values and marks to be displayed
-        sliderLength.setMin(2);
+        sliderLength.setMin(5);
        sliderLength.setMax(MAX_RACE_LENGTH);
        sliderLength.setShowTickLabels(true);
        sliderLength.setMajorTickUnit(MAX_RACE_LENGTH-1);