diff options
| author | Fernando Carmona Varo <ferkiwi@gmail.com> | 2015-10-27 01:02:12 +0100 |
|---|---|---|
| committer | Fernando Carmona Varo <ferkiwi@gmail.com> | 2015-10-27 01:02:12 +0100 |
| commit | 97cebf050265bf2ebbffd7770d57b3ed0b911bf8 (patch) | |
| tree | d232baa5522cdd1c0feadde7c222342940544d84 /mario/turtle.lua | |
| parent | 087713746ba1b8cac4ce5142fa136d3bde56cca6 (diff) | |
| parent | ff0c1eef4b5e4e06b02b164509590c18e7b450b9 (diff) | |
Merge branch 'master' of https://github.com/DonBatman/myarcade
Conflicts:
mario/init.lua
mario/turtle.lua
Diffstat (limited to 'mario/turtle.lua')
| -rw-r--r-- | mario/turtle.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mario/turtle.lua b/mario/turtle.lua index b10e1e3..7896f2e 100644 --- a/mario/turtle.lua +++ b/mario/turtle.lua @@ -27,7 +27,7 @@ for i in ipairs(turtles) do "mario_turtle.png", }, - collisionbox = {-0.25, -0.5, -0.25, 0.25, 0.4, 0.25}, + collisionbox = {-0.25, -0.25, -0.25, 0.25, 0.25, 0.25}, is_visible = true, automatic_rotate = true, automatic_face_movement_dir = -90, -- set yaw direction in degrees, false to disable |