Compare commits
No commits in common. "master" and "feat/gui" have entirely different histories.
2 changed files with 9 additions and 9 deletions
|
@ -134,7 +134,7 @@ end
|
||||||
function Hitbox3D:checkCollisionAtPoint(dx, dy, dz, filter)
|
function Hitbox3D:checkCollisionAtPoint(dx, dy, dz, filter)
|
||||||
self:updatePosition()
|
self:updatePosition()
|
||||||
|
|
||||||
local dx, dy, dz = self.ox + dx, self.oy + dy, self.oz + dz
|
local dx, dy = self.ox + dx, self.oy + dy, self.oz + dz
|
||||||
local x, y, z, cols, colNumber = self.world:checkCollisionAtPoint(self, dx, dy, dz, filter)
|
local x, y, z, cols, colNumber = self.world:checkCollisionAtPoint(self, dx, dy, dz, filter)
|
||||||
local newx, newy, newz = self:getNewOwnerPosition(x, y, z)
|
local newx, newy, newz = self:getNewOwnerPosition(x, y, z)
|
||||||
|
|
||||||
|
|
|
@ -5,12 +5,12 @@ return {
|
||||||
{"homming", 5},
|
{"homming", 5},
|
||||||
{"tornado", 9},
|
{"tornado", 9},
|
||||||
{"sonicwind", 9},
|
{"sonicwind", 9},
|
||||||
-- {"spinattack", 15},
|
{"spinattack", 15},
|
||||||
-- {"sonicflare", 18},
|
{"sonicflare", 18},
|
||||||
-- {"spindash", 26},
|
{"spindash", 26},
|
||||||
-- {"soniccracker", 30},
|
{"soniccracker", 30},
|
||||||
-- {"hommingattack", 35},
|
{"hommingattack", 35},
|
||||||
-- {"bluetornado", 40},
|
{"bluetornado", 40},
|
||||||
-- {"boost", 62},
|
{"boost", 62},
|
||||||
-- {"lightspeedattack", 70},
|
{"lightspeedattack", 70},
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue