diff --git a/CHANGELOG.md b/CHANGELOG.md index 85f61e9a0..5a7f47e6a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,10 +4,12 @@ All notable changes will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [unreleased] +## [unreleased] ### Changed +- New icons, old one was placeholder since October woops! - Made the transitions between the story mode levels more seamless. ### Fixed +- Layering on Week 4 songs with GF and the LIMO LOL HOW TF I MISS THIS - Chart's and chart editor now support changeBPM, GOD BLESS MTH FOR THIS ONE I BEEN STRUGGLIN WIT THAT SINCE OCTOBER LMAO ([GOD BLESS MTH](https://github.com/ninjamuffin99/Funkin/pull/382)) - Antialiasing on the skyscraper lights diff --git a/Project.xml b/Project.xml index 498368897..9a04d2611 100644 --- a/Project.xml +++ b/Project.xml @@ -116,7 +116,10 @@ - + + + + diff --git a/art/icon.png b/art/icon.png deleted file mode 100644 index 72d5b1743..000000000 Binary files a/art/icon.png and /dev/null differ diff --git a/art/icon16.png b/art/icon16.png new file mode 100644 index 000000000..188f23ce2 Binary files /dev/null and b/art/icon16.png differ diff --git a/art/icon32.png b/art/icon32.png new file mode 100644 index 000000000..c5be7d24d Binary files /dev/null and b/art/icon32.png differ diff --git a/art/icon64.png b/art/icon64.png new file mode 100644 index 000000000..1d882e630 Binary files /dev/null and b/art/icon64.png differ diff --git a/art/iconOG.png b/art/iconOG.png new file mode 100644 index 000000000..b8327137a Binary files /dev/null and b/art/iconOG.png differ diff --git a/assets/data/introText.txt b/assets/data/introText.txt index 86a54fc8f..63c967aa1 100644 --- a/assets/data/introText.txt +++ b/assets/data/introText.txt @@ -38,3 +38,4 @@ yooooooooooo--yooooooooo pico funny--pico funny updates each friday--on time every time shoutouts to mason--for da homies +references are an homage--but stealing is a crime \ No newline at end of file diff --git a/source/Note.hx b/source/Note.hx index 32e1b5c18..954bbb64c 100644 --- a/source/Note.hx +++ b/source/Note.hx @@ -51,33 +51,7 @@ class Note extends FlxSprite switch (daStage) { - case 'school': - loadGraphic('assets/images/weeb/pixelUI/arrows-pixels.png', true, 17, 17); - - animation.add('greenScroll', [6]); - animation.add('redScroll', [7]); - animation.add('blueScroll', [5]); - animation.add('purpleScroll', [4]); - - if (isSustainNote) - { - loadGraphic('assets/images/weeb/pixelUI/arrowEnds.png', true, 7, 6); - - animation.add('purpleholdend', [4]); - animation.add('greenholdend', [6]); - animation.add('redholdend', [7]); - animation.add('blueholdend', [5]); - - animation.add('purplehold', [0]); - animation.add('greenhold', [2]); - animation.add('redhold', [3]); - animation.add('bluehold', [1]); - } - - setGraphicSize(Std.int(width * PlayState.daPixelZoom)); - updateHitbox(); - - case 'schoolEvil': // COPY PASTED CUZ I AM LAZY + case 'school' | 'schoolEvil': loadGraphic('assets/images/weeb/pixelUI/arrows-pixels.png', true, 17, 17); animation.add('greenScroll', [6]); diff --git a/source/PlayState.hx b/source/PlayState.hx index cb4f4876b..69d37283c 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -529,10 +529,6 @@ class PlayState extends MusicBeatState gf = new Character(400, 130, gfVersion); gf.scrollFactor.set(0.95, 0.95); - // Shitty layering but whatev it works LOL - if (curStage == 'limo') - add(limo); - dad = new Character(100, 100, SONG.player2); var camPos:FlxPoint = new FlxPoint(dad.getGraphicMidpoint().x, dad.getGraphicMidpoint().y); @@ -614,6 +610,11 @@ class PlayState extends MusicBeatState } add(gf); + + // Shitty layering but whatev it works LOL + if (curStage == 'limo') + add(limo); + add(dad); add(boyfriend);