1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-11-15 11:22:55 +00:00
Commit graph

4711 commits

Author SHA1 Message Date
EliteMasterEric 67126b33fa Suppress some spammy log calls 2024-09-25 10:02:18 -04:00
EliteMasterEric a84ae6069e Fix an issue where Pico wouldn't shoot in Stress 2024-09-25 10:02:11 -04:00
EliteMasterEric ec9b5db210 Create shader for Week 5 once and reuse it rather than recreating it every frame. 2024-09-23 21:41:48 -04:00
Cameron Taylor 7e75308423 capitalization hxCodec 2024-09-23 18:51:48 -04:00
Cameron Taylor 073dbaa023 Merge remote-tracking branch 'origin/bugfix/input-offsets-crash' into rewrite/master 2024-09-23 18:48:22 -04:00
Cameron Taylor f6697f8ddc Merge branch 'bugfix/html5-video-error' into rewrite/master 2024-09-23 18:47:48 -04:00
Cameron Taylor 78d0ad9956 Merge remote-tracking branch 'origin/feature/tracy' into rewrite/master 2024-09-23 17:41:01 -04:00
EliteMasterEric 52f5c24f96 Add frame market support, and enable on demand tracing. 2024-09-23 16:09:34 -04:00
Cameron Taylor 252b87c451
Merge pull request #763 from FunkinCrew/feature/tracy
Add Tracy support for performance profiling
2024-09-23 15:03:33 -04:00
EliteMasterEric 0389cd6760 Fix a compile issue on HTML5 with video sprites 2024-09-23 14:45:12 -04:00
Cameron Taylor 29c860ed43 Merge branch 'pico-burp-fix' into rewrite/master 2024-09-23 13:12:00 -04:00
Cameron Taylor a86cfded2a assets submod 2024-09-23 13:11:36 -04:00
Cameron Taylor 3d5482660c Merge branch 'week2-death-fix' into rewrite/master 2024-09-23 13:10:52 -04:00
Cameron Taylor 299f4840cf assets submod 2024-09-23 13:10:44 -04:00
Cameron Taylor 8749372725 Merge remote-tracking branch 'origin/docs/updated-changelog' into rewrite/master 2024-09-23 13:09:52 -04:00
Cameron Taylor 50f65177cb Merge branch 'rewrite/master' into spirit-trail 2024-09-23 13:09:03 -04:00
Cameron Taylor 1c2a403dea Merge branch 'rewrite/master' into kadedev/fix-audio-offsets 2024-09-23 13:07:32 -04:00
FabsTheFabs 84ce43eff7 assets submod 2024-09-23 03:46:14 +01:00
FabsTheFabs 2edb318901 assets submod 2024-09-22 20:11:37 +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 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
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