Skip to content

Commit

Permalink
Merge pull request #4106 from FunkinCrew/main
Browse files Browse the repository at this point in the history 
Merge from main into develop
  • Loading branch information
@EliteMasterEric
EliteMasterEric authored Feb 5, 2025
2 parents 796cbb3 + ca16d41 commit 6f40aea
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion art
Submodule art updated 98 files
+5 −0 convertOGGToMP3.sh
+ − discord/album-expansion1.jpg
+ − discord/album-expansion2.png
+ − discord/album-volume1.jpg
+ − discord/album-volume1b.jpg
+ − discord/album-volume1c.bmp
+ − discord/album-volume1d.bmp
+ − discord/album-volume2.jpg
+ − discord/album-volume3.jpg
+ − discord/album-volume4.jpg
+ − discord/icon-bf-old.png
+ − discord/icon-bf-pixel.png
+ − discord/icon-bf.png
+ − discord/icon-dad.png
+ − discord/icon-darnell-blazin.png
+ − discord/icon-darnell.png
+ − discord/icon-face.png
+ − discord/icon-gf.png
+ − discord/icon-mom-car.png
+ − discord/icon-mom.png
+ − discord/icon-monster-christmas.png
+ − discord/icon-monster.png
+ − discord/icon-parents-christmas.png
+ − discord/icon-pico.png
+ − discord/icon-senpai-angry.png
+ − discord/icon-senpai.png
+ − discord/icon-spirit.png
+ − discord/icon-spooky-dark.png
+ − discord/icon-spooky.png
+ − discord/icon-tankman-atlas.png
+ − discord/icon-tankman.png
+ − flashFiles/CLICK HERE TO PLAY asset.fla
+ − flashFiles/Campaign Menu UI Weekend1.fla
+ − flashFiles/Can Arc NEWER.fla
+ − flashFiles/Christmas Erect Background Assets V3(1).fla
+ − flashFiles/Darnell Fighting Animations V2.fla
+ − flashFiles/Freeplay redesign assets VER2 compact.fla
+ − flashFiles/GF character select.fla
+ − flashFiles/GF_character_select.fla
+ − flashFiles/NOTE assets UPDATED.fla
+ − flashFiles/Nene character select v2.fla
+ − flashFiles/Nene christmas assets.fla
+ − flashFiles/Nene_character_select_v2.fla
+ − flashFiles/PICO bg ERECT.fla
+ − flashFiles/Pico Can Explosion Death.fla
+ − flashFiles/Pico Christmas assetss.fla
+ − flashFiles/Pico Fighting Animations V3.fla
+ − flashFiles/Pico Gut Punch Death Assets.fla
+ − flashFiles/RESULTS BOYFRIEND EXCELLENT RANK final v2.fla
+ − flashFiles/RESULTS BOYFRIEND GREAT RANK final.fla
+ − flashFiles/RESULTS BOYFRIEND LOSS RANK final v2.fla
+ − flashFiles/RESULTS BOYFRIEND PERFECT RANK final.fla
+ − flashFiles/RESULTS_BOYFRIEND_EXCELLENT_RANK_FINAL.fla
+ − flashFiles/RESULTS_BOYFRIEND_LOSS_RANK_final.fla
+ − flashFiles/RESULTS_BOYFRIEND_PERFECT_RANK_semi_final.fla
+ − flashFiles/Week 4 Erect.fla
+ − flashFiles/Weekend1 BG no puddles.fla
+ − flashFiles/Weekend1 ERECT BG.fla
+ − flashFiles/bf_pico_slides_packaged_v2.fla
+ − flashFiles/boyfriend character select v2.fla
+ − flashFiles/boyfriend freeplay animations v5.fla
+ − flashFiles/boyfriend_character_select_v2.fla
+ − flashFiles/campaign menu UI assets v2.fla
+ − flashFiles/character select assets for cam.fla
+ − flashFiles/character unlock backing card v2.fla
+ − flashFiles/digital numbers results.fla
+ − flashFiles/dipshit lights.fla
+ − flashFiles/fake out death final alt.fla
+ − flashFiles/freeplay album credits assets v4(1).fla
+ − flashFiles/freeplay capsule text.fla
+ − flashFiles/freeplay rank badges v2.fla
+ − flashFiles/freeplay sparks.fla
+ − flashFiles/lightning effect.fla
+ − flashFiles/loadng stickers set 1.fla
+ − flashFiles/lock unlocking v2.fla
+ − flashFiles/locked character assets v2.fla
+ − flashFiles/pico backing card v2.fla
+ − flashFiles/pico burp assets.fla
+ − flashFiles/pico character select v2.fla
+ − flashFiles/pico confirm card.fla
+ − flashFiles/pico doppleganger assets v2.fla
+ − flashFiles/pico freeplay assets v7.fla
+ − flashFiles/pico good rank final for now(1).fla
+ − flashFiles/pico great rank final(1).fla
+ − flashFiles/pico loss final.fla
+ − flashFiles/pico perfect rank final v2(1).fla
+ − flashFiles/pico_character_select_v2.fla
+ − flashFiles/results numbers small.fla
+ − flashFiles/results ranking assets v2.fla
+ − flashFiles/santa speaks assets.fla
+ − flashFiles/tankman beat it.fla
+ − flashFiles/traffic light animation and cars.fla
+ − flashFiles/week 1 erect v3.fla
+ − flashFiles/weekend1_fighting_rough_assets.fla
+99 −0 funScripts/chartingSheets/sheetsToCharts.py
+55 −9 funScripts/jsfl/frames.jsfl
+4 −0 optimizePNG.sh
+4 −0 resizeHealthIcons.sh

0 comments on commit 6f40aea

Please sign in to comment.