1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-11-05 14:24:28 +00:00
This commit is contained in:
Cameron Taylor 2020-11-01 00:01:00 -07:00
parent df5ddd7885
commit 30509c9f34
4 changed files with 17 additions and 5 deletions

View file

@ -95,5 +95,5 @@
<!--Place custom nodes like icons here (higher priority to override the HaxeFlixel icon)--> <!--Place custom nodes like icons here (higher priority to override the HaxeFlixel icon)-->
<icon path="art/icon.png"/> <icon path="art/icon.png"/>
<!-- <haxedef name="SKIP_TO_PLAYSTATE" if="debug" /> --> <!-- <haxedef name="SKIP_TO_PLAYSTATE" if="debug" /> -->
<haxedef name="NG_LOGIN" /> <!-- <haxedef name="NG_LOGIN" /> -->
</project> </project>

View file

@ -0,0 +1,11 @@
@echo off
color 0a
cd ..
@echo on
echo BUILDING GAME
lime build html5 -release
echo UPLOADING TO ITCH
butler push ./export/release/html5/bin ninja-muffin24/funkin:html5
butler status ninja-muffin24/funkin:html5
echo ITCH SHIT UPDATED LMAOOOOO
pause

View file

@ -102,6 +102,7 @@ class StoryMenuState extends MusicBeatState
case 'bf': case 'bf':
weekCharacterThing.setGraphicSize(Std.int(weekCharacterThing.width * 0.9)); weekCharacterThing.setGraphicSize(Std.int(weekCharacterThing.width * 0.9));
weekCharacterThing.updateHitbox(); weekCharacterThing.updateHitbox();
weekCharacterThing.x -= 80;
case 'gf': case 'gf':
weekCharacterThing.setGraphicSize(Std.int(weekCharacterThing.width * 0.5)); weekCharacterThing.setGraphicSize(Std.int(weekCharacterThing.width * 0.5));
weekCharacterThing.updateHitbox(); weekCharacterThing.updateHitbox();
@ -145,8 +146,8 @@ class StoryMenuState extends MusicBeatState
txtTracklist.font = rankText.font; txtTracklist.font = rankText.font;
txtTracklist.color = 0xFFe55777; txtTracklist.color = 0xFFe55777;
add(txtTracklist); add(txtTracklist);
add(rankText); // add(rankText);
add(scoreText); // add(scoreText);
updateText(); updateText();

View file

@ -103,7 +103,7 @@ class TitleState extends MusicBeatState
// bg.updateHitbox(); // bg.updateHitbox();
add(bg); add(bg);
logoBl = new FlxSprite(-100, -100); logoBl = new FlxSprite(-150, -100);
logoBl.frames = FlxAtlasFrames.fromSparrow(AssetPaths.logoBumpin__png, AssetPaths.logoBumpin__xml); logoBl.frames = FlxAtlasFrames.fromSparrow(AssetPaths.logoBumpin__png, AssetPaths.logoBumpin__xml);
logoBl.antialiasing = true; logoBl.antialiasing = true;
logoBl.animation.addByPrefix('bump', 'logo bumpin', 24); logoBl.animation.addByPrefix('bump', 'logo bumpin', 24);
@ -111,7 +111,6 @@ class TitleState extends MusicBeatState
logoBl.updateHitbox(); logoBl.updateHitbox();
// logoBl.screenCenter(); // logoBl.screenCenter();
// logoBl.color = FlxColor.BLACK; // logoBl.color = FlxColor.BLACK;
add(logoBl);
gfDance = new FlxSprite(FlxG.width * 0.4, FlxG.height * 0.07); gfDance = new FlxSprite(FlxG.width * 0.4, FlxG.height * 0.07);
gfDance.frames = FlxAtlasFrames.fromSparrow(AssetPaths.gfDanceTitle__png, AssetPaths.gfDanceTitle__xml); gfDance.frames = FlxAtlasFrames.fromSparrow(AssetPaths.gfDanceTitle__png, AssetPaths.gfDanceTitle__xml);
@ -119,6 +118,7 @@ class TitleState extends MusicBeatState
gfDance.animation.addByIndices('danceRight', 'gfDance', [15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29], "", 24, false); gfDance.animation.addByIndices('danceRight', 'gfDance', [15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29], "", 24, false);
gfDance.antialiasing = true; gfDance.antialiasing = true;
add(gfDance); add(gfDance);
add(logoBl);
titleText = new FlxSprite(100, FlxG.height * 0.8); titleText = new FlxSprite(100, FlxG.height * 0.8);
titleText.frames = FlxAtlasFrames.fromSparrow(AssetPaths.titleEnter__png, AssetPaths.titleEnter__xml); titleText.frames = FlxAtlasFrames.fromSparrow(AssetPaths.titleEnter__png, AssetPaths.titleEnter__xml);