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

3400 commits

Author SHA1 Message Date
Cameron Taylor 2d300039ae promises + error out partial sounds that attempt to load multiple times 2024-05-28 23:53:50 -04:00
Cameron Taylor 01b6a11ddb flxpartialsound lock to current version 2024-05-28 22:57:01 -04:00
Cameron Taylor a2ee359e46 fix for songs overlapping each other on desktop 2024-05-23 16:31:18 -04:00
Cameron Taylor f2a06ad37b fading in and erect track loading 2024-05-09 01:56:52 -04:00
Cameron Taylor 1b6febf01c initial freeplay songs loading 2024-05-09 01:15:01 -04:00
Cameron Taylor 77446f28d7
Merge pull request #549 from FunkinCrew/sanitized/bugfix/easter-egg
Fix an error related to an easter egg, plus some script warnings.
2024-05-08 23:30:50 -04:00
Cameron Taylor 928b3c4119 assets submod 2024-05-08 23:29:55 -04:00
Cameron Taylor 9730ef4280
Merge pull request #550 from FunkinCrew/sanitized/bugfix/shader-crash-freeplay
Fix a shader crash on Freeplay on some AMD cards.
2024-05-08 23:21:52 -04:00
Cameron Taylor 54fbb9a294 be careful with these gitmodules, we don't want to work out of funkin.art or funkin.assets 2024-05-08 22:45:13 -04:00
Cameron Taylor 20226baaba Merge branch 'public-release/develop' into develop-0.3.3 2024-05-08 22:43:36 -04:00
codist df5bdc7b7d Fixed stutter once a transition to the main menu completes. 2024-05-08 22:42:33 -04:00
Cameron Taylor 4bd8542d3d
Merge pull request #2315 from ImCodist/bugfix/main-menu-camera-stutter
Fixed stutter once a wipe transition to the Main Menu completes.
2024-05-08 22:23:18 -04:00
Eric 1e359030c3
Merge pull request #2302 from FunkinCrew/bugfix/funkvis-hmm
Fix an issue with an improper version of funkVis
2024-05-08 14:17:55 -04:00
codist b49fac742f Fixed stutter once a transition to the main menu completes. 2024-05-08 04:21:30 -04:00
Eric 3142dee553
Merge pull request #2313 from FunkinCrew/bugfix/switch-pattern-typo
Fix a typo in PlayAnimationSongEvent
2024-05-08 03:24:46 -04:00
EliteMasterEric 4e5531744a Curse you burgerballs 2024-05-08 03:23:00 -04:00
Eric 6742e5c833
Merge pull request #2308 from Burgerballs/patch-1
Fix some spaghetti on PlayAnimationSongEvent
2024-05-08 02:32:26 -04:00
Eric fcb1d8eda3
Merge pull request #2309 from ImCodist/bugfix/sustain-flicker
Fixed an issue where hold note would be invisible for a single frame.
2024-05-08 02:25:16 -04:00
codist 000e256b0e Fixed an issue where hold note would be invisible for a single frame. 2024-05-08 01:20:39 -04:00
Burgerballs 2743a853bc
Fix some spaghetti on PlayAnimationSongEvent 2024-05-08 06:03:12 +01:00
Eric 8ba23e0700
Merge pull request #2300 from TheGaloXx/main
FIX WINDOW TWEEN
2024-05-08 00:54:01 -04:00
EliteMasterEric e2613fa8fb Fix an issue with an improper version of funkVis 2024-05-07 23:45:35 -04:00
TheGalo X 5160fd02d4
fix window tween 2024-05-07 23:17:49 -03:00
Cameron Taylor a6948c3a38
Merge pull request #2297 from Chubercik/patch-1
Fix the `funkin-assets` license link
2024-05-07 22:13:37 -04:00
Jakub Marcowski d51809ea2f
Fix the funkin-assets license link 2024-05-08 03:15:07 +02:00
Cameron Taylor 39e7f008ea
Update COMPILING.md 2024-05-07 20:31:41 -04:00
Cameron Taylor 1927e38bc2
case sensitive markdown 2024-05-07 20:31:19 -04:00
Cameron Taylor dee03f7429
Update README.md 2024-05-07 20:30:45 -04:00
Cameron Taylor 8267998f5c update submodules and git modules for codebase 2024-05-07 19:26:10 -04:00
Cameron Taylor 2f9642998e submodule update 2024-05-07 18:48:51 -04:00
EliteMasterEric 91a9815aa0 Revision to license wording. 2024-05-07 18:32:00 -04:00
Cameron Taylor adb52559cc add the apache license in full, with some extra info for funkin copyright 2024-05-07 18:28:37 -04:00
EliteMasterEric 1a04f8ad05 Finalized Apache licensing. 2024-05-07 16:22:51 -04:00
EliteMasterEric 7ff37ae0c2 Fix a conflict between a shader variable name and a function on some graphics cards. 2024-05-07 14:22:22 -04:00
EliteMasterEric a652bfe9f0 Fix an error related to an easter egg, plus some warnings. 2024-05-07 14:01:00 -04:00
EliteMasterEric ca8c62c9bf Make submodule URL secret. 2024-05-06 20:55:57 -04:00
EliteMasterEric 48903c29b1 Update submodule URLs 2024-05-04 15:08:16 -04:00
Cameron Taylor a5825e06c0 0.3.2 changelog 2024-05-03 01:16:23 -04:00
Cameron Taylor 1aa53ee97b Merge branch 'story-mode-diff-position' into develop-0.3.2 2024-05-03 01:14:31 -04:00
Cameron Taylor 60dc5a7a09 Merge branch 'web-sound-fix' into develop-0.3.2 2024-05-03 01:14:14 -04:00
Cameron Taylor 7efc633f45 Merge branch 'actual-merch-fix' into develop-0.3.2 2024-05-03 01:12:23 -04:00
Cameron Taylor ae9a132ccd remove typing bit 2024-05-03 01:12:18 -04:00
EliteMasterEric ef61af907b Update changelog. 2024-05-02 23:06:10 -04:00
EliteMasterEric 5e63832a87 Revert "Moved scroll speed to an instance variable"
This reverts commit 6e5171b766.
2024-05-02 23:06:01 -04:00
Cameron Taylor 6620b2e83c actual merch fix stuff 2024-05-02 23:02:47 -04:00
Cameron Taylor c0b3f703c5 lime commit bump for web audio pos 2024-05-02 22:00:21 -04:00
Cameron Taylor a3969ad5c0 hardcode storymenu difficulties to avoid overlaps 2024-05-02 21:37:07 -04:00
EliteMasterEric a2aa1bd84a Remove unused "typing" element. 2024-05-02 21:23:55 -04:00
EliteMasterEric 76b7baa44a Remove options from the debug menu 2024-05-02 20:06:08 -04:00
Cameron Taylor 909d456b28 assets submod for creds 2024-05-02 17:37:04 -04:00