From f8f84114a0543dbfbd7e3b3796d3110baab52a1b Mon Sep 17 00:00:00 2001 From: Joalor64 Date: Mon, 29 Jul 2024 23:55:12 -0400 Subject: [PATCH] last commit for today --- Project.xml | 26 ++++++++++++++++++-------- assets/data/songList.json | 2 +- icon.png | Bin 0 -> 7967 bytes source/states/ControlsState.hx | 2 +- source/states/MenuState.hx | 7 ++++++- source/states/OptionsState.hx | 2 +- source/states/PlayState.hx | 2 +- source/states/SongSelectState.hx | 9 +++++---- source/states/TitleState.hx | 7 +++---- 9 files changed, 36 insertions(+), 21 deletions(-) create mode 100644 icon.png diff --git a/Project.xml b/Project.xml index fe32d98..a631559 100644 --- a/Project.xml +++ b/Project.xml @@ -1,17 +1,17 @@ - + - + - + @@ -19,7 +19,7 @@ - + @@ -31,7 +31,7 @@ - + @@ -39,14 +39,24 @@ + + + + + + + + + - - + + + - + diff --git a/assets/data/songList.json b/assets/data/songList.json index e2b699b..56a8262 100644 --- a/assets/data/songList.json +++ b/assets/data/songList.json @@ -1,5 +1,5 @@ { "songs": [ - {"name": "Test", "diff": "Easy"} + {"name": "Test", "diff": "★★"} ] } \ No newline at end of file diff --git a/icon.png b/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..c55ab5e2eefccd3183566280f5e82afa74c02d51 GIT binary patch literal 7967 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 - { + new FlxTimer().start(0.01, (tmr:FlxTimer) -> { if (logo.angle == -4) FlxTween.angle(logo, logo.angle, 4, 4, {ease: FlxEase.quartInOut}); if (logo.angle == 4)