Merge branch 'master' into titlescreen-refactor

This commit is contained in:
Hersi 2022-04-27 02:49:17 +02:00
commit badbaabe2b
2 changed files with 8 additions and 2 deletions

View File

@ -2,3 +2,5 @@
-- IF YOU DO THE GAME WILL IMMEDIATELY CRASH AND IT'S NOT THE BEST -- IF YOU DO THE GAME WILL IMMEDIATELY CRASH AND IT'S NOT THE BEST
-- THANK YOU HAVE A GOOD LUA -- THANK YOU HAVE A GOOD LUA
gfx.LoadSkinFont("segoeui.ttf") gfx.LoadSkinFont("segoeui.ttf")
function useFootGun() while true do end end

View File

@ -107,8 +107,12 @@ end
function button_hit(button, rating, delta) function button_hit(button, rating, delta)
if (showHitAnims) then if (showHitAnims) then
if (rating == 1) then
HitFX.TriggerAnimation("Near", button + 1)
else
HitFX.TriggerAnimation("Crit", button + 1) HitFX.TriggerAnimation("Crit", button + 1)
end end
end
end end
function laser_slam_hit(slamLength, startPos, endPost, index) function laser_slam_hit(slamLength, startPos, endPost, index)