Merge branch 'master' of https://github.com/okamstudio/godot

2015-05-16 17:13:25 -03:00
parent 1e382dbb18 219dcaaa75
commit 8482611f81
10 changed files with 2460 additions and 7 deletions
--- a/demos/3d/kinematic_char/cubio.gd
+++ b/demos/3d/kinematic_char/cubio.gd
@ -46,9 +46,8 @@ func _fixed_process(delta):
 	
 	vel.x=hvel.x;
 	vel.z=hvel.z	
-		
-	var motion = vel*delta
-	motion=move(vel*delta)
+
+	var motion = move(vel*delta)

 	var on_floor = false
 	var original_vel = vel