Skip to content
This repository has been archived by the owner on Jan 17, 2023. It is now read-only.

Commit

Permalink
Merge pull request #179 from YoshiCrafter29/dev
Browse files Browse the repository at this point in the history 
1.9.0
  • Loading branch information
@YoshiCrafter29
YoshiCrafter29 committed May 5, 2022
2 parents e361ff8 + ed97430 commit ea75caa
Show file tree
Hide file tree
Showing 260 changed files with 12,497 additions and 2,421 deletions.
2 changes: 1 addition & 1 deletion Project.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<haxedef name="HXCPP_CHECK_POINTER" if="release" />
<haxedef name="HXCPP_STACK_LINE" if="release" />
<haxedef name="HXCPP_DEBUG_LINK" if="release" />
<haxedef name="hscriptPos" />
<haxedef name="hscriptPos" /> <!-- for logging -->
<haxedef name="newgrounds" if="windows"/>
<!-- <haxedef name="lua" unless="android"/> -->

Expand Down
Binary file modified art/flashFiles/FNF_main_menu_assets.fla
View file
Binary file not shown.
Binary file added art/flashFiles/bf-holding-gf-edits.fla
View file
Binary file not shown.
Binary file added art/flashFiles/pico-killin-assetss.fla
View file
Binary file not shown.
Binary file added art/flashFiles/tankman-assets-pack.fla
View file
Binary file not shown.
Binary file added art/flashFiles/tankman-bg-assets.fla
View file
Binary file not shown.
Binary file added art/flashFiles/tankman-fnf-lip-sync-back.fla
View file
Binary file not shown.
Binary file added art/flashFiles/tankman-spooky-dance.fla
View file
Binary file not shown.
Binary file added art/flashFiles/week-7-cutscene-assets-sm.fla
View file
Binary file not shown.
Binary file modified assets/preload/images/credits/abnormalpoof.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/preload/images/credits/kiyuusama.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/preload/images/credits/polybius.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/preload/images/credits/yoshicrafter29.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/preload/images/uiIcons.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/shared/images/splashes.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.
39 changes: 18 additions & 21 deletions assets/shared/images/splashes.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,22 @@
<TextureAtlas imagePath="splashes.png">
<!-- Created with Adobe Animate version 21.0.1.37179 -->
<!-- http://www.adobe.com/products/animate.html -->
<!-- These are made by siivkoi (gray) they're legit one of the kindest persons i've ever met -->
<SubTexture name="splash10000" x="0" y="0" width="147" height="146" frameX="-190" frameY="-114" frameWidth="550" frameHeight="426"/>
<SubTexture name="splash10001" x="147" y="0" width="376" height="289" frameX="-97" frameY="-45" frameWidth="550" frameHeight="426"/>
<SubTexture name="splash10002" x="147" y="0" width="376" height="289" frameX="-97" frameY="-45" frameWidth="550" frameHeight="426"/>
<SubTexture name="splash10003" x="523" y="0" width="471" height="369" frameX="-52" frameY="-14" frameWidth="550" frameHeight="426"/>
<SubTexture name="splash10004" x="523" y="0" width="471" height="369" frameX="-52" frameY="-14" frameWidth="550" frameHeight="426"/>
<SubTexture name="splash10005" x="994" y="0" width="518" height="412" frameX="-19" frameY="0" frameWidth="550" frameHeight="426"/>
<SubTexture name="splash10006" x="994" y="0" width="518" height="412" frameX="-19" frameY="0" frameWidth="550" frameHeight="426"/>
<SubTexture name="splash10007" x="0" y="412" width="550" height="300" frameX="0" frameY="-126" frameWidth="550" frameHeight="426"/>
<SubTexture name="splash10008" x="0" y="412" width="550" height="300" frameX="0" frameY="-126" frameWidth="550" frameHeight="426"/>
<SubTexture name="splash10009" x="550" y="412" width="0" height="0" frameX="5" frameY="-25" frameWidth="550" frameHeight="426"/>
<SubTexture name="splash20000" x="550" y="412" width="145" height="146" frameX="-166" frameY="-189" frameWidth="426" frameHeight="548"/>
<SubTexture name="splash20001" x="695" y="412" width="288" height="374" frameX="-92" frameY="-97" frameWidth="426" frameHeight="548"/>
<SubTexture name="splash20002" x="695" y="412" width="288" height="374" frameX="-92" frameY="-97" frameWidth="426" frameHeight="548"/>
<SubTexture name="splash20003" x="983" y="412" width="368" height="470" frameX="-43" frameY="-51" frameWidth="426" frameHeight="548"/>
<SubTexture name="splash20004" x="983" y="412" width="368" height="470" frameX="-43" frameY="-51" frameWidth="426" frameHeight="548"/>
<SubTexture name="splash20005" x="1351" y="412" width="412" height="516" frameX="-14" frameY="-19" frameWidth="426" frameHeight="548"/>
<SubTexture name="splash20006" x="1351" y="412" width="412" height="516" frameX="-14" frameY="-19" frameWidth="426" frameHeight="548"/>
<SubTexture name="splash20007" x="0" y="928" width="299" height="548" frameX="0" frameY="0" frameWidth="426" frameHeight="548"/>
<SubTexture name="splash20008" x="0" y="928" width="299" height="548" frameX="0" frameY="0" frameWidth="426" frameHeight="548"/>
<SubTexture name="splash20009" x="299" y="928" width="0" height="0" frameX="-184" frameY="-207" frameWidth="426" frameHeight="548"/>
<SubTexture name="splash10000" x="15" y="15" width="147" height="146" frameX="-190" frameY="-114" frameWidth="550" frameHeight="426"/>
<SubTexture name="splash10001" x="177" y="15" width="376" height="289" frameX="-97" frameY="-45" frameWidth="550" frameHeight="426"/>
<SubTexture name="splash10002" x="177" y="15" width="376" height="289" frameX="-97" frameY="-45" frameWidth="550" frameHeight="426"/>
<SubTexture name="splash10003" x="568" y="15" width="471" height="369" frameX="-52" frameY="-14" frameWidth="550" frameHeight="426"/>
<SubTexture name="splash10004" x="568" y="15" width="471" height="369" frameX="-52" frameY="-14" frameWidth="550" frameHeight="426"/>
<SubTexture name="splash10005" x="1054" y="15" width="518" height="412" frameX="-19" frameY="0" frameWidth="550" frameHeight="426"/>
<SubTexture name="splash10006" x="1054" y="15" width="518" height="412" frameX="-19" frameY="0" frameWidth="550" frameHeight="426"/>
<SubTexture name="splash10007" x="15" y="442" width="550" height="300" frameX="0" frameY="-126" frameWidth="550" frameHeight="426"/>
<SubTexture name="splash10008" x="15" y="442" width="550" height="300" frameX="0" frameY="-126" frameWidth="550" frameHeight="426"/>
<SubTexture name="splash20000" x="595" y="442" width="145" height="146" frameX="-166" frameY="-189" frameWidth="426" frameHeight="548"/>
<SubTexture name="splash20001" x="755" y="442" width="288" height="374" frameX="-92" frameY="-97" frameWidth="426" frameHeight="548"/>
<SubTexture name="splash20002" x="755" y="442" width="288" height="374" frameX="-92" frameY="-97" frameWidth="426" frameHeight="548"/>
<SubTexture name="splash20003" x="1058" y="442" width="368" height="470" frameX="-43" frameY="-51" frameWidth="426" frameHeight="548"/>
<SubTexture name="splash20004" x="1058" y="442" width="368" height="470" frameX="-43" frameY="-51" frameWidth="426" frameHeight="548"/>
<SubTexture name="splash20005" x="1441" y="442" width="412" height="516" frameX="-14" frameY="-19" frameWidth="426" frameHeight="548"/>
<SubTexture name="splash20006" x="1441" y="442" width="412" height="516" frameX="-14" frameY="-19" frameWidth="426" frameHeight="548"/>
<SubTexture name="splash20007" x="15" y="973" width="299" height="548" frameX="0" frameY="0" frameWidth="426" frameHeight="548"/>
<SubTexture name="splash20008" x="15" y="973" width="299" height="548" frameX="0" frameY="0" frameWidth="426" frameHeight="548"/>
</TextureAtlas>
28 changes: 28 additions & 0 deletions mods/Friday Night Funkin'/characters/bf-holding-gf-dead/Character.hx
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
function create() {
character.frames = Paths.getCharacter(curCharacter);

character.animation.addByPrefix('firstDeath', "BF Dies with GF", 24, false);
character.animation.addByPrefix('deathLoop', "BF Dead with GF Loop", 24, false);
character.animation.addByPrefix('deathConfirm', "RETRY confirm holding gf", 24, false);

character.addOffset('firstDeath', 37, 14);
character.addOffset('deathLoop', 37, -3);
character.addOffset('deathConfirm', 37, 28);

character.charGlobalOffset.y = 350;
character.flipX = true;
}

function dance() {
character.playAnim("deathLoop");
}

function getColors(altAnim) {
return [
0xFF31B0D1,
EngineSettings.arrowColor0,
EngineSettings.arrowColor1,
EngineSettings.arrowColor2,
EngineSettings.arrowColor3
];
}
Binary file added mods/Friday Night Funkin'/characters/bf-holding-gf-dead/spritesheet.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.
Loading

0 comments on commit ea75caa

Please sign in to comment.