4802 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Cameron Taylor	1937529c1f	Merge pull request #779 from FunkinCrew/cutscene-volume-math-fix ... proper audio scaling for hxcodec / desktop	2024-09-22 13:29:59 -04:00
EliteMasterEric	0bf1bead03	Fix some issues causing the Input Offsets view to crash on web.	2024-09-22 12:14:15 -04:00
Cameron Taylor	58508755f9	revert extra flxtrail function	2024-09-22 10:57:00 -04:00
lemz	bcb7bc4cbc	Merge branch 'develop' into completion-fix	2024-09-22 16:12:17 +02:00
EliteMasterEric	28d50a4567	Merge branch 'rewrite/master' into nothyper474/chart-selection	2024-09-22 01:10:56 -04:00
Eric	6a113addca	Merge branch 'develop' into bugfix/chart-selection	2024-09-22 01:09:37 -04:00
EliteMasterEric	c7238fcfd1	Stop the volume tray from hiding as long as the game is muted	2024-09-22 00:45:30 -04:00
EliteMasterEric	29a7005d8a	Fix a bug where you can hear the game a little when setting the volume to 0 ticks	2024-09-22 00:44:57 -04:00
EliteMasterEric	d23ae7c55b	Merge remote-tracking branch 'public/develop' into docs/updated-changelog	2024-09-21 23:31:25 -04:00
EliteMasterEric	d11acfd83b	Merge remote-tracking branch 'public/main' into docs/updated-changelog	2024-09-21 23:31:21 -04:00
Eric	754e2edbeb	Merge pull request #3420 from JVNpixels/patch-4 ... [DOCUMENTATION/BUG-FIX] Fix changelog for v0.5.0	2024-09-21 23:12:57 -04:00
EliteMasterEric	5548fd52f4	Update default mod so it actually loads	2024-09-21 20:33:59 -04:00
EliteMasterEric	6c743b3b89	Remove some spammy trace calls.	2024-09-21 20:33:51 -04:00
Cameron Taylor	e978f5df76	fix for spirit's trail	2024-09-21 16:32:44 -04:00
JVN-Pixels	3601b50e32	Update CHANGELOG.md	2024-09-21 10:29:08 -07:00
JVN-Pixels	e535ae4ca6	Change line 12 ... The songs from Weekend 1 have moved line	2024-09-21 10:19:00 -07:00
JVN-Pixels	ec8ecc6163	Update CHANGELOG.md	2024-09-21 10:14:09 -07:00
JVN-Pixels	01e9888839	Update CHANGELOG.md ... Fixes changelog for the 0.5.0 update!	2024-09-21 10:07:41 -07:00
EliteMasterEric	2c73b241e8	Rework offset+vocal sync handling to fix the "Swing Mode" bug	2024-09-21 06:33:47 -04:00
Eric	3ef238a2f6	Merge pull request #3282 from TechnikTil/playsound-typo ... [DOCUMENTATION] playSound Typo in NoteScriptEvent	2024-09-21 05:45:35 -04:00
Cameron Taylor	690f3090b7	proper audio scaling for hxcodec / desktop	2024-09-20 20:11:12 -04:00
Cameron Taylor	a41d3033d5	small Assets -> OpenFLAssets fix	2024-09-20 18:20:40 -04:00
Cameron Taylor	d02e834460	Merge branch 'rewrite/master' into abnormalpoof/assets-getpath	2024-09-20 18:13:13 -04:00
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
Kade	f9186b67a7	less tolerance	2024-09-19 17:00:52 -07:00
Kade	a8aeae4f7f	do not include offset in vocal (they're offset by inst) ... Fix a tiny little issue with vocal resync @ start	2024-09-19 14:26:18 -07:00
Kade	4d73e0cc47	fix some interesting issues with this ... redundant trace removal	2024-09-19 14:26:18 -07:00
Kade	b03c8a9cf8	Limit the song time to 0 and the songs max length ... use the new bool to tell if we should start the song add a public static bool to countdown: finished	2024-09-19 14:26:18 -07:00
EliteMasterEric	3cbba8ba29	Resolve merge issues.	2024-09-19 17:16:31 -04:00