Commit Graph
5781 Commits
Author SHA1 Message Date
EliteMasterEric e917da0a7b Merge branch 'rewrite/master' into funkin-mobile/main 2025-05-01 21:46:20 -04:00
EricandGitHub 5397924edd Merge pull request #4913 from VioletSnowLeopard/fix-switching-filters
[BUGFIX] Fix the Behavior of Selected Song when Changing Filters in Freeplay
2025-05-01 21:24:52 -04:00
EliteMasterEric 94bd18fe17 Merge remote-tracking branch 'public/main' into develop 2025-05-01 21:10:40 -04:00
EricandGitHub 664d9e0fb3 Merge pull request #4214 from Lasercar/freeplay-ui-fixes
Freeplay UI fixes
2025-05-01 21:07:51 -04:00
VioletSnowLeopard edf6889af9 fix switching filters to do its intended behavior 2025-05-01 20:57:39 -04:00
EricandGitHub c65dddacc0 Merge pull request #4894 from AbnormalPoof/chore/art-submod
[GITHUB] Update `art` submodule to the latest commit
2025-05-01 20:43:41 -04:00
EricandGitHub 659ea41206 Merge pull request #4649 from NotHyper-474/feature/chart-more-song-info
[ENHANCEMENT] Chart Editor - Display current beat & step
2025-05-01 20:37:40 -04:00
EricandGitHub 5cd47a4414 Merge pull request #4553 from VioletSnowLeopard/fix-dialogue-pause-menu
Change order of Restart and Skip in Dialogue pause menu
2025-05-01 20:37:18 -04:00
EliteMasterEric 8de74c361c Additional cleanup 2025-05-01 19:55:44 -04:00
MoonDroid 6c842fea20 Make widescreen not mobile only.
Fix a typo in Main too.
Reposositon
2025-05-02 00:26:59 +07:00
MoonDroid 41ce874595 Update Android setup docs. 2025-05-01 23:27:05 +07:00
MoonDroid 9216fff9b0 Move InAppPurchasesUtil and AdMobUtil to funkin/api/mobile 2025-05-01 23:24:51 +07:00
Eric 65699ee865 Update CONTRIBUTING.md 2025-05-01 01:38:44 -04:00
HundrecandEric d423eb3ddd Update Charting PR policy in CONTRIBUTING.md
We no longer accept chart modifications.
2025-05-01 01:38:44 -04:00
Abnormal 4c5335d7a3 art submod 2025-04-30 02:37:13 -05:00
EliteMasterEric b811ca91a6 Update link to art submodule to include latest assets 2025-04-30 02:01:54 -04:00
Hyper_andEric c5f2a74494 fix: Prevent loading invalid variation 2025-04-30 00:44:12 -04:00
KoloandEric 3e0dbe2758 performCleanup on reload 2025-04-30 00:43:37 -04:00
bbc0546c74 Shortened statement based on suggestion.
Co-authored-by: Abnormal <86753001+AbnormalPoof@users.noreply.github.com>
2025-04-30 00:42:15 -04:00
thesuperpig56andEric 617d5ffa06 Called the wrong character here, whoops! 2025-04-30 00:42:15 -04:00
thesuperpig56andEric 73114e2da6 Avoid crash when restarting song without characters. 2025-04-30 00:42:15 -04:00
KoloandEric 808698ace7 medal fix thing 2025-04-30 00:41:28 -04:00
VioletSnowLeopardandEric 832bc5bd83 fix two issues with random capsule 2025-04-30 00:37:08 -04:00
EliteMasterEric 0253df7269 Feature flag cleanup 2025-04-30 00:31:31 -04:00
EliteMasterEric 40f44ece5b Dependency cleanup 2025-04-30 00:30:51 -04:00
TechnikTilandEric b15e809c63 fix freeplay dj softlock 2025-04-29 18:01:55 -04:00
LasercarandEric 8074d57186 Don't add the default difficulty to song metadata
It'll now only add the current difficulty to the metadata if it doesn't exist in it when saved.
2025-04-29 18:01:23 -04:00
KoloandEric 31d3718e5c music file priority thing
(updated a misleading comment, lols!)
2025-04-29 16:27:21 -04:00
LasercarandEric 5fdbd23a17 Misses now actually make you miss your grade
Sustain notes no longer add to the miss tally
2025-04-29 16:24:50 -04:00
EricandGitHub 23a9e7f944 Merge pull request #4881 from Lasercar/fix-preferences-not-saving-due-to-enums-AGAIN
[BIGFIX] Fix Options not loading from Save Data
2025-04-29 16:23:47 -04:00
EricandGitHub 0397a41a7f Merge pull request #4883 from Hundrec/patch-11
[DOCS] Credit Lasercar for a crash fix from an assets PR
2025-04-29 16:23:31 -04:00
KarimAkra 49114c5d37 Merge branch 'funkin-mobile/main' of github.com:FunkinCrew/Funkin-secret into funkin-mobile/main 2025-04-29 19:02:21 +03:00
MoonDroid 9b8330ced1 Merge branch 'funkin-mobile/main' of https://github.com/FunkinCrew/Funkin-secret into funkin-mobile/main 2025-04-29 22:33:14 +07:00
MoonDroid 1baf7fea80 Update mobile compiling guide with detailed setup instructions for Android on Windows and macOS 2025-04-29 22:33:02 +07:00
KarimAkra 588eea019d fixed memory counter position 2025-04-29 17:06:55 +03:00
KarimAkra 9307f514fe Added safety checks for ASTC textures 2025-04-29 17:05:20 +03:00
Lasercar 2bc1a31427 fix capsule jumpin and random capsule starting x position 2025-04-29 20:04:56 +10:00
Lasercar dafbb43532 capsule jump in 2025-04-29 19:59:35 +10:00
Lasercar 4978c89ac3 capsule options menu null reference fix 2025-04-29 19:57:31 +10:00
LasercarandLasercar 29b541af38 First rank overrides itself fix 2025-04-29 19:57:31 +10:00
LasercarandLasercar fc09350be7 This should fix the squashed capsule text, right? 2025-04-29 19:57:23 +10:00
LasercarandLasercar e1ca3c69f0 Fixed letter sort animation 2025-04-29 19:53:32 +10:00
LasercarandLasercar 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
HundrecandGitHub 51605e50f8 Credit Lasercar for a crash fix from assets PR 2025-04-29 01:31:19 -06:00
Lasercar 3a1b573ea3 Fix save being loaded twice for no reason 2025-04-29 17:14:23 +10:00
Lasercar ef6b214872 Save vsync mode as string but get as vsync mode 2025-04-29 17:14:23 +10:00
sector-a e6df6d5116 Temporarily remove nullSafety in two classes 2025-04-29 04:13:25 +03:00
sector-a d82d231539 Set minimal android sdk version through Project.hxp 2025-04-29 03:56:09 +03:00
EricandGitHub 8f2a8c8335 Merge pull request #4873 from NotHyper-474/patch-1
Remove leftover from merge-conflict in CHANGELOG
2025-04-28 17:59:02 -04:00
Hyper_andGitHub 7f5b4974c3 Update CHANGELOG.md
Remove left-over from merge conflict.
2025-04-28 18:30:39 -03:00