cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-12-27 23:46:45 +00:00
Code Issues Releases Wiki Activity
4428 commits 31 branches 21 tags 3 GiB
Commit graph

4428 commits

This branch
This branch
All branches
Author SHA1 Message Date
Cameron Taylor 1b309e33ef
Merge branch 'rewrite/master' into 70ltan/char-path-fix 2024-08-20 14:21:36 -04:00
Cameron Taylor f8b63c9968 update funkin.vis PR 2024-08-20 14:19:04 -04:00
CheemsAndFriends 94a08ff528 asset stuff 2024-08-20 01:28:03 +02:00
CheemsAndFriends a6f8cf0141 Setting a simple mask test 2024-08-20 01:20:13 +02:00
Cameron Taylor 7d3d83b23c Merge branch 'week1-stage-erect' into rewrite/master 2024-08-19 19:06:24 -04:00
Cameron Taylor ec07a476c1 assets submod 2024-08-19 19:06:07 -04:00
Cameron Taylor 0aa9c41c5b assets submod 2024-08-19 18:59:08 -04:00
CheemsAndFriends 82eea221d8 Can't seem to understand AtlasSprite 2024-08-19 14:41:20 +02:00
CheemsAndFriends 8a2d8a9941 Committing all the additional stuff (Lowering FPS 
For my PC lol)
 2024-08-19 13:41:29 +02:00
CheemsAndFriends 4dad17d241 Prepare the FlxAnimate bizz 2024-08-19 13:40:58 +02:00
FabsTheFabs 8a03cc7b2a assets submod 2024-08-19 04:29:28 +01:00
FabsTheFabs 9d85d423c6 add stage to registry and chart editor 2024-08-19 04:29:22 +01:00
Cameron Taylor eb5bf449a4 assets submod 2024-08-17 15:06:10 -04:00
Cameron Taylor 0270df6b23 assets submod 2024-08-17 14:58:42 -04:00
Cameron Taylor 0e46f91a60 Merge branch 'rewrite/master' into feature/album-art-swap 2024-08-16 20:21:51 -04:00
Cameron Taylor b1fe983c21 Merge branch '2-erect-songs' into rewrite/master 2024-08-15 15:15:08 -04:00
Cameron Taylor 6679ec5519 assets submod 2024-08-15 15:14:41 -04:00
Cameron Taylor 0d33cd29a9
Merge pull request #692 from FunkinCrew/feature/more-pico-songs 
Add a bunch of Pico remixes
 2024-08-15 15:13:37 -04:00
EliteMasterEric 988e819e9b Add a bunch of remixes 2024-08-14 15:10:47 -04:00
EliteMasterEric c209e0e192 Ugh Erect and Cocoa Erect 2024-08-14 10:57:44 -04:00
Eric f4e42375d1
Merge branch 'rewrite/master' into applehair/freeplay-stack-overflow 2024-08-12 14:37:18 -04:00
Eric 6e1ff4a6b1
Merge branch 'rewrite/master' into 70ltan/char-path-fix 2024-08-12 14:37:16 -04:00
Eric f5826e3a35
Merge branch 'rewrite/master' into applehair/storymode-valid-variation 2024-08-12 14:37:15 -04:00
Cameron Taylor ce559106f6
Merge pull request #691 from FunkinCrew/runners-fixins 
Windows + Mac quick runners fix
 2024-08-10 15:30:35 -04:00
Cameron Taylor a0047a482f use --always when installing funkin-patches versions of haxelib and hmm 2024-08-09 23:31:40 -04:00
Cameron Taylor b47c695cb7 perhaps use funkin versions of haxelib and hmm? 2024-08-09 23:09:23 -04:00
Cameron Taylor 78d9d2ad21 Merge branch 'ninjamuffin99/funk-605' into rewrite/master 2024-08-09 23:03:23 -04:00
Cameron Taylor 9ff3e0435a assets submod 2024-08-09 23:02:46 -04:00
Cameron Taylor 21fe5f12be Merge branch 'ninjamuffin99/funk-644' into rewrite/master 2024-08-09 23:02:02 -04:00
Cameron Taylor e105f933ac Merge branch 'rewrite/master' into anysad/custom-countdowns 2024-08-09 23:00:03 -04:00
Cameron Taylor 09fe8c1196
Merge pull request #687 from FunkinCrew/feature/erect-stages 
Erect stages for weeks 2,3,4 + unfinished pico shit
 2024-08-09 22:27:05 -04:00
Cameron Taylor cce6434570 Merge branch 'rewrite/master' into feature/erect-stages 2024-08-07 19:43:37 -04:00
Cameron Taylor c3d497a9d9 hxcpp bump 2024-08-07 19:01:46 -04:00
Cameron Taylor ae648418c2 assets submod senpai fix 2024-08-06 14:03:25 -04:00
Cameron Taylor 62d0b33689 Fix for switching to old icon on isPixel levels 2024-08-06 13:44:02 -04:00
Cameron Taylor 960c151985
Merge pull request #682 from FunkinCrew/haxelib-updates 
Update OpenFL to latest
 2024-08-05 10:48:12 -04:00
Cameron Taylor f4968b0ae5 openfl hmm commit to dev-funkin 2024-08-05 10:47:59 -04:00
FabsTheFabs 8200a08152 assets submod 2024-07-31 14:36:34 +01:00
FabsTheFabs 270748d108 fuck these decimals messing up my compiling 2024-07-31 14:36:24 +01:00
FabsTheFabs 3b7e656793 add stage names to registry + chart editor 2024-07-31 14:36:06 +01:00
Cameron Taylor 3c814dacf0
Merge pull request #672 from FunkinCrew/bugfix/character-offset-fixes 
[PUBLIC PR] Fix some bugs with how character positions are handled.
 2024-07-29 21:27:04 -04:00
Cameron Taylor c9c81fae51 assets submod? 2024-07-29 21:26:02 -04:00
Cameron Taylor f4a2ac4dde Merge branch 'rewrite/master' into bugfix/character-offset-fixes 2024-07-29 21:25:33 -04:00
AppleHair cb02ea7da5 Updated to extend #2712 2024-07-29 19:03:54 -04:00
AppleHair c8322c479c Added a comment 2024-07-29 19:03:52 -04:00
AppleHair 4f46a8e4d0 [BUGFIX] Prevented infinite recursion on freeplay when a song doesn't have the normal difficulty 
Any attempt to create a song without the `normal` difficulty will result in a silent crash when opening freeplay. After some debugging, I discovered that the issue is caused by infinite recursion, which gets triggered at the start of `FreeplaySongData`'s `updateValues`.
 2024-07-29 19:03:37 -04:00
7oltan e2297af1cd FIX CHARACTER PATHS ISSUE 2024-07-29 18:54:26 -04:00
AppleHair eb78b754f8 A fix requested by Eric 2024-07-29 18:34:59 -04:00
AppleHair bef2e98222 [BUGFIX] Ensure the variation used for the next song is valid. 
When playing in story mode, `PlayState` assumes all the songs use the same variation, which is usually true, but not guaranteed. This PR makes `PlayState` use the `getFirstValidVariation` method to find the valid variation instead of using the `currentVariation` variable, which might not be valid.
 2024-07-29 18:34:59 -04:00
EliteMasterEric 68b7610225 Update OpenFL to latest (requires a few fixes) 2024-07-29 17:26:49 -04:00