Skip to content

Commit

Permalink
changes before i go to sleep
Browse files Browse the repository at this point in the history
3 new noteskins: circle, chip and future
health display is no longer toggled by default
strum light up style: customizes how long strum anims play for
fixed health tween type having the wrong description
optimized notes flying to the strums, so now every note skin has centered sustain notes
  • Loading branch information
JordanSantiagoYT committed Oct 28, 2023
1 parent afcf168 commit 541454a
Show file tree
Hide file tree
Showing 18 changed files with 357 additions and 108 deletions.
Binary file modified assets/android/hitbox.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 6 additions & 6 deletions assets/android/hitbox.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<TextureAtlas imagePath="hitbox.png">
<SubTexture name="left" x="0" y="0" width="320" height="720" frameX="0" frameY="0" frameWidth="320" frameHeight="720"/>
<SubTexture name="down" x="320" y="0" width="320" height="720" frameX="0" frameY="0" frameWidth="320" frameHeight="720"/>
<SubTexture name="up" x="640" y="0" width="320" height="720" frameX="0" frameY="0" frameWidth="320" frameHeight="720"/>
<SubTexture name="right" x="960" y="0" width="320" height="720" frameX="0" frameY="0" frameWidth="320" frameHeight="720"/>
<?xml version="1.0" encoding="utf-8"?>
<TextureAtlas imagePath="hitbox.png">
<SubTexture name="left" x="0" y="0" width="320" height="720" frameX="0" frameY="0" frameWidth="320" frameHeight="720"/>
<SubTexture name="down" x="320" y="0" width="320" height="720" frameX="0" frameY="0" frameWidth="320" frameHeight="720"/>
<SubTexture name="up" x="640" y="0" width="320" height="720" frameX="0" frameY="0" frameWidth="320" frameHeight="720"/>
<SubTexture name="right" x="960" y="0" width="320" height="720" frameX="0" frameY="0" frameWidth="320" frameHeight="720"/>
</TextureAtlas>
Binary file added assets/android/icon-jigsaw.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/android/menu/arrows.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 8 additions & 8 deletions assets/android/menu/arrows.xml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<TextureAtlas imagePath="arrows.png">
<!-- Created with Adobe Animate version 21.0.5.40714 -->
<!-- http://www.adobe.com/products/animate.html -->
<SubTexture name="arrow left0000" x="0" y="0" width="48" height="85"/>
<SubTexture name="arrow push left0000" x="58" y="0" width="42" height="75"/>
<SubTexture name="arrow push right0000" x="110" y="0" width="41" height="74"/>
<SubTexture name="arrow right0000" x="161" y="0" width="47" height="85"/>
<?xml version="1.0" encoding="utf-8"?>
<TextureAtlas imagePath="arrows.png">
<!-- Created with Adobe Animate version 21.0.5.40714 -->
<!-- http://www.adobe.com/products/animate.html -->
<SubTexture name="arrow left0000" x="0" y="0" width="48" height="85"/>
<SubTexture name="arrow push left0000" x="58" y="0" width="42" height="75"/>
<SubTexture name="arrow push right0000" x="110" y="0" width="41" height="74"/>
<SubTexture name="arrow right0000" x="161" y="0" width="47" height="85"/>
</TextureAtlas>
Binary file modified assets/android/virtualpad.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
20 changes: 19 additions & 1 deletion assets/android/virtualpad.xml
Original file line number Diff line number Diff line change
@@ -1 +1,19 @@
<?xml version="1.0" encoding="utf-8"?><TextureAtlas imagePath="virtualpad.png"><SubTexture name="left" x="0" y="0" width="396" height="127" frameX="0" frameY="0" frameWidth="396" frameHeight="127"/><SubTexture name="down" x="396" y="0" width="396" height="127" frameX="0" frameY="0" frameWidth="396" frameHeight="127"/><SubTexture name="up" x="792" y="0" width="396" height="127" frameX="0" frameY="0" frameWidth="396" frameHeight="127"/><SubTexture name="right" x="1188" y="0" width="396" height="127" frameX="0" frameY="0" frameWidth="396" frameHeight="127"/><SubTexture name="a" x="0" y="127" width="396" height="127" frameX="0" frameY="0" frameWidth="396" frameHeight="127"/><SubTexture name="b" x="396" y="127" width="396" height="127" frameX="0" frameY="0" frameWidth="396" frameHeight="127"/><SubTexture name="c" x="792" y="127" width="396" height="127" frameX="0" frameY="0" frameWidth="396" frameHeight="127"/><SubTexture name="d" x="1188" y="127" width="396" height="127" frameX="0" frameY="0" frameWidth="396" frameHeight="127"/><SubTexture name="e" x="0" y="254" width="396" height="127" frameX="0" frameY="0" frameWidth="396" frameHeight="127"/><SubTexture name="f" x="396" y="254" width="396" height="127" frameX="0" frameY="0" frameWidth="396" frameHeight="127"/><SubTexture name="g" x="792" y="254" width="396" height="127" frameX="0" frameY="0" frameWidth="396" frameHeight="127"/><SubTexture name="s" x="1188" y="254" width="396" height="127" frameX="0" frameY="0" frameWidth="396" frameHeight="127"/><SubTexture name="v" x="0" y="381" width="396" height="127" frameX="0" frameY="0" frameWidth="396" frameHeight="127"/><SubTexture name="x" x="396" y="381" width="396" height="127" frameX="0" frameY="0" frameWidth="396" frameHeight="127"/><SubTexture name="y" x="792" y="381" width="396" height="127" frameX="0" frameY="0" frameWidth="396" frameHeight="127"/><SubTexture name="z" x="1188" y="381" width="396" height="127" frameX="0" frameY="0" frameWidth="396" frameHeight="127"/></TextureAtlas>
<?xml version="1.0" encoding="utf-8"?>
<TextureAtlas imagePath="virtualpad.png">
<SubTexture name="left" x="0" y="0" width="396" height="127" frameX="0" frameY="0" frameWidth="396" frameHeight="127"/>
<SubTexture name="down" x="396" y="0" width="396" height="127" frameX="0" frameY="0" frameWidth="396" frameHeight="127"/>
<SubTexture name="up" x="792" y="0" width="396" height="127" frameX="0" frameY="0" frameWidth="396" frameHeight="127"/>
<SubTexture name="right" x="1188" y="0" width="396" height="127" frameX="0" frameY="0" frameWidth="396" frameHeight="127"/>
<SubTexture name="a" x="0" y="127" width="396" height="127" frameX="0" frameY="0" frameWidth="396" frameHeight="127"/>
<SubTexture name="b" x="396" y="127" width="396" height="127" frameX="0" frameY="0" frameWidth="396" frameHeight="127"/>
<SubTexture name="c" x="792" y="127" width="396" height="127" frameX="0" frameY="0" frameWidth="396" frameHeight="127"/>
<SubTexture name="d" x="1188" y="127" width="396" height="127" frameX="0" frameY="0" frameWidth="396" frameHeight="127"/>
<SubTexture name="e" x="0" y="254" width="396" height="127" frameX="0" frameY="0" frameWidth="396" frameHeight="127"/>
<SubTexture name="f" x="396" y="254" width="396" height="127" frameX="0" frameY="0" frameWidth="396" frameHeight="127"/>
<SubTexture name="g" x="792" y="254" width="396" height="127" frameX="0" frameY="0" frameWidth="396" frameHeight="127"/>
<SubTexture name="s" x="1188" y="254" width="396" height="127" frameX="0" frameY="0" frameWidth="396" frameHeight="127"/>
<SubTexture name="v" x="0" y="381" width="396" height="127" frameX="0" frameY="0" frameWidth="396" frameHeight="127"/>
<SubTexture name="x" x="396" y="381" width="396" height="127" frameX="0" frameY="0" frameWidth="396" frameHeight="127"/>
<SubTexture name="y" x="792" y="381" width="396" height="127" frameX="0" frameY="0" frameWidth="396" frameHeight="127"/>
<SubTexture name="z" x="1188" y="381" width="396" height="127" frameX="0" frameY="0" frameWidth="396" frameHeight="127"/>
</TextureAtlas>
Binary file added assets/shared/images/NOTE_assets_chip.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
53 changes: 53 additions & 0 deletions assets/shared/images/NOTE_assets_chip.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
<?xml version="1.0" encoding="utf-8"?>
<TextureAtlas imagePath="ChipNOTE_assets.png">
<!-- Created with Adobe Animate version 21.0.4.39603 -->
<!-- http://www.adobe.com/products/animate.html -->
<SubTexture name="arrowDOWN0000" x="4" y="4" width="152" height="152" pivotX="1.1" pivotY="3"/>
<SubTexture name="arrowLEFT0000" x="160" y="4" width="152" height="152" pivotX="-0.35" pivotY="-0.35"/>
<SubTexture name="arrowRIGHT0000" x="316" y="4" width="151" height="152" pivotX="1.9" pivotY="-5.1"/>
<SubTexture name="arrowUP0000" x="471" y="4" width="152" height="152" pivotX="-3.4" pivotY="1.5"/>
<SubTexture name="blue0000" x="627" y="4" width="152" height="152" pivotX="0" pivotY="0"/>
<SubTexture name="blue hold end0000" x="783" y="4" width="114" height="50" pivotX="0" pivotY="-0.6"/>
<SubTexture name="blue hold piece0000" x="901" y="4" width="114" height="76" pivotX="0" pivotY="0"/>
<SubTexture name="down confirm0000" x="1019" y="4" width="225" height="225" pivotX="28.6" pivotY="29.9"/>
<SubTexture name="down confirm0001" x="1248" y="4" width="215" height="215" frameX="-5" frameY="-5" frameWidth="225" frameHeight="225"/>
<SubTexture name="down confirm0002" x="1467" y="4" width="223" height="223" frameX="-1" frameY="0" frameWidth="225" frameHeight="225"/>
<SubTexture name="down confirm0003" x="1467" y="4" width="223" height="223" frameX="-1" frameY="0" frameWidth="225" frameHeight="225"/>
<SubTexture name="down press0000" x="1694" y="4" width="142" height="142" pivotX="-0.5" pivotY="0.75" frameX="-4" frameY="-3" frameWidth="150" frameHeight="149"/>
<SubTexture name="down press0001" x="1694" y="4" width="142" height="142" frameX="-4" frameY="-3" frameWidth="150" frameHeight="149"/>
<SubTexture name="down press0002" x="1840" y="4" width="150" height="149"/>
<SubTexture name="down press0003" x="1840" y="4" width="150" height="149"/>
<SubTexture name="green0000" x="4" y="233" width="152" height="152" pivotX="0" pivotY="0"/>
<SubTexture name="green hold end0000" x="160" y="233" width="114" height="50" pivotX="0" pivotY="-0.6"/>
<SubTexture name="green hold piece0000" x="278" y="233" width="114" height="76" pivotX="0" pivotY="0"/>
<SubTexture name="left confirm0000" x="396" y="233" width="225" height="226" pivotX="31.3" pivotY="31"/>
<SubTexture name="left confirm0001" x="625" y="233" width="215" height="216" frameX="-5" frameY="-5" frameWidth="225" frameHeight="226"/>
<SubTexture name="left confirm0002" x="844" y="233" width="223" height="223" frameX="-2" frameY="-1" frameWidth="225" frameHeight="226"/>
<SubTexture name="left confirm0003" x="844" y="233" width="223" height="223" frameX="-2" frameY="-1" frameWidth="225" frameHeight="226"/>
<SubTexture name="left press0000" x="1071" y="233" width="142" height="142" pivotX="-0.5" pivotY="0.75" frameX="-4" frameY="-3" frameWidth="150" frameHeight="149"/>
<SubTexture name="left press0001" x="1071" y="233" width="142" height="142" frameX="-4" frameY="-3" frameWidth="150" frameHeight="149"/>
<SubTexture name="left press0002" x="1217" y="233" width="150" height="149"/>
<SubTexture name="left press0003" x="1217" y="233" width="150" height="149"/>
<SubTexture name="purple0000" x="1371" y="233" width="152" height="152" pivotX="0" pivotY="0"/>
<SubTexture name="pruple end hold0000" x="1527" y="233" width="114" height="50" pivotX="0" pivotY="-0.6"/>
<SubTexture name="purple hold piece0000" x="1645" y="233" width="114" height="76" pivotX="0" pivotY="0"/>
<SubTexture name="red0000" x="1763" y="233" width="152" height="152" pivotX="0" pivotY="0"/>
<SubTexture name="red hold end0000" x="1919" y="233" width="114" height="50" pivotX="0" pivotY="-0.6"/>
<SubTexture name="red hold piece0000" x="4" y="463" width="114" height="76" pivotX="0" pivotY="0"/>
<SubTexture name="right confirm0000" x="122" y="463" width="225" height="226" pivotX="32.8" pivotY="32.1"/>
<SubTexture name="right confirm0001" x="351" y="463" width="215" height="216" frameX="-5" frameY="-5" frameWidth="225" frameHeight="226"/>
<SubTexture name="right confirm0002" x="570" y="463" width="222" height="223" frameX="-1" frameY="-2" frameWidth="225" frameHeight="226"/>
<SubTexture name="right confirm0003" x="570" y="463" width="222" height="223" frameX="-1" frameY="-2" frameWidth="225" frameHeight="226"/>
<SubTexture name="right press0000" x="796" y="463" width="142" height="142" pivotX="-0.5" pivotY="0.75" frameX="-4" frameY="-3" frameWidth="150" frameHeight="149"/>
<SubTexture name="right press0001" x="796" y="463" width="142" height="142" frameX="-4" frameY="-3" frameWidth="150" frameHeight="149"/>
<SubTexture name="right press0002" x="942" y="463" width="150" height="149"/>
<SubTexture name="right press0003" x="942" y="463" width="150" height="149"/>
<SubTexture name="up confirm0000" x="1096" y="463" width="226" height="225" pivotX="31.25" pivotY="31.6" frameX="0" frameY="-1" frameWidth="226" frameHeight="226"/>
<SubTexture name="up confirm0001" x="1326" y="463" width="216" height="215" frameX="-6" frameY="-3" frameWidth="226" frameHeight="226"/>
<SubTexture name="up confirm0002" x="1546" y="463" width="223" height="222" frameX="-3" frameY="0" frameWidth="226" frameHeight="226"/>
<SubTexture name="up confirm0003" x="1546" y="463" width="223" height="222" frameX="-3" frameY="0" frameWidth="226" frameHeight="226"/>
<SubTexture name="up press0000" x="1773" y="463" width="142" height="142" pivotX="-0.5" pivotY="0.75" frameX="-4" frameY="-3" frameWidth="150" frameHeight="149"/>
<SubTexture name="up press0001" x="1773" y="463" width="142" height="142" frameX="-4" frameY="-3" frameWidth="150" frameHeight="149"/>
<SubTexture name="up press0002" x="4" y="693" width="150" height="149"/>
<SubTexture name="up press0003" x="4" y="693" width="150" height="149"/>
</TextureAtlas>
Binary file added assets/shared/images/NOTE_assets_circle.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 541454a

Please sign in to comment.