Skip to content

Commit

Permalink
Merge branch 'jefvel-video-works-and-multiplayer' of https://github.c…
Browse files Browse the repository at this point in the history
…om/chosencharacters/Tankmas2024 into jefvel-video-works-and-multiplayer
  • Loading branch information
chosencharacters committed Dec 1, 2024
2 parents 5f52dd8 + e5582e6 commit d0ca153
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Project.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<!-- _________________________ Application Settings _________________________ -->

<app title="Tankmas 2024" file="Tankmas 2024" main="Main" version="0.0.1" company="Glenside Helper Elf Society" />
<app title="Tankmas 2024" file="Tankmas 2024" main="Main" version="1.0.0" company="Glenside Helper Elf Society" />

<!--The flixel preloader is not accurate in Chrome. You can use it regularly if you embed the swf into a html file
or you can set the actual size of your file manually at "FlxPreloaderBase-onUpdate-bytesTotal"-->
Expand Down
3 changes: 1 addition & 2 deletions assets/data/anims/general-anims.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,13 @@
<anim name="idle" fps="100ms" looping="false">0</anim>
</animSet>

<animSet image="sticker-pack-opening">
<animSet image="sticker-pack-opening" width="784" height="839">
<anim name="idle" fps="500ms" looping="false">0</anim>
<anim name="1" looping="false">1t3</anim>
<anim name="2" looping="false">4t6</anim>
<anim name="3" looping="false">7t9</anim>
<anim name="4" looping="false">10t12</anim>
<anim name="pre-kaboom" fps="100ms" looping="false">13t15</anim>
<anim name="kaboom" fps="60ms" looping="false">16t40</anim>
<variable name="shake" frames="1,4,7,10,16"/>
</animSet>

Expand Down
Binary file modified assets/images/fx/sticker-pack-opening.aseprite
Binary file not shown.
Binary file modified assets/images/fx/sticker-pack-opening.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit d0ca153

Please sign in to comment.