Skip to content

Commit

Permalink
fixed conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
gregchan550 committed Sep 19, 2023
2 parents 2832d1f + 5366e6e commit fbaf223
Showing 1 changed file with 1 addition and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public static Entity createDemonBoss() {
animator.addAnimation("demon_death", 0.2f, Animation.PlayMode.LOOP);
animator.addAnimation("demon_fire_breath", 0.2f, Animation.PlayMode.LOOP);
animator.addAnimation("demon_idle", 0.2f, Animation.PlayMode.LOOP);
animator.addAnimation("demon_smash", 0.1f, Animation.PlayMode.LOOP);
animator.addAnimation("demon_smash", 0.10f, Animation.PlayMode.LOOP);
animator.addAnimation("demon_take_hit", 0.2f, Animation.PlayMode.LOOP);
animator.addAnimation("demon_walk", 0.2f, Animation.PlayMode.LOOP);
animator.addAnimation("idle", 0.2f, Animation.PlayMode.LOOP);
Expand Down

0 comments on commit fbaf223

Please sign in to comment.