mtcontrib/maidroid
1
0
Fork 1
mirror of https://github.com/tacigar/maidroid.git synced 2025-01-10 16:20:19 +01:00
Code Issues Releases Wiki Activity

Merge pull request #26 from tacigar/tacigar/use-automatic_face_movement_dir

Browse Source 
[UPDATE] Use automatic_face_movement_dir
This commit is contained in:
Tacigar 2016-09-15 19:13:29 +09:00 committed by GitHub
commit b531c90470
2 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
maidroid/api.lua
View File

@ -324,6 +324,7 @@ function maidroid.register_maidroid(product_name, def)
collisionbox = {-0.25, -0.5, -0.25, 0.25, 1.05, 0.25}, collisionbox = {-0.25, -0.5, -0.25, 0.25, 1.05, 0.25},
is_visible = true, is_visible = true,
makes_footstep_sound = true, makes_footstep_sound = true,
automatic_face_movement_dir = 90.0,
-- extra initial properties -- extra initial properties
pause = false, pause = false,

1
maidroid_core/cores/basic.lua
View File

@ -45,7 +45,6 @@ local function on_step(self, dtime)
end end
self.object:setvelocity{x = direction.x, y = velocity.y, z = direction.z} -- TODO self.object:setvelocity{x = direction.x, y = velocity.y, z = direction.z} -- TODO
end end
self:set_yaw_by_direction(direction)
-- if maidroid is stoped by obstacle, the maidroid must jump. -- if maidroid is stoped by obstacle, the maidroid must jump.
if velocity.y == 0 and self.state == state.ACCOMPANY then if velocity.y == 0 and self.state == state.ACCOMPANY then