cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-12-29 00:08:11 +00:00
Code Issues Releases Wiki Activity
4578 commits 31 branches 21 tags 3 GiB
Commit graph

4578 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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 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
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 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
dombomb64 6e33cac9ec ...Okay it wasn't that simple 2024-09-17 16:47:16 -04:00
Eric dab417b391
Merge branch 'rewrite/master' into kadedev/chart-editor-fixes 2024-09-17 16:15:02 -04:00
dombomb64 0706192cbe Fix note scaling with one simple trick! 2024-09-17 13:50:59 -04:00
AbnormalPoof aae7dcdada fix crash when opening urls 2024-09-16 23:35:23 -05:00
EliteMasterEric 811caf6b70 Suppress a spammy log trace 2024-09-16 21:54:33 -04:00
EliteMasterEric d710318830 Update HaxeUI 2024-09-16 21:54:24 -04:00
Eric 1fc835494d
Merge pull request #3020 from anysad/custom-popups-countdowns 
[ENHANCEMENT] Custom Popups and Countdowns
 2024-09-16 20:56:26 -04:00
EliteMasterEric 2e9223ec72 Merge remote-tracking branch 'origin/develop' into anysad/custom-popups-countdowns 2024-09-16 20:50:13 -04:00
Kade 9624b57e44
This does fix it now 2024-09-16 17:23:49 -07:00
Kade 7d2b946e9c
depreciated screen X/Y to view X/Y 2024-09-16 17:13:14 -07:00
Kade 5a877a14a0
only show last two digits 
digit
 2024-09-16 17:13:13 -07:00
Kade 535ac0e528
add milliseconds to the playbar in charting state 
remove laggy redundant traces

Revert "remove laggy redundant traces"

This reverts commit 204113840473dd5069f5d508d50e15e21104b45a.
 2024-09-16 17:13:13 -07:00
Eric 35b5957715
Merge pull request #3007 from anysad/tutorial-hey-events 
[CLEANUP] Softcode Tutorial HEY! events from code to JSON
 2024-09-16 19:33:04 -04:00
EliteMasterEric e915b637c5 Merge remote-tracking branch 'origin/develop' into anysad/tutorial-hey-events 2024-09-16 19:09:58 -04:00
Eric ebfce9f990
Merge pull request #2820 from gamerbross/bugfix/animation-editor 
[ENHANCEMENT/BUGFIX] Few animation editor bugfixes and improvements
 2024-09-16 18:48:50 -04:00
Eric 359e4b41e5
Merge branch 'develop' into bugfix/animation-editor 2024-09-16 18:48:33 -04:00
Eric b0c9365c56
Merge pull request #2942 from FlooferLand/new-settings-items 
New settings widgets (Number, Checkbox, Enum)
 2024-09-16 18:42:48 -04:00
Eric 65fddd95bb
Merge branch 'develop' into new-settings-items 2024-09-16 18:42:43 -04:00
Eric f1d3ace247
Merge pull request #2925 from gamerbross/bugfix/character-danceevery 
[BUGFIX] Implement `danceEvery` for Characters
 2024-09-16 18:42:40 -04:00
Eric 9e90e67673
Merge branch 'develop' into bugfix/character-danceevery 2024-09-16 18:42:32 -04:00
Eric 3ce7cd6990
Merge pull request #2903 from AbnormalPoof/develop 
[ENHANCEMENT] Enable auto-pause for Video Cutscenes
 2024-09-16 18:42:20 -04:00
Eric d4cd2d031c
Merge branch 'develop' into develop 2024-09-16 18:41:33 -04:00
Eric 081d2d8fd8
Merge pull request #2992 from gamerbross/bugfix/charteditor-liveinput-number-6 
[BUGFIX + REFACTOR] ChartEditor Live Input
 2024-09-16 18:40:24 -04:00
Eric 99f4d13e47
Merge branch 'develop' into bugfix/charteditor-liveinput-number-6 2024-09-16 18:40:12 -04:00
Eric 8cad10263e
Merge branch 'develop' into bugfix/animation-editor 2024-09-16 18:37:35 -04:00
Eric 8470880e4a
Merge pull request #2926 from gamerbross/tweak/funkinsound-playonce-return-value 
[CODE TWEAK] `FunkinSound.playOnce` return the created sound
 2024-09-16 18:36:53 -04:00
Eric 6bde7c34a0
Merge branch 'develop' into tweak/funkinsound-playonce-return-value 2024-09-16 18:36:45 -04:00
Eric 3ac10fb45c
Merge pull request #2981 from gamerbross/bugfix/forced-sustaintrail-alpha 
[BUGFIX] SustainTrail forced alpha
 2024-09-16 18:35:31 -04:00
Eric fb0b277a9c
Merge branch 'develop' into bugfix/forced-sustaintrail-alpha 2024-09-16 18:35:17 -04:00
Eric 519a6f3412
Merge pull request #2873 from JVNpixels/JVNPixels-story-menu-scrolling-fixed 
[ENHANCEMENT]: Story Mode Menu Mouse Scrolling
 2024-09-16 18:34:58 -04:00