1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-12-24 22:26:50 +00:00
Commit graph

4651 commits

Author SHA1 Message Date
Cameron Taylor 2a6eadcbff Merge branch 'justkolosaki/char-select-gf' into rewrite/master 2024-09-20 18:11:14 -04:00
Cameron Taylor 78cde16af2 assets submod 2024-09-20 18:10:47 -04:00
Cameron Taylor 4946e7f4c7
Merge pull request #765 from FunkinCrew/lethrial/fps-counter-bugfix
[PUBLIC PR] Fix bug where FPS counter would display even if Debug Display option was disabled
2024-09-20 16:52:02 -04:00
Cameron Taylor 8a9b1b4727 Merge branch 'bugfix/cocoa-erect-stacked-note' into rewrite/master 2024-09-20 16:51:39 -04:00
Cameron Taylor 5f64d89d0e assets submod 2024-09-20 16:51:21 -04:00
EliteMasterEric 143ef88e6f Update assets submodule 2024-09-20 03:42:48 -04:00
Cameron Taylor cb4ac352e6 Merge branch 'lemz1/fps-setting' into rewrite/master 2024-09-20 00:29:19 -04:00
Cameron Taylor ccb2e1889f Merge branch 'lemz1/substate-event-dispatch' into rewrite/master 2024-09-20 00:25:53 -04:00
Cameron Taylor 9045ae2d9c assets submod 2024-09-20 00:25:38 -04:00
Cameron Taylor e3a13bee8c
Merge pull request #773 from FunkinCrew/process-cleanup
close sys.io.Process stuff when we're done with them
2024-09-20 00:24:10 -04:00
Cameron Taylor 426bff3bf5
Merge pull request #768 from FunkinCrew/kadedev/addcharacter-type
[PUBLIC PR] Move characterType assignment to Stage.addCharacter
2024-09-20 00:23:53 -04:00
Eric 249ff69f9f
Merge branch 'rewrite/master' into lemz1/fps-setting 2024-09-20 00:05:17 -04:00
Cameron Taylor 4af4c2defc Merge branch 'lemz1/fps-setting' into rewrite/master 2024-09-19 23:56:04 -04:00
Cameron Taylor 76bf5df57f
Merge branch 'rewrite/master' into lemz1/fps-setting 2024-09-19 23:34:51 -04:00
Cameron Taylor c46483722e
Merge pull request #767 from FunkinCrew/techniktil/chart-editor-icons
[PUBLIC PR] [FUNK-717] Fix pixel icons in the chart editor
2024-09-19 23:31:40 -04:00
Cameron Taylor 69bcd0834e
Merge branch 'rewrite/master' into techniktil/chart-editor-icons 2024-09-19 23:31:26 -04:00
Cameron Taylor 29e89c8acb
Merge branch 'rewrite/master' into actualmandm/char-select-crash 2024-09-19 22:50:18 -04:00
Cameron Taylor 778ce54047 Merge branch 'rewrite/master' of github.com:FunkinCrew/Funkin-secret into rewrite/master 2024-09-19 22:49:59 -04:00
Cameron Taylor 47ed9d7fb2 Merge branch 'rewrite/master' into dombomb64/note-style-scaling 2024-09-19 22:35:16 -04:00
Cameron Taylor 00c1428c0f
Merge pull request #774 from FunkinCrew/abnormalpoof/opening-urls
[PUBLIC PR] Fix Merch button being missing from the main menu
2024-09-19 22:31:44 -04:00
Cameron Taylor 0b908b3cab
Merge branch 'rewrite/master' into abnormalpoof/opening-urls 2024-09-19 22:31:12 -04:00
Cameron Taylor 50de041251 Merge branch 'public-release/develop' into rewrite/master 2024-09-19 22:11:05 -04:00
EliteMasterEric 3cbba8ba29 Resolve merge issues. 2024-09-19 17:16:31 -04:00
EliteMasterEric 25cafe7550 Resolve merge issues. 2024-09-19 04:22:05 -04:00
EliteMasterEric 7d6fa19ff4 Merge remote-tracking branch 'secret/rewrite/master' into lemz1/substate-event-dispatch 2024-09-19 04:20:24 -04:00
EliteMasterEric 9f0bc2bd52 Refactor char select GF data handling. 2024-09-19 04:16:40 -04:00
Eric d81e09b1c3
Merge branch 'rewrite/master' into abnormalpoof/opening-urls 2024-09-19 03:46:46 -04:00
Eric a128afedf7
Merge pull request #772 from FunkinCrew/results-sfx-fix
Results Percentage Sound Spam Fix
2024-09-19 03:24:52 -04:00
Cameron Taylor 472d41a893 close sys.io.Process stuff when we're done with them 2024-09-18 16:15:10 -04:00
Cameron Taylor 215e20cabe Merge remote-tracking branch 'origin/docs/issue-management-actions' into rewrite/master 2024-09-18 15:25:51 -04:00
Cameron Taylor 3c30575727 Merge branch 'kadedev/chart-editor-fixes' into rewrite/master 2024-09-18 15:23:07 -04:00
Cameron Taylor f30c0cff49 Merge branch 'feature/gold-perfect-anim-for-modders' into rewrite/master 2024-09-18 15:20:38 -04:00
Cameron Taylor fc6e194d20 assets submod 2024-09-18 15:20:15 -04:00
Cameron Taylor 35005df32a Merge branch 'feature/pico-character-script' into rewrite/master 2024-09-18 15:17:37 -04:00
Cameron Taylor 62149aea39 assets submod 2024-09-18 15:16:56 -04:00
Cameron Taylor fdddfba3be
Merge pull request #760 from FunkinCrew/bugfix/pico-mix-highscores
Fix bugs with highscore display in Freeplay (FUNK-714)
2024-09-18 15:14:46 -04:00
Cameron Taylor ab3b976f3c fix rounding for sound results sfx 2024-09-18 15:07:15 -04:00
lemz afcb57aaf0
Merge branch 'develop' into substate-dispatch-event-fix 2024-09-18 18:18:57 +02:00
Kolo 99657da1f9
accidentally also put the save changes oops 2024-09-18 17:46:13 +02:00
Kolo 3bb981adb0
Update CharSelectGF.hx 2024-09-18 17:32:37 +02:00
Kolo 50a5304ad4
Update PlayerData.hx 2024-09-18 17:30:23 +02:00
Kolo a4b59d14bf
applySongRank fix
fixes the bug with the percent being overriden when the song has the same letter rank but lower percent (eg. E Rank with 99% being overriden by E Rank with 93%)
2024-09-18 13:40:02 +02:00
EliteMasterEric 9d5cde0bf1 Update assets submodule 2024-09-18 06:48:45 -04:00
EliteMasterEric 5efbff044b Resolve merge issues 2024-09-18 06:32:06 -04:00
EliteMasterEric a469385cdb Resolve merge issues 2024-09-18 06:22:02 -04:00
Eric 970816592f
Merge branch 'develop' into bugfix/charselect-crash 2024-09-18 06:20:44 -04:00
EliteMasterEric ba90a6abe0 Add behavior when setting status: rejected 2024-09-18 06:08:18 -04:00
EliteMasterEric d54dc6179a Add several new Github Actions for issue management 2024-09-18 06:02:13 -04:00
EliteMasterEric b5ed7f40d4 Remove redundant character type assignment 2024-09-18 05:24:57 -04:00
EliteMasterEric b28af79eb3 Fix build issues 2024-09-18 05:18:16 -04:00