From f1ce272f0dd03d05e75915a84502df2f72281143 Mon Sep 17 00:00:00 2001 From: Connor Date: Wed, 27 Aug 2025 22:13:21 -0400 Subject: [PATCH 1/5] Untitled Chords Thing Overhaul --- Encore/Assets/ui/splashes.txt | 3 + .../cover.png | Bin 2056 -> 0 bytes .../{lead.ogg => guitar.ogg} | Bin .../info.json | 38 ------- .../{vocals.ogg => keys.ogg} | Bin .../notes.mid | Bin 20206 -> 124470 bytes .../song.ini | 94 ++++++++++++++++++ .../{backing.ogg => song.ogg} | Bin 8 files changed, 97 insertions(+), 38 deletions(-) delete mode 100644 Encore/Songs/Synthfox Soundworks - Untitled Chords Thing/cover.png rename Encore/Songs/Synthfox Soundworks - Untitled Chords Thing/{lead.ogg => guitar.ogg} (100%) delete mode 100644 Encore/Songs/Synthfox Soundworks - Untitled Chords Thing/info.json rename Encore/Songs/Synthfox Soundworks - Untitled Chords Thing/{vocals.ogg => keys.ogg} (100%) create mode 100644 Encore/Songs/Synthfox Soundworks - Untitled Chords Thing/song.ini rename Encore/Songs/Synthfox Soundworks - Untitled Chords Thing/{backing.ogg => song.ogg} (100%) diff --git a/Encore/Assets/ui/splashes.txt b/Encore/Assets/ui/splashes.txt index 6d61ffd9..9996ae5e 100644 --- a/Encore/Assets/ui/splashes.txt +++ b/Encore/Assets/ui/splashes.txt @@ -82,3 +82,6 @@ the ninja low taper fade meme. its crazy how its still massive! I have a Single Player Fan Status of 24 in #blurthegame! This! Sentence! Is! False! Smoking that shit that made Benjamin fold five! +The Rhythm Never Left: More Than an WHAT +Per Fidem Ad Ludos Rhythmicos! +0.2—More than one year in the making! diff --git a/Encore/Songs/Synthfox Soundworks - Untitled Chords Thing/cover.png b/Encore/Songs/Synthfox Soundworks - Untitled Chords Thing/cover.png deleted file mode 100644 index e6a9e4969b7b026ce6d8a53b415a0cf5d55ec89a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2056 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 H$-4g!KkJ&nmKcM z{*SfxlP~etJ7zS0;o+mb`@3fJ`NG00Z(TN{PvoLPEdQX%s%cC|B zckmw49gi8ZR9eN7x4_5NZ-EkdVBd*m`<@Joyqu(q-I-`}9eZNmt86CUy-(yj`{k*g zGReO>b~(H!$vG~bYI~0Mk0b8lC;4=;c1_NiS@Eiq57l^eUAg)EJga%-BTq5*+07LI z-)v6-8T}%t3#s*LoV;`|ndEdrSshnnDW*ipeM<2O>&_!vikqjF@b<{MI+i|M9Y4tf zbnRK|F0{S5JxBYO`;?0jkhXD_oxZ$}j;rG^HXh+qmRIBL`Y-yFx5U=ivkf=5@l&a$ zqIZmQL_2~Xv6I=3pQQJmkjB!U2>Z^thyN-l*V)t0_0RE zI0@PF3Z~XS-*ZI@0lKNxeUjkiV-}!1-`k8&sc2MkWjtvNDz);lI7N-s^Ty0B37iZn1W{%80=NsO% zh}7fPo5I(A!A;?-d{cOBWqtkW&&v)`NaDjz2m4!}Hapxzx_4&SBTA3jv^?o17{)}p zi&{k!X6dvoBPSpA{r)G*4tK_Gq8f5-Ua=K{&3!1`5eEi4aKgK#P6!F^h)C}$Nb*vh zV76x)rMpPA6;HAPPu?Y}hhSz29$}RutjMa9<@cG@rt9fVgN{|INY&!!1|;@g{CM&xwko|EP#tLBd6>sN!f$H zsWbfa?VvE+H(s`EFXP!+*~kb59JDWHLAOlZh16b9^5>o zocEN~^UIar{rTnN))(u)E#s^r6F$x>b_A-Vpn@YFo+%~&>}~k-RZcxlO?yp%%^^DE zawm|JgTG3!JoZkHe`U1t_~KAHOKFMYw5iVe=wl1LK(S*ur+v@4NGTss(4``Zo85`c z3^#)r9vGRyrb(nWkkMcXAe+|GR0|>z36Y30dXxt|XAuum2sYm4qo_kpB}F7N*fzsJ zDIl3UQ~}9dbBc4N4tOb?Ddjlwsg5lGmpVSfO(oT_19OQ2IhA2cLwm*pnT8~V^EiT3 zDWic}Kp)j>11%{4646}rF}i7pQt;|fDx+i>CT>J^Y)SJYr9e(D`VO5{r!A!#L8=UN z1GQ-g8)!+hG#9;{G;2gP1+NaJGDjgAlVLIxI(kTm)G^{ zRa}+{k8KsFe-*9~tY0r4$3x}IR$S@eiE1Ad@-)~1fpgR*n@OHN3(|T|DLz*4+r|p^ zMp=-0P=_LI;jE77a4`yP3f1%>X&|G)k~GYfmZn-#03@P8Zi}LPq>FPU1+NaJGD?;q zPj_+wX}6nvkAppSlTPJP!>UZDlPmgDw#Ctn8(&V-OqLV-II4}uEL@GFjp2-I;d`mWL;b7pxEw;(q;gE!V$Z! zrm49(=s-ntE(cw+Jy$w<#B7!BKFcWzJQZ}L?b8!~nGs5UzG}bu2x%zfuDt}pmr^}? z>e4q;Op}fTT8HFy>|t4TfRAUM`$1X zVEfd1O)SyjwyB0?(!v%m^rhZS1I!lhzMNHw-c@TqH$ z#zyP`D(c*nRwN?oTA@aZZeWq%6ABZy0AdlLaDsheu890Vgb2;Kf*W+#417(MP)PzE z)^WYqBqGA_PKr&fT+tJxxr!6y#nzqHjW!OCqq*1bezm{5-P_pR>pa=JH$41$G Date: Mon, 15 Sep 2025 21:13:40 -0400 Subject: [PATCH 2/5] Settings menu descriptions Adds and adjusts some of the descriptions in the settings menu. --- Encore/src/menus/SettingsAudioVideo.cpp | 40 ++++++++++++------------- Encore/src/menus/SettingsGameplay.cpp | 4 +-- Encore/src/menus/SettingsMenu.cpp | 10 +++---- Encore/src/menus/gameMenu.cpp | 2 +- 4 files changed, 28 insertions(+), 28 deletions(-) diff --git a/Encore/src/menus/SettingsAudioVideo.cpp b/Encore/src/menus/SettingsAudioVideo.cpp index 5c01dbf7..11a297ad 100644 --- a/Encore/src/menus/SettingsAudioVideo.cpp +++ b/Encore/src/menus/SettingsAudioVideo.cpp @@ -73,52 +73,52 @@ void SettingsAudioVideo::Draw() { // Volume { "Volume Settings", - "Placeholder" + "Configurable settings:\n- Master Volume\n- Active Instrument Volume\n- Inactive Instrument Volume\n- Muted Instrument Volume\n- Menu Music Volume\n- Sound Effect Volume" }, - // Main Output + // Master Volume { - "Main Output Volume", - "Placeholder" + "Master Volume", + "Adjusts the volume of the game\nitself." }, // Active Instrument { "Active Instrument Volume", - "Placeholder" + "Adjusts the volume of player\ninstruments." }, // Inactive Instrument { "Inactive Instrument Volume", - "Placeholder" + "Adjusts the volume of non-player\ninstruments." }, // Mute Instrument { - "Mute Instrument Volume", - "Placeholder" + "Muted Instrument Volume", + "Adjusts how loud the instrument\ntrack stays when a player misses." }, // Menu Music { "Menu Music Volume", - "Placeholder" + "Adjusts the volume of music inside\nthe menus." }, // Sound Effects { "Sound Effects Volume", - "Placeholder" + "Adjusts the volume of sound effects." }, // Background Beat Flash { "Background Beat Flash", - "Placeholder" + "Toggles the background flashing on\nbeat if the player has a active combo." }, // Framerate { - "Framerate", - "Placeholder" + "Framerate Limit", + "Adjusts the maximum framerate of the\ngame." }, // V-Sync { "V-Sync", - "Placeholder" + "Toggles forcing the game's framerate\nto the display's refresh rate to\nreduce screen tearing." } }; @@ -277,8 +277,8 @@ void SettingsAudioVideo::Draw() { Rectangle mainVolBoxRect = {volumeBoxLeft - borderWidth, mainVolTop - borderWidth, volumeBoxWidth + 2 * borderWidth, EntryHeight + 2 * borderWidth}; DrawRectangle(volumeBoxLeft - borderWidth, mainVolTop - borderWidth, volumeBoxWidth + 2 * borderWidth, EntryHeight + 2 * borderWidth, boxBorder); DrawRectangle(volumeBoxLeft, mainVolTop, volumeBoxWidth, EntryHeight, boxBackground); - Vector2 mainVolTextSize = MeasureTextEx(assets.rubikBold, "Main Output", EntryFontSize, 0); - DrawTextEx(assets.rubikBold, "Main Output", {volumeBoxLeft + u.winpct(0.01f), mainVolTop + (EntryHeight - mainVolTextSize.y) / 2}, EntryFontSize, 0, WHITE); + Vector2 mainVolTextSize = MeasureTextEx(assets.rubikBold, "Master Volume", EntryFontSize, 0); + DrawTextEx(assets.rubikBold, "Master Volume", {volumeBoxLeft + u.winpct(0.01f), mainVolTop + (EntryHeight - mainVolTextSize.y) / 2}, EntryFontSize, 0, WHITE); Rectangle mainVolSliderRect = {volumeOptionLeft + maxTextWidth + volumeShift, mainVolTop, adjustedVolumeSliderWidth, buttonHeight}; if (CheckCollisionPointRec(mousePos, mainVolSliderRect)) { selectedIndex = 2; @@ -352,8 +352,8 @@ void SettingsAudioVideo::Draw() { Rectangle muteVolBoxRect = {volumeBoxLeft - borderWidth, muteVolTop - borderWidth, volumeBoxWidth + 2 * borderWidth, EntryHeight + 2 * borderWidth}; DrawRectangle(volumeBoxLeft - borderWidth, muteVolTop - borderWidth, volumeBoxWidth + 2 * borderWidth, EntryHeight + 2 * borderWidth, boxBorder); DrawRectangle(volumeBoxLeft, muteVolTop, volumeBoxWidth, EntryHeight, boxBackground); - Vector2 muteVolTextSize = MeasureTextEx(assets.rubikBold, "Mute Instrument", EntryFontSize, 0); - DrawTextEx(assets.rubikBold, "Mute Instrument", {volumeBoxLeft + u.winpct(0.01f), muteVolTop + (EntryHeight - muteVolTextSize.y) / 2}, EntryFontSize, 0, WHITE); + Vector2 muteVolTextSize = MeasureTextEx(assets.rubikBold, "Muted Instrument", EntryFontSize, 0); + DrawTextEx(assets.rubikBold, "Muted Instrument", {volumeBoxLeft + u.winpct(0.01f), muteVolTop + (EntryHeight - muteVolTextSize.y) / 2}, EntryFontSize, 0, WHITE); Rectangle muteVolSliderRect = {volumeOptionLeft + maxTextWidth + volumeShift, muteVolTop, adjustedVolumeSliderWidth, buttonHeight}; if (CheckCollisionPointRec(mousePos, muteVolSliderRect)) { selectedIndex = 5; @@ -464,8 +464,8 @@ void SettingsAudioVideo::Draw() { Rectangle framerateBoxRect = {boxLeft - borderWidth, framerateTop - borderWidth, boxWidth + 2 * borderWidth, EntryHeight + 2 * borderWidth}; DrawRectangle(boxLeft - borderWidth, framerateTop - borderWidth, boxWidth + 2 * borderWidth, EntryHeight + 2 * borderWidth, boxBorder); DrawRectangle(boxLeft, framerateTop, boxWidth, EntryHeight, boxBackground); - Vector2 framerateTextSize = MeasureTextEx(assets.rubikBold, "Framerate", EntryFontSize, 0); - DrawTextEx(assets.rubikBold, "Framerate", {boxLeft + u.winpct(0.01f), framerateTop + (EntryHeight - framerateTextSize.y) / 2}, EntryFontSize, 0, WHITE); + Vector2 framerateTextSize = MeasureTextEx(assets.rubikBold, "Framerate Limit", EntryFontSize, 0); + DrawTextEx(assets.rubikBold, "Framerate Limit", {boxLeft + u.winpct(0.01f), framerateTop + (EntryHeight - framerateTextSize.y) / 2}, EntryFontSize, 0, WHITE); Rectangle frDecButtonRect = {OptionLeft + OptionWidth - sliderTotalWidth, framerateTop, buttonWidth15, buttonHeight}; Rectangle frSliderRect = {frDecButtonRect.x + buttonWidth15, framerateTop, adjustedSliderWidth, buttonHeight}; Rectangle frIncButtonRect = {frSliderRect.x + frSliderRect.width, framerateTop, buttonWidth15Inc, buttonHeight}; diff --git a/Encore/src/menus/SettingsGameplay.cpp b/Encore/src/menus/SettingsGameplay.cpp index a11c0c61..dd9bc773 100644 --- a/Encore/src/menus/SettingsGameplay.cpp +++ b/Encore/src/menus/SettingsGameplay.cpp @@ -73,12 +73,12 @@ void SettingsGameplay::Draw() { // fullscreen { "Fullscreen", - "TBD" + "Toggles if the game should be in\nfullscreen, albeit scuffed." }, // scan Songs { "Scan Songs", - "TBD" + "Manually scans song folders for any\nchanges or new songs and updates the\nsong cache." } }; diff --git a/Encore/src/menus/SettingsMenu.cpp b/Encore/src/menus/SettingsMenu.cpp index 0702874c..789b1ab8 100644 --- a/Encore/src/menus/SettingsMenu.cpp +++ b/Encore/src/menus/SettingsMenu.cpp @@ -34,7 +34,7 @@ void SettingsMenu::Draw() { DrawRectangle(0, 0, GetScreenWidth(), GetScreenHeight(), Color{50, 0, 0, 200}); float TextPlacementTB = u.hpct(0.05f); - float TextPlacementLR = u.wpct(0.05f); + float TextPlacementLR = u.hpct(0.05f); float EntryFontSize = u.hinpct(0.075f); float EntryHeight = u.hinpct(0.07f); float EntryTop = u.hpct(0.30f); @@ -62,7 +62,7 @@ void SettingsMenu::Draw() { // Audio / Visual { "Configure audio and video\nsettings", - "Configurable settings:\n- Audio calibration\n- Game volume\n- Background beat flash\n- Framerate\n- V-Sync\n" + "Configurable settings:\n- Audio Calibration\n- Volume Settings\n- Background Beat Flash\n- Framerate Limit\n- V-Sync" }, // Gameplay { @@ -72,17 +72,17 @@ void SettingsMenu::Draw() { // Controller Bindings { "Configure controller\nbindings", - "TBA" + "Configurable settings:\n- 4 Lane Gamepad Bindings\n- 5 Lane Gamepad Bindings\n- Overdrive Button\n- Pause Button" }, // Keyboard Bindings { "Configure keyboard\nbindings", - "TBA" + "Configurable settings:\n- 4 Lane Gamepad Bindings\n- 5 Lane Gamepad Bindings\n- Overdrive Key\n- Pause Key" }, // Credits { "Coming Soon", - "TBA" + "View everyone that\ncontributed to Encore!" } }; diff --git a/Encore/src/menus/gameMenu.cpp b/Encore/src/menus/gameMenu.cpp index 130180bf..54b86201 100644 --- a/Encore/src/menus/gameMenu.cpp +++ b/Encore/src/menus/gameMenu.cpp @@ -406,7 +406,7 @@ void MainMenu::MainMenuScreen() { GuiSetStyle(BUTTON, BASE_COLOR_NORMAL, 0x181827FF); } if (GuiButton( - { u.wpct(0.02f), u.hpct(0.39f), u.winpct(0.5), u.hinpct(0.08f) }, "Options" + { u.wpct(0.02f), u.hpct(0.39f), u.winpct(0.5), u.hinpct(0.08f) }, "Settings" )) { // glfwSetGamepadStateCallback(gamepadStateCallbackSetControls); TheMenuManager.SwitchScreen(SETTINGS); From d746be6298d77ae720f2dd9f868ffc53afb3098e Mon Sep 17 00:00:00 2001 From: Connor Date: Mon, 15 Sep 2025 21:18:34 -0400 Subject: [PATCH 3/5] t --- Encore/src/menus/SettingsMenu.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Encore/src/menus/SettingsMenu.cpp b/Encore/src/menus/SettingsMenu.cpp index 789b1ab8..e0cd4603 100644 --- a/Encore/src/menus/SettingsMenu.cpp +++ b/Encore/src/menus/SettingsMenu.cpp @@ -34,7 +34,7 @@ void SettingsMenu::Draw() { DrawRectangle(0, 0, GetScreenWidth(), GetScreenHeight(), Color{50, 0, 0, 200}); float TextPlacementTB = u.hpct(0.05f); - float TextPlacementLR = u.hpct(0.05f); + float TextPlacementLR = u.wpct(0.05f); float EntryFontSize = u.hinpct(0.075f); float EntryHeight = u.hinpct(0.07f); float EntryTop = u.hpct(0.30f); @@ -220,4 +220,4 @@ void SettingsMenu::Load() { #define OPTION(type, value, default) value = TheGameSettings.value; SETTINGS_OPTIONS; #undef OPTION -} \ No newline at end of file +} From 68d16821a7c06ba8b60b9377086801b74e31f65c Mon Sep 17 00:00:00 2001 From: Connor Date: Mon, 15 Sep 2025 21:18:53 -0400 Subject: [PATCH 4/5] Update SettingsMenu.cpp --- Encore/src/menus/SettingsMenu.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Encore/src/menus/SettingsMenu.cpp b/Encore/src/menus/SettingsMenu.cpp index e0cd4603..5686d36b 100644 --- a/Encore/src/menus/SettingsMenu.cpp +++ b/Encore/src/menus/SettingsMenu.cpp @@ -220,4 +220,4 @@ void SettingsMenu::Load() { #define OPTION(type, value, default) value = TheGameSettings.value; SETTINGS_OPTIONS; #undef OPTION -} +} \ No newline at end of file From 3a8e5a9ed4737fdc13765a8cebf35a21f55e9408 Mon Sep 17 00:00:00 2001 From: Connor Date: Sat, 25 Oct 2025 04:36:38 -0400 Subject: [PATCH 5/5] fnlookup doesn't work anymore, don't try it --- Encore/Assets/ui/splashes.txt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Encore/Assets/ui/splashes.txt b/Encore/Assets/ui/splashes.txt index 9996ae5e..6d1c42d2 100644 --- a/Encore/Assets/ui/splashes.txt +++ b/Encore/Assets/ui/splashes.txt @@ -1,5 +1,4 @@ - -It's Encore-ing time! +It's Encore-ing time! Do NOT drink the Among Us potion at 3 AM! What's better? Encore Raylib or Encore Unity? Player player = new Player;! @@ -55,7 +54,6 @@ Kimicake was here! Jaydenz was here! YOUR JORDANS ARE FAKE, SOLDIER!! tposejank was here! -Also try FNLookup! and multiplayer is being worked on as well! No practice mode; it's cheating! Do not do that!