Changed Collisions, and merged master
This commit is contained in:
@@ -418,7 +418,7 @@ public class Boat extends Collider {
|
|||||||
@Override
|
@Override
|
||||||
public boolean rayCast(Boat boat) {
|
public boolean rayCast(Boat boat) {
|
||||||
if(boat != this) {
|
if(boat != this) {
|
||||||
return rayCast(boat, 50);
|
return rayCast(boat, 15);
|
||||||
} else return false;
|
} else return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -62,7 +62,7 @@ public class HostGameController extends Controller {
|
|||||||
});
|
});
|
||||||
|
|
||||||
// set values and marks to be displayed
|
// set values and marks to be displayed
|
||||||
sliderLength.setMin(2);
|
sliderLength.setMin(5);
|
||||||
sliderLength.setMax(MAX_RACE_LENGTH);
|
sliderLength.setMax(MAX_RACE_LENGTH);
|
||||||
sliderLength.setShowTickLabels(true);
|
sliderLength.setShowTickLabels(true);
|
||||||
sliderLength.setMajorTickUnit(MAX_RACE_LENGTH-1);
|
sliderLength.setMajorTickUnit(MAX_RACE_LENGTH-1);
|
||||||
|
|||||||
Reference in New Issue
Block a user