Commit Graph
6373 Commits
Author SHA1 Message Date
EliteMasterEric d29bb47d22 Update assets submodule 2025-05-02 18:52:21 -04:00
EricandGitHub d29ecfb7c4 Merge pull request #4936 from CrusherNotDrip/bugfix/tooltip-chart-editor
[BUGFIX] Prevent the game from crashing when clicking a recent chart before tooltip shows up
2025-05-02 17:55:41 -04:00
EricandGitHub cdd17ce033 Merge pull request #4938 from AbnormalPoof/bugfix/quick-web-fix
2 more commits from #3032
2025-05-02 17:54:38 -04:00
EricandGitHub 8e8b26f029 Merge pull request #4564 from AbnormalPoof/bugfix/texture-atlas-looping
[BUGFIX] Fix texture atlas sprites looping infinitely
2025-05-02 17:52:13 -04:00
cyn0x8andAbnormal 6f43438cdb hopefully fix #4814 2025-05-02 16:41:03 -05:00
cyn0x8andAbnormal a74369c77e fixes + stronger sandboxing 2025-05-02 16:40:50 -05:00
CrusherNotDrip def1b74eb6 Stop the game from crashing when clicking a recent chart before tooltip appears 2025-05-02 16:40:31 -04:00
EricandGitHub 6bdfde4a72 Merge pull request #4934 from VioletSnowLeopard/patch3
<RECOVERY> Restore a commit from Hundrec
2025-05-02 16:06:38 -04:00
EricandGitHub c70fa7c94a Merge pull request #4933 from VioletSnowLeopard/patch2
Fix the Changelog on the develop branch again
2025-05-02 16:06:29 -04:00
Abnormal c0353bca2b remove extra callback (already gets called in _onAnimationComplete() by dispatching the animation name to onAnimationComplete 2025-05-02 13:53:30 -05:00
Abnormal f385cf9fd3 fix: Fix texture atlases looping indefinitely 2025-05-02 13:52:16 -05:00
EricandGitHub 301f71b428 Merge pull request #4930 from Hundrec/Lasercar/commit-recovery
<RECOVERY> Restore two of Lasercar's commits
2025-05-02 14:30:11 -04:00
EricandGitHub 189e028442 Merge pull request #4931 from ACrazyTown/fix/crash-log-memory-overflow
Fix memory overflow in crash log (Redo)
2025-05-02 14:30:03 -04:00
EricandGitHub a9647cf9fc Merge pull request #4617 from Lasercar/destroy-the-volume-plugin
[BUGFIX] Destroy the volume plugin when wiping save data
2025-05-02 14:29:54 -04:00
EricandGitHub 05b9d68645 Merge pull request #4227 from Lasercar/main-menu-not-remembering-freeplay-menu-selection-fix
Main menu not remembering freeplay menu selection fix
2025-05-02 14:29:29 -04:00
EricandGitHub 45f0f14ed9 Merge pull request #4318 from Lasercar/fix-strumline-offset-when-downscroll
Fix strumline offset when downscroll
2025-05-02 14:29:11 -04:00
EricandGitHub a8262a8d3b Merge pull request #3090 from anysad/fix-animation-file-save
[BUGFIX] Animation Editor not saving the file name
2025-05-02 14:21:46 -04:00
EricandGitHub 264c2d8e77 Merge pull request #4266 from NotHyper-474/bugfix/chart-editor-broken-resize
[BUGFIX] Chart Editor - Fix resolution breaking after returning from PlayState
2025-05-02 14:21:33 -04:00
EricandGitHub b2f231e889 Merge pull request #4871 from NotHyper-474/bugfix/initstate-spam-medal-crash-fix
[BUGFIX] Fix crash when spamming enter when opening game (properly this time)
2025-05-02 14:21:21 -04:00
HundrecandVioletSnowLeopard 360b73dd0b Specify "flip horizontally" shortcut in Changelog entry 2025-05-02 11:15:41 -04:00
VioletSnowLeopard 34bb201104 Fix the changelog again 2025-05-02 11:02:29 -04:00
HundrecandLasercar d9fcaf0e63 Restore Lasercar's changes
Dropped them somewhere whoopsie

Co-Authored-By: Lasercar <64717068+Lasercar@users.noreply.github.com>
2025-05-02 05:02:29 -06:00
EricandGitHub 56259b9143 Merge pull request #4923 from Hundrec/negative-freeplay-clear
[BUGFIX] Fix `Fix Fix scoring changes`
2025-05-01 23:43:49 -04:00
HundrecandHyper_ dc2acac152 no more negative clear percent shenanigans
"a thousand curses upon you for not testing your prs before making them /j"
- AbnormalPoof

Co-Authored-By: Hyper_ <40342021+NotHyper-474@users.noreply.github.com>
2025-05-01 21:23:55 -06:00
JackXson-Real 62510c2403 Bump Repo Version to 0.6.4 2025-05-01 22:52:35 -04:00
EricandGitHub a2e647ac8b Merge pull request #984 from FunkinCrew/funkin-mobile/main
The BIG Mobile branch
2025-05-01 22:06:08 -04:00
EliteMasterEric c823bba3d1 Fix some merge conflict issues 2025-05-01 22:03:50 -04:00
EricandGitHub bf5a669592 Merge pull request #4919 from Kade-github/real-capsule-fix
Sorting in freeplay is weird
2025-05-01 21:56:24 -04:00
kade-github 8b9775d91f the falsening by VioletSnowLeopard 2025-05-01 18:50:03 -07:00
EliteMasterEric e917da0a7b Merge branch 'rewrite/master' into funkin-mobile/main 2025-05-01 21:46:20 -04:00
EricandGitHub 6caeda9a9d Merge pull request #4898 from Lasercar/fix-fix-scoring-changes
[BUGFIX] Fix `Fix scoring changes`
2025-05-01 21:42:29 -04:00
EricandGitHub 9983556748 Merge pull request #4358 from VioletSnowLeopard/fix-special-pause-menu-chance
[BUGFIX] Fix the chance of getting the special pause menu
2025-05-01 21:40:58 -04:00
EliteMasterEric 651298e908 Update assets submodule 2025-05-01 21:37:52 -04:00
Hyper_ 142ea6db0c fix: Force UI Camera resize 2025-05-01 22:32:02 -03: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
unknown c67085a46a Fix memory overflow in crash log 2025-04-30 23:41:14 +02:00
Hyper_ a83a4a599c fix: Null-check MedalList's internal map 2025-04-30 12:31:01 -03:00
Lasercar f6ac4cad43 Whoops, missed this one 2025-04-30 23:58:09 +10:00