epervier/epervier-old
1
0
Fork 0
Code Issues 30 Pull requests Releases Wiki Activity

Rebase on Radiance #71

Merged
kazhnuz merged 20 commits from wip/radiance-rebase into master 2022-08-12 10:37:35 +02:00
Conversation 0 Commits 20 Files changed 145 +1 -1
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit f9b936a726 - Show all commits

2
birb/modules/world/actors/mixins/physics.lua
View file

@ -185,7 +185,7 @@ function PhysicalActor:addHitboxFromFrameData(framedata, animationID, frameID, h
if (hitbox.type == "main") then if (hitbox.type == "main") then
self.mainHitbox:setFromData(hitbox.box, sx, sy) self.mainHitbox:setFromData(hitbox.box, sx, sy)
else else
local hitboxName = anim .. frame .. type .. id local hitboxName = anim .. frame .. hitbox.type .. id
self:addHitbox(hitboxName, hitbox.type, hitbox.box, sx, sy, hitbox.isSolid) self:addHitbox(hitboxName, hitbox.type, hitbox.box, sx, sy, hitbox.isSolid)
return hitboxName return hitboxName
end end