Commit graph

4671 commits

Author SHA1 Message Date
FabsTheFabs
84ce43eff7 assets submod 2024-09-23 03:46:14 +01:00
Cameron Taylor
15bce04a50
Merge pull request #783 from FunkinCrew/nothyper474/chart-selection
[PUBLIC PR] Chart Editor: Fi bug where selecting area left of the chart would select the player's left notes
2024-09-22 13:30:32 -04:00
Cameron Taylor
5c6d72d8d5
Merge pull request #782 from FunkinCrew/cyn0x8/funkinsound-persist
[PUBLIC PR] If FunkinSound.persist is true, don't destroy it when switching states
2024-09-22 13:30:17 -04:00
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
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
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
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