1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-12-13 08:55:29 +00:00
Commit graph

2911 commits

Author SHA1 Message Date
EliteMasterEric e9d8546737 More results screen changes 2024-04-03 04:52:12 -04:00
EliteMasterEric f7141e7096 Fixed an issue with save data not loading defaults properly. 2024-04-03 01:41:52 -04:00
EliteMasterEric 2b4bf42ac4 Fix multiple music, and crashes in freeplay 2024-04-03 01:41:47 -04:00
Cameron Taylor 6ea44dcf25 Merge pull request #456 from FunkinCrew/credits-fix
Someone forgot to merge assets from the credits branch.
2024-04-02 19:30:19 -04:00
EliteMasterEric 90cf53b959 Someone forgot to merge assets from the credits branch. 2024-04-02 17:27:29 -04:00
Cameron Taylor 657172ab56 Merge pull request #395 from FunkinCrew/bugfix/buncha-2hot-fixes
Bugfix/buncha 2hot fixes
2024-04-01 22:40:30 -04:00
Cameron Taylor dcffe0537f Merge branch 'rewrite/master' into bugfix/buncha-2hot-fixes 2024-04-01 22:40:10 -04:00
Cameron Taylor 7ae44c5620 assets submod 2024-04-01 22:39:48 -04:00
Cameron Taylor d27f6b82d5 Merge pull request #442 from FunkinCrew/bugfix/blazin-uppercut-anim
Fix pico uppercut loop anim including spin
2024-04-01 22:36:37 -04:00
Cameron Taylor 1336879a8b Merge branch 'rewrite/master' into bugfix/blazin-uppercut-anim 2024-04-01 22:36:11 -04:00
Cameron Taylor ddda7f6a01 assets submod 2024-04-01 22:35:56 -04:00
Cameron Taylor 1e776e3cfb Merge pull request #449 from FunkinCrew/feature/all-erect-songs-charts
Add a bunch of erect songs
2024-04-01 22:32:37 -04:00
Cameron Taylor 12734337b5 Merge branch 'rewrite/master' into feature/all-erect-songs-charts 2024-04-01 22:32:00 -04:00
Cameron Taylor 8cb11d081d art submod 2024-04-01 22:31:19 -04:00
Cameron Taylor 9bb552b000 Merge branch 'rewrite/master' into feature/all-erect-songs-charts 2024-04-01 22:31:09 -04:00
Cameron Taylor 5ecedef88a assets submod 2024-04-01 22:30:54 -04:00
Cameron Taylor e13d421cf3 Merge pull request #435 from FunkinCrew/feature/freeplay-ost-text
Fix issues with Freeplay OST text and add animations.
2024-04-01 22:21:54 -04:00
Cameron Taylor 03cbba4a4e Merge branch 'rewrite/master' into feature/freeplay-ost-text 2024-04-01 22:21:29 -04:00
Cameron Taylor d4117c2e6a assets submod 2024-04-01 22:21:10 -04:00
Cameron Taylor 381bd0ac1f Merge pull request #440 from FunkinCrew/bugfix/freeplay-menu-transition
Fix PlayState-Freeplay-MainMenu transition, add SFX over cartoon
2024-04-01 22:15:13 -04:00
Cameron Taylor d6723a8212 Merge branch 'rewrite/master' into bugfix/freeplay-menu-transition 2024-04-01 22:14:29 -04:00
Cameron Taylor 02b8aa0f12 assets submod 2024-04-01 22:13:38 -04:00
Cameron Taylor 8a60115df6 Merge pull request #454 from FunkinCrew/feature/erect-filter-freeplay
Freeplay menu now filters to supported songs when you change difficulty
2024-04-01 22:08:25 -04:00
Cameron Taylor 165e20c318 Merge pull request #453 from FunkinCrew/bugfix/judgements-below-notes
Bugfix/judgements below notes
2024-04-01 22:08:00 -04:00
Cameron Taylor db89e199c4 Merge pull request #455 from FunkinCrew/bugfix/results-screen-cleanup
Bunch of results screen fixes
2024-04-01 22:07:43 -04:00
Cameron Taylor fbb157b579 Merge pull request #423 from FunkinCrew/feature/credits
First implementation of credits state.
2024-04-01 22:07:18 -04:00
Cameron Taylor 7fb4b47e2a Merge branch 'rewrite/master' into feature/credits 2024-04-01 22:06:58 -04:00
Cameron Taylor 626cc5cc78 assets submod 2024-04-01 22:06:44 -04:00
EliteMasterEric 67e096e443 Bunch of results screen fixes 2024-04-01 21:59:53 -04:00
Cameron Taylor bf9f87e9e7 Merge pull request #441 from FunkinCrew/bugfix/spookeez-hold-note
Bugfix/spookeez hold note
2024-04-01 21:00:14 -04:00
EliteMasterEric 927b2a7cfc Put judgements below the notes, and remove COMBO word. 2024-04-01 20:21:27 -04:00
EliteMasterEric 1df4a354cb Freeplay menu now filters to supported songs when you change difficulty 2024-04-01 18:34:26 -04:00
Cameron Taylor 583ecf97b0 Merge pull request #432 from FunkinCrew/feature/new-audio
Audio improvements and a Freeplay crash fix
2024-03-30 03:32:52 -04:00
Cameron Taylor ac5ca3991e Merge branch 'rewrite/master' into feature/new-audio 2024-03-30 03:32:30 -04:00
Cameron Taylor fe498b38e5 assets submod 2024-03-30 03:32:17 -04:00
Cameron Taylor e03998fd86 Merge pull request #439 from FunkinCrew/bugfix/week-6-blueball-camera
Fix camera in game over screen on Week 6
2024-03-30 03:25:08 -04:00
Cameron Taylor 52c5f81e26 Merge branch 'rewrite/master' into bugfix/week-6-blueball-camera 2024-03-30 03:24:46 -04:00
Cameron Taylor 3637e3594b assets submod 2024-03-30 03:24:30 -04:00
Cameron Taylor 065ef8895b Merge pull request #448 from FunkinCrew/bugfix/spooky-lightning-crash
Fix polymod error on Spookeez
2024-03-30 03:07:03 -04:00
Cameron Taylor 846df8de6f assets submod 2024-03-30 03:06:39 -04:00
EliteMasterEric f19507bd95 Add a bunch of erect songs 2024-03-29 23:00:42 -04:00
EliteMasterEric 5be47e6619 Fix limo ride too 2024-03-29 10:34:59 -04:00
EliteMasterEric f50c1ce86f Update assets submodule 2024-03-29 10:17:16 -04:00
Cameron Taylor 1803742af8 Merge pull request #447 from FunkinCrew/cancel-merge-2
lol ref
2024-03-29 02:14:46 -04:00
Cameron Taylor 2d2aa271dd Merge pull request #446 from FunkinCrew/cancel-merge-2
better branch
2024-03-29 02:14:39 -04:00
Cameron Taylor 826b6737e5 Merge pull request #445 from FunkinCrew/cancel-merge-2
sender branch name
2024-03-29 02:14:31 -04:00
Cameron Taylor 10db02a19b Merge pull request #444 from FunkinCrew/cancel-merged-actions
remove push lol
2024-03-29 02:14:11 -04:00
Cameron Taylor d7a4fa7601 Merge pull request #443 from FunkinCrew/cancel-merged-actions
Cancel runs of merged and "outdated" branches
2024-03-29 02:13:50 -04:00
Cameron Taylor e949900bec Merge pull request #434 from FunkinCrew/bugfix/combo-fixes
Bugfix/combo fixes

cancel builds if there's a new one queued

get list of current runs on current-branch

push test

comment out if merge

wrap in string

actions permissions

log

more log

cancel runs test

write permission

uncomment pr merge check

remove push lol

sender branch name

better branch

lol ref
2024-03-29 02:13:46 -04:00
Cameron Taylor f6857d3aa1 Merge pull request #434 from FunkinCrew/bugfix/combo-fixes
Bugfix/combo fixes

cancel builds if there's a new one queued

get list of current runs on current-branch

push test

comment out if merge

wrap in string

actions permissions

log

more log

cancel runs test

write permission

uncomment pr merge check

remove push lol

sender branch name

better branch
2024-03-29 02:13:43 -04:00