Conflicts:
	src/protocol/swg/ObjControllerMessage.java
	src/resources/objects/player/PlayerMessageBuilder.java
	src/services/travel/TravelService.java
This commit is contained in:
Light2
2014-03-10 00:42:19 +01:00
182 changed files with 2439 additions and 10372 deletions
@@ -90,8 +90,8 @@ public class CreatureObject extends TangibleObject implements IPersistent {
private float slopeModAngle = 1;
private float slopeModPercent = 1;
private float turnRadius = 1;
private float walkSpeed = (float) 2.75;
private float waterModPercent = 1;
private float walkSpeed = (float) 1.549;
private float waterModPercent = (float) 0.75;
private SWGList<String> abilities;
private int abilitiesUpdateCounter = 0;