Skip to content

Commit

Permalink
just commit
Browse files Browse the repository at this point in the history
  • Loading branch information
@luckydog7
luckydog7 committed Feb 7, 2021
1 parent f33540c commit 93cce99
Show file tree
Hide file tree
Showing 42 changed files with 2,035 additions and 491 deletions.
22 changes: 14 additions & 8 deletions Project.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<project>
<!-- _________________________ Application Settings _________________________ -->

<app title="Friday Night Funkin" file="Funkin" packageName="com.ninjamuffin99.funkin" main="Main" version="0.2.5" company="ninjamuffin99" />
<app title="Friday Night Funkin'" file="Funkin" packageName="com.ninjamuffin99.funkin" main="Main" version="0.2.7" company="ninjamuffin99" />

<!--Switch Export with Unique ApplicationID and Icon-->
<set name="APP_ID" value="0x0100f6c013bbc000" />
Expand All @@ -24,11 +24,11 @@
<window if="html5" resizable="true" />

<!--Desktop-specific-->
<window if="desktop" orientation="landscape" fullscreen="false" resizable="true" />
<window if="desktop" orientation="landscape" fullscreen="false" resizable="true" vsync="false"/>

<!--Mobile-specific-->
<window if="mobile" orientation="landscape" fullscreen="true" width="0" height="0" />
<meta package="com.ninjamuffin99.funkin" version="0.2.5"/>
<meta package="com.ninjamuffin99.funkin" version="0.2.7"/>
<!--Switch-specific-->
<window if="switch" orientation="landscape" fullscreen="true" width="0" height="0" resizable="true" />

Expand All @@ -42,6 +42,8 @@

<assets path="assets/images" />
<assets path="assets/data" />
<assets path='example_mods' rename='mods' embed='false'/>
<!-- <template path='mods' /> -->

<!-- <library name="noPreload" preload='false'/> -->
<!-- <library name="noPreload"/> -->
Expand All @@ -52,9 +54,12 @@

<assets path="CHANGELOG.md"/>


<assets path="assets/fonts/vcr.ttf" embed="true" />

<!-- NOTE FOR FUTURE SELF SINCE FONTS ARE ALWAYS FUCKY
TO FIX ONE OF THEM, I CONVERTED IT TO OTF. DUNNO IF YOU NEED TO
THEN UHHH I USED THE NAME OF THE FONT WITH SETFORMAT() ON THE TEXT!!!
NOT USING A DIRECT THING TO THE ASSET!!!
-->
<assets path="assets/fonts" embed='true'/>
<!-- _______________________________ Libraries ______________________________ -->

<haxelib name="flixel" />
Expand All @@ -66,8 +71,9 @@

<!--In case you want to use the ui package-->
<haxelib name="flixel-ui" />
<haxelib name="newgrounds"/>
<!--<haxelib name="newgrounds"/>-->
<haxelib name="faxe" if='switch'/>
<haxelib name="polymod"/>

<!-- <haxelib name="markdown" /> -->
<!-- <haxelib name="HtmlParser" /> -->
Expand Down Expand Up @@ -99,7 +105,7 @@
<!--<haxedef name="FLX_NO_SOUND_SYSTEM" />-->

<!--Disable the Flixel core focus lost screen-->
<!--<haxedef name="FLX_NO_FOCUS_LOST_SCREEN" />-->
<haxedef name="FLX_NO_FOCUS_LOST_SCREEN" />

<!--Disable the Flixel core debugger. Automatically gets set whenever you compile in release mode!-->
<haxedef name="FLX_NO_DEBUG" unless="debug" />
Expand Down
Binary file modified art/flashFiles/campaign_menu_UI_assets.fla
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion assets/data/high/high-easy.json
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/data/high/high-hard.json
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/data/high/high.json
View file

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions assets/data/introText.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,10 @@ his name isnt keith--dumb eggy lol
his name isnt evan--silly tiktok
stream chuckie finster--on spotify
never forget to--pray to god
dont play rust--we only funkin
good bye--my penis
dababy--biggest inspiration
fashionably late--but here it is
yooooooooooo--yooooooooo
pico funny--pico funny
updates each friday--on time every time
2 changes: 1 addition & 1 deletion assets/data/milf/milf-easy.json
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/data/milf/milf-hard.json
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/data/milf/milf.json
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/data/satin-panties/satin-panties-easy.json
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/data/satin-panties/satin-panties-hard.json
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/data/satin-panties/satin-panties.json
View file

Large diffs are not rendered by default.

26 changes: 5 additions & 21 deletions assets/data/specialThanks.txt
View file
Original file line number Diff line number Diff line change
@@ -1,22 +1,3 @@
<<<<<<< HEAD
wanda
fizzd
kiddbrute
HenryEYES
Clone Hero
Tom Fulp
StuffedWombat
mmatt_ugh
Squidly
Luis
GeoKureli
Will Blanton
SrPelo
Austin East

BIT BOY - MIKE WELSH
||||||| empty tree
=======
wanda
fizzd
kiddbrute
Expand All @@ -33,6 +14,9 @@ SrPelo
Austin East
Krystin, Kaye-lyn, Cassidy, Mack, Levi, and Jasmine.
Laurel
bbpanzu
Etika
Foamymuffin (insert travis scott lyrics here)
SiIvaGunner

BIT BOY - MIKE WELSH
>>>>>>> 62febd7ad6964e608ca494f18a8cbaa38ad5cf0d
BIT BOY - MIKE WELSH
Binary file modified assets/images/campaign_menu_UI_assets.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
27 changes: 13 additions & 14 deletions assets/images/campaign_menu_UI_assets.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,24 +5,23 @@
<SubTexture name="EASY0000" x="0" y="0" width="196" height="65"/>
<SubTexture name="HARD0000" x="206" y="0" width="211" height="67"/>
<SubTexture name="NORMAL0000" x="427" y="0" width="308" height="67"/>
<SubTexture name="WEEK 40000" x="0" y="275" width="355" height="89"/>
<SubTexture name="WEEK10000" x="0" y="77" width="360" height="89"/>
<SubTexture name="WEEK1 select0000" x="0" y="77" width="360" height="89"/>
<SubTexture name="WEEK1 select0001" x="370" y="77" width="360" height="89"/>
<SubTexture name="WEEK20000" x="0" y="470" width="361" height="87"/>
<SubTexture name="Week 30000" x="0" y="176" width="358" height="89"/>
<SubTexture name="Week 3 press0000" x="0" y="176" width="358" height="89"/>
<SubTexture name="Week 3 press0001" x="368" y="176" width="358" height="89"/>
<SubTexture name="Week 4 press0000" x="0" y="275" width="355" height="89"/>
<SubTexture name="Week 4 press0001" x="365" y="275" width="355" height="89"/>
<SubTexture name="arrow left0000" x="730" y="275" width="48" height="85"/>
<SubTexture name="arrow push left0000" x="788" y="275" width="42" height="75"/>
<SubTexture name="arrow push right0000" x="840" y="275" width="41" height="74"/>
<SubTexture name="arrow right0000" x="891" y="275" width="47" height="85"/>
<SubTexture name="lock0000" x="948" y="275" width="67" height="93"/>
<SubTexture name="tutorial0000" x="0" y="378" width="443" height="82"/>
<SubTexture name="tutorial selected0000" x="0" y="378" width="443" height="82"/>
<SubTexture name="tutorial selected0001" x="453" y="378" width="443" height="82"/>
<SubTexture name="week2 select0000" x="0" y="470" width="361" height="87"/>
<SubTexture name="week2 select0001" x="371" y="470" width="361" height="87"/>
<SubTexture name="Week 60000" x="0" y="374" width="359" height="92"/>
<SubTexture name="Week 60001" x="369" y="374" width="359" height="92"/>
<SubTexture name="arrow left0000" x="738" y="374" width="48" height="85"/>
<SubTexture name="arrow push left0000" x="796" y="374" width="42" height="75"/>
<SubTexture name="arrow push right0000" x="848" y="374" width="41" height="74"/>
<SubTexture name="arrow right0000" x="899" y="374" width="47" height="85"/>
<SubTexture name="lock0000" x="956" y="374" width="67" height="93"/>
<SubTexture name="tutorial selected0000" x="0" y="477" width="443" height="82"/>
<SubTexture name="tutorial selected0001" x="453" y="477" width="443" height="82"/>
<SubTexture name="week 50000" x="0" y="569" width="364" height="91"/>
<SubTexture name="week 50001" x="374" y="569" width="364" height="91"/>
<SubTexture name="week2 select0000" x="0" y="670" width="361" height="87"/>
<SubTexture name="week2 select0001" x="371" y="670" width="361" height="87"/>
</TextureAtlas>
Binary file modified assets/images/campaign_menu_UI_characters.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
88 changes: 58 additions & 30 deletions assets/images/campaign_menu_UI_characters.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,34 +100,62 @@
<SubTexture name="Mom Idle BLACK LINES0011" x="6234" y="1435" width="386" height="829" frameX="0" frameY="0" frameWidth="390" frameHeight="829"/>
<SubTexture name="Mom Idle BLACK LINES0012" x="6630" y="1435" width="386" height="829" frameX="0" frameY="0" frameWidth="390" frameHeight="829"/>
<SubTexture name="Mom Idle BLACK LINES0013" x="6630" y="1435" width="386" height="829" frameX="0" frameY="0" frameWidth="390" frameHeight="829"/>
<SubTexture name="Pico Idle Dance0000" x="7026" y="1435" width="435" height="461" frameX="-18" frameY="-13" frameWidth="453" frameHeight="475"/>
<SubTexture name="Pico Idle Dance0001" x="7026" y="1435" width="435" height="461" frameX="-18" frameY="-13" frameWidth="453" frameHeight="475"/>
<SubTexture name="Pico Idle Dance0002" x="7471" y="1435" width="442" height="468" frameX="-11" frameY="-6" frameWidth="453" frameHeight="475"/>
<SubTexture name="Pico Idle Dance0003" x="7471" y="1435" width="442" height="468" frameX="-11" frameY="-6" frameWidth="453" frameHeight="475"/>
<SubTexture name="Pico Idle Dance0004" x="0" y="2274" width="448" height="469" frameX="-1" frameY="-6" frameWidth="453" frameHeight="475"/>
<SubTexture name="Pico Idle Dance0005" x="458" y="2274" width="444" height="469" frameX="-1" frameY="-6" frameWidth="453" frameHeight="475"/>
<SubTexture name="Pico Idle Dance0006" x="912" y="2274" width="444" height="474" frameX="-1" frameY="-1" frameWidth="453" frameHeight="475"/>
<SubTexture name="Pico Idle Dance0007" x="1366" y="2274" width="442" height="474" frameX="-1" frameY="-1" frameWidth="453" frameHeight="475"/>
<SubTexture name="Pico Idle Dance0008" x="1818" y="2274" width="443" height="475" frameX="0" frameY="0" frameWidth="453" frameHeight="475"/>
<SubTexture name="Pico Idle Dance0009" x="1818" y="2274" width="443" height="475" frameX="0" frameY="0" frameWidth="453" frameHeight="475"/>
<SubTexture name="Pico Idle Dance0010" x="1818" y="2274" width="443" height="475" frameX="0" frameY="0" frameWidth="453" frameHeight="475"/>
<SubTexture name="Pico Idle Dance0011" x="1818" y="2274" width="443" height="475" frameX="0" frameY="0" frameWidth="453" frameHeight="475"/>
<SubTexture name="Pico Idle Dance0012" x="1818" y="2274" width="443" height="475" frameX="0" frameY="0" frameWidth="453" frameHeight="475"/>
<SubTexture name="Pico Idle Dance0013" x="1818" y="2274" width="443" height="475" frameX="0" frameY="0" frameWidth="453" frameHeight="475"/>
<SubTexture name="spooky dance idle BLACK LINES0000" x="2271" y="2274" width="381" height="549" frameX="-50" frameY="0" frameWidth="492" frameHeight="549"/>
<SubTexture name="spooky dance idle BLACK LINES0001" x="2271" y="2274" width="381" height="549" frameX="-50" frameY="0" frameWidth="492" frameHeight="549"/>
<SubTexture name="spooky dance idle BLACK LINES0002" x="2662" y="2274" width="379" height="541" frameX="-55" frameY="-8" frameWidth="492" frameHeight="549"/>
<SubTexture name="spooky dance idle BLACK LINES0003" x="2662" y="2274" width="379" height="541" frameX="-55" frameY="-8" frameWidth="492" frameHeight="549"/>
<SubTexture name="spooky dance idle BLACK LINES0004" x="3051" y="2274" width="357" height="484" frameX="-79" frameY="-61" frameWidth="492" frameHeight="549"/>
<SubTexture name="spooky dance idle BLACK LINES0005" x="3051" y="2274" width="357" height="484" frameX="-79" frameY="-61" frameWidth="492" frameHeight="549"/>
<SubTexture name="spooky dance idle BLACK LINES0006" x="3418" y="2274" width="354" height="494" frameX="-78" frameY="-52" frameWidth="492" frameHeight="549"/>
<SubTexture name="spooky dance idle BLACK LINES0007" x="3418" y="2274" width="354" height="494" frameX="-78" frameY="-52" frameWidth="492" frameHeight="549"/>
<SubTexture name="spooky dance idle BLACK LINES0008" x="3782" y="2274" width="492" height="532" frameX="0" frameY="-16" frameWidth="492" frameHeight="549"/>
<SubTexture name="spooky dance idle BLACK LINES0009" x="3782" y="2274" width="492" height="532" frameX="0" frameY="-16" frameWidth="492" frameHeight="549"/>
<SubTexture name="spooky dance idle BLACK LINES0010" x="4284" y="2274" width="481" height="524" frameX="-7" frameY="-20" frameWidth="492" frameHeight="549"/>
<SubTexture name="spooky dance idle BLACK LINES0011" x="4284" y="2274" width="481" height="524" frameX="-7" frameY="-20" frameWidth="492" frameHeight="549"/>
<SubTexture name="spooky dance idle BLACK LINES0012" x="3051" y="2274" width="357" height="484" frameX="-79" frameY="-61" frameWidth="492" frameHeight="549"/>
<SubTexture name="spooky dance idle BLACK LINES0013" x="3051" y="2274" width="357" height="484" frameX="-79" frameY="-61" frameWidth="492" frameHeight="549"/>
<SubTexture name="spooky dance idle BLACK LINES0014" x="3418" y="2274" width="354" height="494" frameX="-78" frameY="-52" frameWidth="492" frameHeight="549"/>
<SubTexture name="spooky dance idle BLACK LINES0015" x="3418" y="2274" width="354" height="494" frameX="-78" frameY="-52" frameWidth="492" frameHeight="549"/>
<SubTexture name="Parent Christmas Idle Black Lines0000" x="7026" y="1435" width="873" height="777" frameX="-6" frameY="-5" frameWidth="884" frameHeight="782"/>
<SubTexture name="Parent Christmas Idle Black Lines0001" x="7026" y="1435" width="873" height="777" frameX="-6" frameY="-5" frameWidth="884" frameHeight="782"/>
<SubTexture name="Parent Christmas Idle Black Lines0002" x="0" y="2274" width="876" height="760" frameX="0" frameY="-22" frameWidth="884" frameHeight="782"/>
<SubTexture name="Parent Christmas Idle Black Lines0003" x="0" y="2274" width="876" height="760" frameX="0" frameY="-22" frameWidth="884" frameHeight="782"/>
<SubTexture name="Parent Christmas Idle Black Lines0004" x="886" y="2274" width="877" height="766" frameX="-5" frameY="-16" frameWidth="884" frameHeight="782"/>
<SubTexture name="Parent Christmas Idle Black Lines0005" x="886" y="2274" width="877" height="766" frameX="-5" frameY="-16" frameWidth="884" frameHeight="782"/>
<SubTexture name="Parent Christmas Idle Black Lines0006" x="1773" y="2274" width="866" height="777" frameX="-18" frameY="-5" frameWidth="884" frameHeight="782"/>
<SubTexture name="Parent Christmas Idle Black Lines0007" x="1773" y="2274" width="866" height="777" frameX="-18" frameY="-5" frameWidth="884" frameHeight="782"/>
<SubTexture name="Parent Christmas Idle Black Lines0008" x="2649" y="2274" width="865" height="781" frameX="-19" frameY="-1" frameWidth="884" frameHeight="782"/>
<SubTexture name="Parent Christmas Idle Black Lines0009" x="2649" y="2274" width="865" height="781" frameX="-19" frameY="-1" frameWidth="884" frameHeight="782"/>
<SubTexture name="Parent Christmas Idle Black Lines0010" x="3524" y="2274" width="865" height="782" frameX="-19" frameY="0" frameWidth="884" frameHeight="782"/>
<SubTexture name="Parent Christmas Idle Black Lines0011" x="3524" y="2274" width="865" height="782" frameX="-19" frameY="0" frameWidth="884" frameHeight="782"/>
<SubTexture name="Parent Christmas Idle Black Lines0012" x="3524" y="2274" width="865" height="782" frameX="-19" frameY="0" frameWidth="884" frameHeight="782"/>
<SubTexture name="Parent Christmas Idle Black Lines0013" x="3524" y="2274" width="865" height="782" frameX="-19" frameY="0" frameWidth="884" frameHeight="782"/>
<SubTexture name="Pico Idle Dance0000" x="4399" y="2274" width="435" height="461" frameX="-18" frameY="-13" frameWidth="453" frameHeight="475"/>
<SubTexture name="Pico Idle Dance0001" x="4399" y="2274" width="435" height="461" frameX="-18" frameY="-13" frameWidth="453" frameHeight="475"/>
<SubTexture name="Pico Idle Dance0002" x="4844" y="2274" width="442" height="468" frameX="-11" frameY="-6" frameWidth="453" frameHeight="475"/>
<SubTexture name="Pico Idle Dance0003" x="4844" y="2274" width="442" height="468" frameX="-11" frameY="-6" frameWidth="453" frameHeight="475"/>
<SubTexture name="Pico Idle Dance0004" x="5296" y="2274" width="448" height="469" frameX="-1" frameY="-6" frameWidth="453" frameHeight="475"/>
<SubTexture name="Pico Idle Dance0005" x="5754" y="2274" width="444" height="469" frameX="-1" frameY="-6" frameWidth="453" frameHeight="475"/>
<SubTexture name="Pico Idle Dance0006" x="6208" y="2274" width="444" height="474" frameX="-1" frameY="-1" frameWidth="453" frameHeight="475"/>
<SubTexture name="Pico Idle Dance0007" x="6662" y="2274" width="442" height="474" frameX="-1" frameY="-1" frameWidth="453" frameHeight="475"/>
<SubTexture name="Pico Idle Dance0008" x="7114" y="2274" width="443" height="475" frameX="0" frameY="0" frameWidth="453" frameHeight="475"/>
<SubTexture name="Pico Idle Dance0009" x="7114" y="2274" width="443" height="475" frameX="0" frameY="0" frameWidth="453" frameHeight="475"/>
<SubTexture name="Pico Idle Dance0010" x="7114" y="2274" width="443" height="475" frameX="0" frameY="0" frameWidth="453" frameHeight="475"/>
<SubTexture name="Pico Idle Dance0011" x="7114" y="2274" width="443" height="475" frameX="0" frameY="0" frameWidth="453" frameHeight="475"/>
<SubTexture name="Pico Idle Dance0012" x="7114" y="2274" width="443" height="475" frameX="0" frameY="0" frameWidth="453" frameHeight="475"/>
<SubTexture name="Pico Idle Dance0013" x="7114" y="2274" width="443" height="475" frameX="0" frameY="0" frameWidth="453" frameHeight="475"/>
<SubTexture name="SENPAI idle Black Lines0000" x="7567" y="2274" width="336" height="288"/>
<SubTexture name="SENPAI idle Black Lines0001" x="7567" y="2274" width="336" height="288"/>
<SubTexture name="SENPAI idle Black Lines0002" x="0" y="3066" width="336" height="288"/>
<SubTexture name="SENPAI idle Black Lines0003" x="0" y="3066" width="336" height="288"/>
<SubTexture name="SENPAI idle Black Lines0004" x="346" y="3066" width="336" height="288"/>
<SubTexture name="SENPAI idle Black Lines0005" x="346" y="3066" width="336" height="288"/>
<SubTexture name="SENPAI idle Black Lines0006" x="692" y="3066" width="336" height="288"/>
<SubTexture name="SENPAI idle Black Lines0007" x="692" y="3066" width="336" height="288"/>
<SubTexture name="SENPAI idle Black Lines0008" x="1038" y="3066" width="336" height="288"/>
<SubTexture name="SENPAI idle Black Lines0009" x="1038" y="3066" width="336" height="288"/>
<SubTexture name="SENPAI idle Black Lines0010" x="1038" y="3066" width="336" height="288"/>
<SubTexture name="SENPAI idle Black Lines0011" x="1038" y="3066" width="336" height="288"/>
<SubTexture name="SENPAI idle Black Lines0012" x="1038" y="3066" width="336" height="288"/>
<SubTexture name="SENPAI idle Black Lines0013" x="1038" y="3066" width="336" height="288"/>
<SubTexture name="spooky dance idle BLACK LINES0000" x="1384" y="3066" width="381" height="549" frameX="-50" frameY="0" frameWidth="492" frameHeight="549"/>
<SubTexture name="spooky dance idle BLACK LINES0001" x="1384" y="3066" width="381" height="549" frameX="-50" frameY="0" frameWidth="492" frameHeight="549"/>
<SubTexture name="spooky dance idle BLACK LINES0002" x="1775" y="3066" width="379" height="541" frameX="-55" frameY="-8" frameWidth="492" frameHeight="549"/>
<SubTexture name="spooky dance idle BLACK LINES0003" x="1775" y="3066" width="379" height="541" frameX="-55" frameY="-8" frameWidth="492" frameHeight="549"/>
<SubTexture name="spooky dance idle BLACK LINES0004" x="2164" y="3066" width="357" height="484" frameX="-79" frameY="-61" frameWidth="492" frameHeight="549"/>
<SubTexture name="spooky dance idle BLACK LINES0005" x="2164" y="3066" width="357" height="484" frameX="-79" frameY="-61" frameWidth="492" frameHeight="549"/>
<SubTexture name="spooky dance idle BLACK LINES0006" x="2531" y="3066" width="354" height="494" frameX="-78" frameY="-52" frameWidth="492" frameHeight="549"/>
<SubTexture name="spooky dance idle BLACK LINES0007" x="2531" y="3066" width="354" height="494" frameX="-78" frameY="-52" frameWidth="492" frameHeight="549"/>
<SubTexture name="spooky dance idle BLACK LINES0008" x="2895" y="3066" width="492" height="532" frameX="0" frameY="-16" frameWidth="492" frameHeight="549"/>
<SubTexture name="spooky dance idle BLACK LINES0009" x="2895" y="3066" width="492" height="532" frameX="0" frameY="-16" frameWidth="492" frameHeight="549"/>
<SubTexture name="spooky dance idle BLACK LINES0010" x="3397" y="3066" width="481" height="524" frameX="-7" frameY="-20" frameWidth="492" frameHeight="549"/>
<SubTexture name="spooky dance idle BLACK LINES0011" x="3397" y="3066" width="481" height="524" frameX="-7" frameY="-20" frameWidth="492" frameHeight="549"/>
<SubTexture name="spooky dance idle BLACK LINES0012" x="2164" y="3066" width="357" height="484" frameX="-79" frameY="-61" frameWidth="492" frameHeight="549"/>
<SubTexture name="spooky dance idle BLACK LINES0013" x="2164" y="3066" width="357" height="484" frameX="-79" frameY="-61" frameWidth="492" frameHeight="549"/>
<SubTexture name="spooky dance idle BLACK LINES0014" x="2531" y="3066" width="354" height="494" frameX="-78" frameY="-52" frameWidth="492" frameHeight="549"/>
<SubTexture name="spooky dance idle BLACK LINES0015" x="2531" y="3066" width="354" height="494" frameX="-78" frameY="-52" frameWidth="492" frameHeight="549"/>
</TextureAtlas>
Binary file modified assets/images/iconGrid.png
View file
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/music/Monster_Inst.mp3
View file
Binary file not shown.
Binary file modified assets/music/Monster_Voices.mp3
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion source/Alphabet.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ class AlphaCharacter extends FlxSprite
public function new(x:Float, y:Float)
{
super(x, y);
var tex = FlxAtlasFrames.fromSparrow(AssetPaths.alphabet__png, AssetPaths.alphabet__xml);
var tex = FlxAtlasFrames.fromSparrow('assets/images/alphabet.png', 'assets/images/alphabet.xml');
frames = tex;

antialiasing = true;
Expand Down
2 changes: 2 additions & 0 deletions source/AnimationDebug.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ class AnimationDebug extends FlxState
add(dad);

char = dad;
dad.flipX = false;
}
else
{
Expand All @@ -59,6 +60,7 @@ class AnimationDebug extends FlxState
add(bf);

char = bf;
bf.flipX = false;
}

dumbTexts = new FlxTypedGroup<FlxText>();
Expand Down
Loading

0 comments on commit 93cce99

Please sign in to comment.