cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2025-09-04 12:48:04 +00:00
Code Issues Releases Wiki Activity
7019 commits 30 branches 30 tags 4.1 GiB
Commit graph

437 commits

Author SHA1 Message Date
Lasercar dafbb43532 capsule jump in 2025-04-29 19:59:35 +10:00
Lasercar 29b541af38 First rank overrides itself fix 2025-04-29 19:57:31 +10:00
Lasercar fc09350be7 This should fix the squashed capsule text, right? 2025-04-29 19:57:23 +10:00
Lasercar a15bd36943 Freeplay UI fixes 
Input is disabled as soon as possible when a capsule is open
Input re-enables after capsule errors
instrument selector uses the capsule's target position as it's position, rather than the capsule's position
 2025-04-29 19:53:32 +10:00
EliteMasterEric 7e62782fa1 Merge branch 'rewrite/master' into funkin-mobile/main 2025-04-28 13:49:40 -04:00
KarimAkra 4d77d21b15 Refactor menus UI positioning for notch size to look cleaner 2025-04-21 01:10:37 +03:00
MoonDroid 53794ab4cc Fix compiling for desktop platforms by adding missing conditionals in some classes. 2025-04-19 16:09:19 +07:00
kade-github b48b5ae1aa remember diff for generate song list 2025-04-18 17:33:31 -04:00
KarimAkra a7ef5580a4 Merge branch 'rewrite/master' of github.com:FunkinCrew/Funkin-secret into funkin-mobile/main 2025-04-18 14:41:20 +03:00
EliteMasterEric 750779a3fb Disable the pop-in animation on the Random capsule for consistency. 2025-04-17 18:25:44 -04:00
kade-github 095bc9006d animation on all diffs 2025-04-17 18:25:44 -04:00
kade-github 09fdd0c91e going to erect with the erect takes you to the closest erect 2025-04-17 18:25:44 -04:00
kade-github be5d6227a7 erect nearest neighbor select 2025-04-17 18:25:44 -04:00
sector-a dc000b33eb Add FEATURE_HAPTICS 2025-04-17 19:51:36 +03:00
MoonDroid 50baf0c869 Fix idling difficulty position in FreeplayState. 2025-04-17 21:52:51 +07:00
KarimAkra b6e31e581a Fixed building errors 2025-04-17 14:51:33 +03:00
MoonDroid 81c92fc11f Fix a bug with freeplay's difficulty swiping where it freezes the capsule. 2025-04-17 13:16:23 +03:00
MoonDroid c9138e4d1f Small clean up to the new code in Freeplay. 2025-04-17 13:14:40 +03:00
MoonDroid 2bfc24f22b Add the ability to swipe on the mp3 capsules to change difficulty. 2025-04-17 13:14:16 +03:00
MoonDroid ebb9d373c3 Refactor handleInput() into smaller neater functions, and add an extra difficulty check to avoid swipe issues. 2025-04-17 13:13:54 +03:00
sector-a bcdbe2993c Fix selection in Freeplay 2025-04-17 13:09:57 +03:00
MoonDroid 828de1c512 Add grpDifficulty back to freeplay. 2025-04-17 13:06:01 +03:00
sector-a b68ba97ca6 Add tween out for backbutton in freeplay when the menu gets closed. 2025-04-17 12:44:30 +03:00
MoonDroid 61f1bdd89a Refactor the new flick and scroll code for mobile, aswell as fix a few unnoticable bugs. 2025-04-17 12:43:23 +03:00
MoonDroid f7f502dd92 Tweak scrolling values for mobile & fix flick wrapping for mobile in Freeplay. 2025-04-17 12:42:50 +03:00
zacksgamerz 4226ba8978 Work in progress sketch for new flicks and scrolls on freeplay 2025-04-17 12:40:21 +03:00
KarimAkra bef3815901 Fixed freeplay highlight and selection 2025-04-17 12:34:17 +03:00
KarimAkra 37fa11fe08 revamp songs selection and highlight on freeplay 2025-04-17 12:34:17 +03:00
KarimAkra e8d3fa8a35 simplfy the un-indexed freeplay scrolling logic 2025-04-17 12:34:17 +03:00
KarimAkra 0a0789faea Fixed selection 2025-04-17 12:32:28 +03:00
KarimAkra 5d6e44d5f1 Un-index freeplay 
that's experimental
there's a weird bug when selecting a song where it confirms instead of selecting for some reason
 2025-04-17 12:26:10 +03:00
zacksgamerz 0b2bb3391c Fix the difficulty sprites not showing up in Freeplay. 2025-04-17 12:03:52 +03:00
zacksgamerz ffee837bcd Fixed flooring mistake for haptics in pico's freeplay. 
What happens if you floor 0.3? it returns ZERO :D
 2025-04-17 12:03:42 +03:00
zacksgamerz 9775034d7a Add tapping to LetterSort for Freeplay. 2025-04-17 01:01:40 +03:00
Mihai Alexandru 824767af66 Replace the traditional lime Haptics with funkin.haptic 
Co-Authored-By: sector-a <82838084+sector-a@users.noreply.github.com>
 2025-04-17 01:01:26 +03:00
sector-a ae4384453c Tweak freeplay scrolling vibrations a lil bit 2025-04-17 00:42:39 +03:00
zacksgamerz 8f123e4ab9 Made it so you need to tap on LetterSort first so it would receive input. 2025-04-17 00:38:20 +03:00
zacksgamerz 25d27e62ce Refactored scroll up and down logic in Freeplay. 2025-04-17 00:37:32 +03:00
zacksgamerz b9230b6eb2 Add swipe gesture to back out in Freeplay. 2025-04-17 00:36:49 +03:00
zacksgamerz f246fa2e6c Fix tween cancellation and update flick direction logic in FreeplayState. 2025-04-17 00:32:17 +03:00
zacksgamerz f6ee1c8f92 Cancel existing tweens for difficulty groups before starting a new tween in FreeplayState. 2025-04-17 00:31:19 +03:00
zacksgamerz 86d050a11f Refactor swipe threshold calculation to use SwipeUtil across multiple states. 2025-04-17 00:31:19 +03:00
zacksgamerz afe0087591 Invert flicks for a hotfix. 2025-04-17 00:30:33 +03:00
KarimAkra 616004d7f6 move FullScreenScaleMode from flixel.system.scaleModes to funkin.ui 2025-04-17 00:29:45 +03:00
KarimAkra 51b82a0a7c Fixed minor issues with swipes and Pointer Plugin 2025-04-16 16:07:59 +03:00
zacksgamerz 16884ba28e Implement TouchPointerPlugin and remove old legacy TouchPointer code. 2025-04-16 16:04:22 +03:00
sector-a 0e256021b1 Made note vibrations weaker, removed HAPTIC_VIBRATIONS define, moved vibration option from mobileOptions to options 2025-04-16 15:29:26 +03:00
zacksgamerz 18dcb8f446 Replaced all old flick checks, swipe checks, etc. with the proper checks from Flixel. Updated flixel ref. Removed justFlicked checks as they are unused. 
Replace swipeThreshold updates with the one in FlxTouchManager

Temporarily remove swipeThreshold sets for testing.

Proper SwipeUtil refactoring. Completely replaced all flick and movement checks with the one in Flixel. Rewrote most of the documentation to be more accurate.

Invert flick checks as it already comes inverted from FlxFlick.

Define fixes for SwipeUtil

Fixed null safety issues on compiling.
 2025-04-16 15:22:10 +03:00
zacksgamerz 5b9bd1af00 Removw justMoved check as it makes confirming the selected song significantly harder. 2025-04-16 15:00:52 +03:00
sector-a f970ea6acf Move TouchUtil and SwipeUtil to funkin.util 2025-04-16 15:00:02 +03:00
zacksgamerz 0d35b66903 Refactored the drag difficulty checks in Freeplay to be more clean and readable. 2025-04-16 14:56:15 +03:00
KarimAkra 82a9dabc7f Added ability to swipe on difficulties to change them on FreeplayState 
Co-Authored-By: Karim Akra <144803230+karimakra@users.noreply.github.com>
Co-Authored-By: MoonDroid <81515012+moondroidcoder@users.noreply.github.com>
 2025-04-16 13:21:16 +03:00
KarimAkra e9b1800ec9 Improves HapticUtil's code a bit 
Co-Authored-By: Mihai Alexandru <77043862+majigsaw77@users.noreply.github.com>
Co-Authored-By: Karim Akra <144803230+karimakra@users.noreply.github.com>
Co-Authored-By: sector-a <82838084+sector-a@users.noreply.github.com>
 2025-04-16 00:22:56 +03:00
KarimAkra d80afc35b4 Fixed a few issues with touch controls & flicks 
Co-Authored-By: MoonDroid <81515012+moondroidcoder@users.noreply.github.com>
 2025-04-15 23:39:17 +03:00
KarimAkra 66e6ea9d41 Fixed few issues with extension-admob implementation 
Co-Authored-By: sector-a <82838084+sector-a@users.noreply.github.com>
Co-Authored-By: Mihai Alexandru <77043862+majigsaw77@users.noreply.github.com>
 2025-04-15 21:37:22 +03:00
KarimAkra d43dfac3e4 Added vibrations to most ResultState ranks and more! 
* Vibrations for most ranks
* Vibrations when scrolling through FreeplayState
* Vibrations for notes hits
* Vibrations for game over

Co-Authored-By: sector-a <82838084+sector-a@users.noreply.github.com>
 2025-04-15 21:37:14 +03:00
KarimAkra 9cf134fc2a Made more menus adapted to wide-screens & fixed some bugs 
* Made stuff on the edge of the screen get moved away by the notch
* Made FreeplayState look better on wide-screens
* Adapted StoryMenuState to wide-screens
* Fixed the transition being small on some screen sizes
* refactored some code
 2025-04-15 21:37:06 +03:00
KarimAkra 193d293dea Added HapticUtil and some vibrations to some menus & scenes! 
Added vibrations to:

* TitleState on beat hits during into
* Freeplay when a new rank is slammed to the capsule
* Some vibrations on ResultState (such as when the tally counter increases...)

Co-Authored-By: sector-a <82838084+sector-a@users.noreply.github.com>
 2025-04-15 21:36:54 +03:00
KarimAkra 9dc48978f8 Massive Touch Controls Overhaul 
Co-Authored-By: MoonDroid <81515012+moondroidcoder@users.noreply.github.com>

This overhaul includes:

* Flicks on menus
* Changing options by sliding the finger over screen
* Changing options by pressing the option itself
* Touch Pointers
* And more!

Co-Authored-By: MoonDroid <81515012+moondroidcoder@users.noreply.github.com>
Co-Authored-By: sector-a <82838084+sector-a@users.noreply.github.com>
 2025-04-15 21:36:28 +03:00
KarimAkra b1b30ed09f Formatted some code for freeplay & fixed strumlines position on wide-screens 2025-04-15 21:35:19 +03:00
KarimAkra ad4b1ce51b Adjusted freeplay to work on wide-screens 
fixed some backing cards and the capsule ranking position
 2025-04-15 21:34:00 +03:00
KarimAkra 944141292d Move part of the code from the old repository 
Co-Authored-By: sector-a <82838084+sector-a@users.noreply.github.com>
Co-Authored-By: mcagabe19 <egzozu.be.bas@gmail.com>
Co-Authored-By: Mihai Alexandru <77043862+majigsaw77@users.noreply.github.com>
Co-Authored-By: MoonDroid <81515012+moondroidcoder@users.noreply.github.com>
Co-Authored-By: luckydog7 <59097731+luckydog7@users.noreply.github.com>
 2025-04-15 21:32:39 +03:00
EliteMasterEric 6390725ef0 Redo data format for sticker packs to make it simpler and allow for song-specific selections. 2025-04-14 19:25:42 -04:00
EliteMasterEric afb4a3dd68 Remove some unused/redundant debug hotkeys. 2025-04-03 16:02:10 -04:00
Cameron Taylor f7a48bcb3b refactor some FreeplayRank stuff to hold both blurred and unblurred ranking 2025-03-27 20:26:50 -04:00
Abnormal abe4ac8485 Remove the Alphabet class 2025-03-27 15:59:35 -04:00
Kolo 65b9466ce3 eric's suggestion 2025-03-24 14:40:55 -04:00
Kolo a5e5c1dee2 freeplay random button fix 2025-03-24 14:40:55 -04:00
Kolo a90b911653 freeplay random button fix 2025-03-24 14:40:55 -04:00
Kolo b70946f3c3 fix backspace and enter causing crash 2025-03-20 15:08:07 -04:00
Cameron Taylor 82a316c5b3 Merge branch 'rewrite/master' into public-develop-merge 2025-03-11 17:19:24 -04:00
Cameron Taylor fb26aeb71a feat: Switching sorting in Freeplay, if your currently selected song is in the next section, we move there immediately for easier navigation 2025-03-10 21:44:24 -04:00
EliteMasterEric 4e05d16cb6 Merge branch 'public-develop' into public-develop-merge 2025-03-10 20:46:33 -04:00
EliteMasterEric 87b1fc92f8 Renamed the new controls (I had to edit the margins to make the name fit) 2025-02-17 23:25:09 -05:00
Abnormal bb974c2642 home and end can now jump to the beginning and end of freeplay 2025-02-17 23:25:09 -05:00
Cameron Taylor 0a911ae607 remove a buncho unused imports 2025-02-17 19:25:33 -05:00
EliteMasterEric d9fd814645 Disable swapping out freeplay graphics until we get it fixed up. 2025-01-28 16:39:00 -05:00
EliteMasterEric eafa3db1b5 Fix asset fallback. 2024-12-17 12:54:31 -05:00
EliteMasterEric e0911b2861 Implemented hot swapping the backing image. 2024-12-17 10:41:01 -05:00
CheemsAndFriends ef44bda9da fix album popping prematurely 2024-11-23 15:21:28 -05:00
Kolo 903b3fc599 fix: Don't restart the FreeplayState song preview when changing the difficulty within the same variation 
pulled from the wrong branch, oops!

last update i hope

wrong spellings im gonna kms
 2024-10-08 13:56:14 -04:00
EliteMasterEric 711e0a6b75 fix: Main menu music doesn't cut out when switching states anymore. 2024-10-04 12:15:20 -04:00
Cameron Taylor d2e29879fe fix: Song.getFirstValidVariation() now properly takes into account multiple variations/difficulty input 
freeplay implement for NEW song stuff w/ assets submod

save data crap and crud

rank icon fixes for fixed pico menu
 2024-10-04 12:01:45 -04:00
Cameron Taylor c0314c85ec fix(freeplay)!: Proper variation / difficulty loading for Freeplay Menu 
Previously the game would load variations in a `variation-difficulty` string format, but now we map it out better and filter it based on that, rather than messing around with suffixes and whatnot. If you have a mod that depended on the functionality of the `variation-difficulty` format, you should accomodate that functionality in another way

re-add freeplay song preview

song names and icons implemented again

implement the scoring rank, bpm, and difficulty crud

albumId loading fix
 2024-10-04 12:01:45 -04:00
Cameron Taylor f862fb2c3e load in data for pico songs 2024-10-04 12:01:45 -04:00
Cameron Taylor d7f5070317 properly display pico vs darnell songs along with pico mixes 2024-10-04 12:01:45 -04:00
Cameron Taylor 1d2bd61119 fix: picos songs properly load on freeplay 2024-10-04 12:01:45 -04:00
Cameron Taylor 7a3d983bba Merge branch 'feature/discord-rpc-resurrected' into rewrite/master 2024-09-27 17:47:59 -04:00
EliteMasterEric 5630e74584 Rework Freeplay variation handling... again. 2024-09-27 14:26:08 -04:00
Cameron Taylor d02e834460 Merge branch 'rewrite/master' into abnormalpoof/assets-getpath 2024-09-20 18:13:13 -04:00
EliteMasterEric 8fd84f9d13 Functioning Discord Rich Presence! 2024-09-19 10:03:16 -04:00
EliteMasterEric 1beb21e57a Replace all instances of openfl/lime Assets with funkin.Assets 2024-09-18 05:04:32 -04:00
EliteMasterEric 16aff6e7c3 Fix bugs with highscore display in Freeplay 2024-09-14 21:37:02 -04:00
Cameron Taylor 10dfc96cf4 Merge branch 'freeplay-charselect-hint' into rewrite/master 2024-09-12 19:11:42 -04:00
FabsTheFabs bc86f1f459 character select hint text 2024-09-12 22:44:40 +01:00
EliteMasterEric e5673549cf Fix issues with the difficulty selector showing non-existant difficulties in Freeplay 2024-09-12 15:38:20 -04:00
EliteMasterEric 9a242c5d00 Fix an issue where New labels wouldn't show on character mixes 2024-09-10 19:32:10 -04:00
EliteMasterEric c678cabbf2 Fix issue where difficulty names wouldn't show up properly sometimes. 2024-09-10 17:30:33 -04:00
EliteMasterEric 5021b49915 Enable the New Character backing card 2024-09-10 17:27:04 -04:00
EliteMasterEric f6bd203786 Fix an issue where base inst wouldn't be chosen properly on remixes 2024-09-10 01:33:15 -04:00
EliteMasterEric 877d64c32b Fixed a bug where the instrumental selector would be ignored sometimes 2024-09-09 21:21:50 -04:00
Cameron Taylor bd144d6adb Merge branch 'rewrite/master' into bugfix/friday-fixes 2024-09-03 23:42:51 -04:00
Cameron Taylor 930f5ff5a6 Merge branch 'feature/instrumental-select-hud' into rewrite/master 2024-09-03 11:25:34 -04:00
Cameron Taylor 498cd4a830 Merge branch 'cards-and-char-select' into rewrite/master 2024-09-01 17:56:12 -04:00
EliteMasterEric 7511de1e7a A bunch of Freeplay visual fixes 2024-09-01 03:28:56 -04:00
FabsTheFabs 71da847158 forgot to change these back 2024-08-30 01:12:26 +01:00
FabsTheFabs 60c10aae99 char select to freeplay transition, backing card implementation, beatHit for backing cards 2024-08-30 01:04:30 +01:00
Cameron Taylor 78fb6e1188
Merge pull request #712 from FunkinCrew/menu-music-fix 
FUNK-525 stop main menu music from playing when entering freeplay from pausemenu
 2024-08-29 18:28:00 -04:00
Cameron Taylor 825327e1c8 Merge branch 'rewrite/master' into feature/charSelect 2024-08-29 15:13:58 -04:00
Cameron Taylor b27aa4c94d Merge branch 'rewrite/master' into feature/pico-playable-christmas 2024-08-29 13:40:56 -04:00
Cameron Taylor 0a316c815f stop main menu music from playing when entering freeplay from pausemenu 2024-08-29 13:22:56 -04:00
EliteMasterEric e7fca119f8 Logic + animations for new unlocks 2024-08-28 06:11:01 -04:00
EliteMasterEric 16a6dba9df Pico Fist Pump animation (with loss animation) 2024-08-28 06:08:30 -04:00
EliteMasterEric 2e7eabc494 Remember character ID between visits to Freeplay, plus some fixes to prevent spamming keys 2024-08-28 06:05:28 -04:00
CheemsAndFriends 353aa42f5b Fixes for the atlasSprite bizz 2024-08-28 02:48:56 +02:00
EliteMasterEric 200b3c963b Updated compile defines to use feature flag system 2024-08-26 18:01:36 -04:00
FabsTheFabs 55dd1857c9 freeplay transition + wip card classes 2024-08-23 13:36:35 +01:00
Cameron Taylor cee5d53deb
Merge pull request #686 from FunkinCrew/applehair/freeplay-stack-overflow 
[PUBLIC PR] Fix a stack overflow for songs with no "Normal" difficulty
 2024-08-20 15:09:36 -04:00
Cameron Taylor 6e3fba4d3d Merge branch 'rewrite/master' into gamerbross/animation-editor 2024-08-20 14:29:43 -04:00
Cameron Taylor 0e46f91a60 Merge branch 'rewrite/master' into feature/album-art-swap 2024-08-16 20:21:51 -04:00
AppleHair cb02ea7da5 Updated to extend #2712 2024-07-29 19:03:54 -04:00
AppleHair c8322c479c Added a comment 2024-07-29 19:03:52 -04:00
AppleHair 4f46a8e4d0 [BUGFIX] Prevented infinite recursion on freeplay when a song doesn't have the normal difficulty 
Any attempt to create a song without the `normal` difficulty will result in a silent crash when opening freeplay. After some debugging, I discovered that the issue is caused by infinite recursion, which gets triggered at the start of `FreeplaySongData`'s `updateValues`.
 2024-07-29 19:03:37 -04:00
EliteMasterEric 68b7610225 Update OpenFL to latest (requires a few fixes) 2024-07-29 17:26:49 -04:00
EliteMasterEric f3624f7e76 Fixes for scripted song events, define vocal tracks per variation, display suffixed difficulties properly. 2024-07-28 01:42:09 -04:00
EliteMasterEric 1515719a0f Implemented instrumental select (you need to beat the song as Pico first)! 2024-07-22 18:38:22 -04:00
EliteMasterEric 416d60000f Implement Nene Christmas, and fix Nene offsets on other stages. 2024-07-15 06:30:10 -04:00
EliteMasterEric 03d1f858ec Remove flixel-ui and add a new dropdown to the animation offset editor 2024-07-12 00:57:08 -04:00
EliteMasterEric 2ae6882241 Swappable album art and updated FlxAnimate 2024-07-10 17:25:52 -04:00
Cameron Taylor 3a37b79a55 add TAB to controls stuff 2024-07-08 16:40:10 -04:00
Cameron Taylor a92334d5ae Merge branch 'rewrite/master' into char-select-cherrypick 2024-07-08 16:23:32 -04:00
Cameron Taylor d7105e8b8e change debug menu and add key for freeplay 2024-07-08 16:22:38 -04:00
Cameron Taylor a7cfae8545 mer 2024-07-04 14:48:24 -04:00
Cameron Taylor 5134547071
Merge pull request #648 from FunkinCrew/gamerbross/freeplay-stack-overflow 
[PUBLIC PR] Fix Stack Overflow if song doesn't have "normal" difficulty
 2024-07-01 20:20:38 -04:00
Cameron Taylor bb1fc64754
Merge pull request #647 from FunkinCrew/gamerbross/stickers-f5-screen 
[PUBLIC PR] Fix crash after pressing F5 and coming back from stickers
 2024-07-01 20:19:09 -04:00
EliteMasterEric 432c709075 Animated pixel icons for freeplay 
mend
 2024-07-01 16:51:54 -04:00
gamerbross 7e6ef61169 Fix Stack Overflow if song doesn't have "normal" difficulty 2024-06-29 00:35:01 -04:00
gamerbross 32deb8d190 Fix crash after pressing F5 and coming back from stickers 2024-06-29 00:29:23 -04:00
EliteMasterEric fbfd8259a6 Merge branch 'applehair/ranks-for-custom-variations' into feature/playable-pico-mode 2024-06-27 04:06:10 -04:00
EliteMasterEric 4e65c49e0e Get rid of a warning about missing BPM info 2024-06-24 14:40:55 -04:00
EliteMasterEric 9b3a748f37 Working Pico DJ 2024-06-20 16:17:53 -04:00
EliteMasterEric 263039f52c Make Boyfriend DJ animations data driven 2024-06-18 20:07:27 -04:00
EliteMasterEric 60e741434c Implemented playable character registry, added Freeplay character filtering, added alt instrumental support 2024-06-18 17:56:24 -04:00
EliteMasterEric 6f2f2a9aa4 Merge branch 'applehair/preview-inst-suffix' into feature/playable-pico-mode 2024-06-18 15:40:51 -04:00
AppleHair 1f1fe62a06
[BUGFIX] Fixed Ranks not appearing in freeplay for custom variations 
Freeplay tries to access a song's rank using the current difficulty name alone, but custom variation ranks are being saved with a variation prefix. This PR makes freeplay look for the variation prefix when necessary.
 2024-06-14 16:53:33 +03:00
AppleHair c4d6e18885
now using getVariationsByCharId instead 2024-06-12 11:23:45 +03:00
Cameron Taylor 47d5c4d141
Merge pull request #619 from FunkinCrew/freeplay-dad-smoother 
freeplay bg nicer AA and proper sizing
 2024-06-11 16:16:13 -04:00
Cameron Taylor c05f053fe3 Merge branch 'rewrite/master' into bugfix/instrumental-id 2024-06-11 16:12:39 -04:00
Cameron Taylor 1e3ef61fc9 freeplay bg nicer AA and proper sizing 2024-06-11 15:57:45 -04:00
Cameron Taylor 817c216d06
Merge pull request #617 from FunkinCrew/bugfix/save-highest-rank 
[FUNK-387] Save high scores and high ranks separately.
 2024-06-11 12:04:38 -04:00
Cameron Taylor 381e0104e9
Merge pull request #616 from FunkinCrew/feature/freeplay-keybinds 
[FUNK-391] Rebindable controls for the Freeplay menu
 2024-06-11 11:49:24 -04:00
EliteMasterEric b30faad7d9 Save high scores and high ranks separately. 2024-06-11 00:40:43 -04:00
Cameron Taylor f31ea8fb73 add sound for changing sorting 2024-06-10 16:13:32 -04:00
gamerbross 8f44d9606d Remove unnecessary scrollMenu sounds + adjust volume 2024-06-10 13:17:38 -04:00
AppleHair 9fa603363c
[BUGFIX] Made freeplay use the metadata to get the instrumental suffix 
Song previews in freeplay will now use the instrumental suffix from the current difficulty's corresponding song variation metadata instead of using the variation id as an instrumental suffix and checking only the "erect" variation.
 2024-06-10 19:42:27 +03:00
Cameron Taylor d974f12c72 Merge branch 'develop' into rewrite/master 2024-06-09 15:30:14 -04:00
EliteMasterEric 09aa8fbf52 Rebindable controls for the Freeplay menu 2024-06-09 02:22:03 -04:00
EliteMasterEric 2e4b94d528 Fix additional merge conflicts 2024-06-07 21:20:04 -04:00
EliteMasterEric 4382b3e16e Merge branch 'develop' into richtrash21/freeplay-camera-optimization 2024-06-07 21:13:13 -04:00
Cameron Taylor 1d6315fe0e
Merge pull request #610 from FunkinCrew/2hot-freeplay 
regexp for numbers
 2024-06-07 14:33:56 -04:00
Cameron Taylor 34c91dae76 dadbattle hard/erect fix 2024-06-07 14:24:57 -04:00
Cameron Taylor a0adbc72b3 regexp for numbers 2024-06-07 13:04:45 -04:00
EliteMasterEric ca345e6c4f Play song IDs based on the chart file's "instrumental" field, not the variation ID. 2024-06-06 21:38:00 -04:00
FabsTheFabs 642f272bce freeplay polish + new text 2024-06-06 01:49:33 +01:00
Cameron Taylor bc783a278a rank clipping fix 2024-06-05 18:21:57 -04:00
Cameron Taylor 4311dd2074 hopefully dadbattle fix lol 2024-06-05 17:58:22 -04:00
Cameron Taylor 5bcc0f9b25 partial sound loading should be more resiliant 2024-06-05 15:02:29 -04:00
Cameron Taylor 50990b15e1 heart glow 2024-06-04 23:36:32 -04:00
Cameron Taylor d4712a8ef7 alphabetical filtering for freeplay non-all sort 2024-06-04 16:24:24 -04:00
Cameron Taylor 75621435ea lil more polish to fav icon + clipping 2024-06-02 02:53:07 -04:00
Cameron Taylor c64db9966b Merge branch 'rewrite/master' into rank-fixes 2024-06-02 02:19:36 -04:00
Cameron Taylor 7c6c51ea71 results dupe fix 2024-06-01 22:36:47 -04:00
EliteMasterEric 7aee1f900a Fix a Results->Freeplay crash 2024-06-01 20:54:24 -04:00
Cameron Taylor 8248cffbaf small bool cleanings, and maybe fixes 2024-06-01 20:36:14 -04:00
FabsTheFabs 63bd6f2ace sparks nd more fixes.. i think 2024-06-02 00:25:52 +01:00
Cameron Taylor c2cc73077f
Merge pull request #588 from FunkinCrew/ninjamuffin99/funk-244-preview-songs-on-freeplay-should-last-longer 
make songs last longer on freeplay
 2024-06-01 16:25:49 -04:00
Cameron Taylor de92a7ba5c Merge branch 'rewrite/master' into bugfix/may-31st-fixes 2024-06-01 16:23:37 -04:00
EliteMasterEric 12acdcd9d9 Fix a Results->Freeplay crash 2024-05-31 21:55:27 -04:00
Cameron Taylor d89a898e6c make songs last longer on freeplay 2024-05-31 17:16:26 -04:00
FabsTheFabs 28444fd478 rank tweaks, favourite changes + rank anim fixes 2024-05-31 10:39:53 +01:00
EliteMasterEric 2a8cdfaffa Fix an extra crash. 2024-05-31 02:30:42 -04:00
Cameron Taylor c322e2aeef Merge branch 'rewrite/master' into feature/results-freeplay-transition 2024-05-30 21:05:32 -04:00
Cameron Taylor 5f70e1be0b Merge branch 'develop-0.4.0' into rewrite/master 2024-05-30 20:54:27 -04:00
EliteMasterEric b7a828e7d8 Make Freeplay use correct ranks, play the slam animation after Results, new Results music 2024-05-30 05:25:51 -04:00
EliteMasterEric ee70e85dec Merge branch 'rewrite/master' into feature/freeplay-shit+santa-cutscene 2024-05-29 23:56:51 -04:00
FabsTheFabs e7079452fb freeplay visual changes + base rank visuals 2024-05-30 04:34:00 +01:00
Cameron Taylor 4dca6671c4 Merge branch 'gamerbross/freeplay-crash' into develop-0.4.0 2024-05-29 16:53:26 -04:00
Cameron Taylor 9aa2411b50 Merge branch 'rewrite/master' into audio-stream 2024-05-28 23:59:36 -04:00
Cameron Taylor 827ad61602 Merge branch 'rewrite/master' into feature/results-clear-rank 2024-05-28 00:56:18 -04:00
Cameron Taylor b8ed779660 Merge branch 'rewrite/master' into feature/save-favorites 2024-05-23 17:14:07 -04:00
Cameron Taylor c02d75b94a Merge branch 'public-release/develop' into rewrite/master 2024-05-23 16:38:34 -04:00
richTrash21 4ca30a571d safety 2024-05-23 21:52:28 +04:00
richTrash21 1c352e4e11 simplify freeplay camera 2024-05-23 21:50:11 +04:00
EliteMasterEric 6cb5816378 Add freeplay favorites to the save data so they persist between sessions. 2024-05-21 02:49:07 -04:00
EliteMasterEric b6b93bb0c6 Added clear percent, rank name, and background text. 2024-05-17 20:26:34 -04:00
rich 7a19bd4b50
Merge branch 'FunkinCrew:main' into debelop-freeplay-patch 2024-05-15 16:31:57 +04:00
Cameron Taylor 2434f64381 web fix for scroll 2024-05-14 21:21:47 -04:00
Cameron Taylor 1619751eab Merge branch 'public-release/develop' into freeplayscrollwheel-bugfix 2024-05-14 21:13:48 -04:00
Cameron Taylor 0428482d04 Merge branch 'bugfix/freeplay-exiting-active' into public-release/develop 2024-05-13 21:30:02 -04:00
rich 59e409f8e6
ensure that only freeplay camera gets destroyed 2024-05-14 04:30:36 +04:00