1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-12-25 14:46:43 +00:00
Commit graph

2667 commits

Author SHA1 Message Date
FabsTheFabs d686890f76 most of the old code 2024-07-01 22:16:56 -04:00
Cameron Taylor 043c8e8ade
Merge pull request #638 from FunkinCrew/cyn0x8/flash-fix
[PUBLIC PR] Make flashing effects look more consistent
2024-07-01 20:23:16 -04:00
Cameron Taylor 5134547071
Merge pull request #648 from FunkinCrew/gamerbross/freeplay-stack-overflow
[PUBLIC PR] Fix Stack Overflow if song doesn't have "normal" difficulty
2024-07-01 20:20:38 -04:00
Cameron Taylor bb1fc64754
Merge pull request #647 from FunkinCrew/gamerbross/stickers-f5-screen
[PUBLIC PR] Fix crash after pressing F5 and coming back from stickers
2024-07-01 20:19:09 -04:00
Cameron Taylor 88263b9ffd
Merge pull request #640 from FunkinCrew/nothyper-474/loading-state-trace
[PUBLIC PR] Fix broken trace call in LoadingState
2024-07-01 16:53:07 -04:00
EliteMasterEric 432c709075 Animated pixel icons for freeplay
mend
2024-07-01 16:51:54 -04:00
Pixel a9c6b9ff8a Extra newline removal.
Removes the extra line in code.
2024-06-29 01:15:48 -04:00
Pixel 90f3a8f285 Update source/funkin/ui/story/StoryMenuState.hx
Co-authored-by: gamerbross <55158797+gamerbross@users.noreply.github.com>
2024-06-29 01:15:48 -04:00
Pixel 55d02d49c2 Update StoryMenuState.hx 2024-06-29 01:15:47 -04:00
gamerbross 7e6ef61169 Fix Stack Overflow if song doesn't have "normal" difficulty 2024-06-29 00:35:01 -04:00
gamerbross 32deb8d190 Fix crash after pressing F5 and coming back from stickers 2024-06-29 00:29:23 -04:00
EliteMasterEric 62501a1ded Fix null safety error. 2024-06-29 00:03:28 -04:00
gamerbross 03eab140f1 FunkinSound.playOnce return sound 2024-06-28 23:29:23 -04:00
EliteMasterEric b022581e23 Make danceEvery a float precise up to 0.25 beats (1 step) 2024-06-28 23:25:59 -04:00
gamerbross 6bf28a5416 Implement danceEvery for Characters 2024-06-28 22:57:44 -04:00
AbnormalPoof 9d9d7a853c video cutscene autopause magic 2024-06-28 22:36:01 -04:00
EliteMasterEric 84dd1cd3b9 Fix several character animation issues 2024-06-28 22:29:59 -04:00
EliteMasterEric fbfd8259a6 Merge branch 'applehair/ranks-for-custom-variations' into feature/playable-pico-mode 2024-06-27 04:06:10 -04:00
MaybeMaru 16d64991ed Add missing constants 2024-06-27 03:56:41 -04:00
NotHyper-474 6f26fbba5f Fix trace 2024-06-26 20:57:01 -04:00
gamerbross a7bdf23832 Fix chart reset when charting and pressing chart key 2024-06-26 20:52:32 -04:00
Cameron Taylor dd30012d80
Merge pull request #637 from FunkinCrew/hundrec/tankman-chart-editor-fix
[PUBLIC PR] Fix tankmanpixel icon in Chart Editor
2024-06-26 20:41:24 -04:00
cyn dad8b0815d flash fix 2024-06-26 20:36:53 -04:00
Hundrec 08d35eb00d
Fix tankmanpixel icon in Chart Editor 2024-06-25 18:07:09 -04:00
Cameron Taylor 8a144352a0 remove bopper trace 2024-06-25 13:56:31 -04:00
Cameron Taylor 1757532097 more retro week 6 stuff 2024-06-25 13:56:31 -04:00
Cameron Taylor ab2f949d7e fix for heart icons being on the wrong frames 2024-06-25 13:56:31 -04:00
Cameron Taylor 5751430261 fix the camera not panning when opening then closing the debug menu during transition 2024-06-25 13:56:31 -04:00
Cameron Taylor 39c3af58f2 fix: bf v pose playing during a gameover 2024-06-25 13:56:31 -04:00
EliteMasterEric 4e65c49e0e Get rid of a warning about missing BPM info 2024-06-24 14:40:55 -04:00
Karim Akra 983d241e47 remove the library strip 2024-06-24 14:40:55 -04:00
EliteMasterEric d44275c2c7 Fix a bug where songs with no notes would crash the results screen. 2024-06-24 14:40:55 -04:00
Cameron Taylor 81cada675c fix for release, no bf printing directly to stdout! 2024-06-24 14:40:55 -04:00
EliteMasterEric 9b3a748f37 Working Pico DJ 2024-06-20 16:17:53 -04:00
EliteMasterEric 263039f52c Make Boyfriend DJ animations data driven 2024-06-18 20:07:27 -04:00
EliteMasterEric 60e741434c Implemented playable character registry, added Freeplay character filtering, added alt instrumental support 2024-06-18 17:56:24 -04:00
EliteMasterEric 6f2f2a9aa4 Merge branch 'applehair/preview-inst-suffix' into feature/playable-pico-mode 2024-06-18 15:40:51 -04:00
AppleHair 1f1fe62a06
[BUGFIX] Fixed Ranks not appearing in freeplay for custom variations
Freeplay tries to access a song's rank using the current difficulty name alone, but custom variation ranks are being saved with a variation prefix. This PR makes freeplay look for the variation prefix when necessary.
2024-06-14 16:53:33 +03:00
Cameron Taylor a63b60d458 fix for release, no bf printing directly to stdout! 2024-06-12 20:31:27 -04:00
Cameron Taylor 80981eee37 inputs null fix 2024-06-12 15:41:42 -04:00
AppleHair c4d6e18885
now using getVariationsByCharId instead 2024-06-12 11:23:45 +03:00
Cameron Taylor 47d5c4d141
Merge pull request #619 from FunkinCrew/freeplay-dad-smoother
freeplay bg nicer AA and proper sizing
2024-06-11 16:16:13 -04:00
Cameron Taylor c325fdaa1b
Merge pull request #618 from FunkinCrew/speaker-volume-desktop
[funk-378] reactive speaker to gamevolume on desktop
2024-06-11 16:16:02 -04:00
Cameron Taylor c05f053fe3 Merge branch 'rewrite/master' into bugfix/instrumental-id 2024-06-11 16:12:39 -04:00
Cameron Taylor 1e3ef61fc9 freeplay bg nicer AA and proper sizing 2024-06-11 15:57:45 -04:00
Cameron Taylor 37a15e0a0f reactive speaker to gamevolume on desktop 2024-06-11 12:13:10 -04:00
Cameron Taylor 817c216d06
Merge pull request #617 from FunkinCrew/bugfix/save-highest-rank
[FUNK-387] Save high scores and high ranks separately.
2024-06-11 12:04:38 -04:00
Cameron Taylor 381e0104e9
Merge pull request #616 from FunkinCrew/feature/freeplay-keybinds
[FUNK-391] Rebindable controls for the Freeplay menu
2024-06-11 11:49:24 -04:00
EliteMasterEric b30faad7d9 Save high scores and high ranks separately. 2024-06-11 00:40:43 -04:00
Cameron Taylor 00021523bc lower volume on freeplay easter egg 2024-06-10 17:35:49 -04:00
Ikko Eltociear Ashimine e8f8a0c181 chore: update MenuList.hx
lenth -> length
2024-06-10 16:45:22 -04:00
DM-kun da61b72c48 crash fix 2024-06-10 16:21:41 -04:00
Cameron Taylor f31ea8fb73 add sound for changing sorting 2024-06-10 16:13:32 -04:00
gamerbross 8f44d9606d Remove unnecessary scrollMenu sounds + adjust volume 2024-06-10 13:17:38 -04:00
AppleHair 9fa603363c
[BUGFIX] Made freeplay use the metadata to get the instrumental suffix
Song previews in freeplay will now use the instrumental suffix from the current difficulty's corresponding song variation metadata instead of using the variation id as an instrumental suffix and checking only the "erect" variation.
2024-06-10 19:42:27 +03:00
Cameron Taylor 4691e3d249 Merge branch 'bugfix/chart-editor-event-toolbox-crash' into rewrite/master 2024-06-10 12:26:47 -04:00
Cameron Taylor b7d25bf04f Merge branch 'escape-quit' into rewrite/master 2024-06-10 12:04:30 -04:00
Cameron Taylor 5dcd3eb946 Merge branch 'heart-capsule-pos' into rewrite/master 2024-06-10 12:04:09 -04:00
Cameron Taylor 55edb9ea14 pressing escape on title screen exits game 2024-06-09 15:38:22 -04:00
Cameron Taylor d974f12c72 Merge branch 'develop' into rewrite/master 2024-06-09 15:30:14 -04:00
Cameron Taylor f2d5a80bd1 completes funk-305 2024-06-09 15:06:45 -04:00
EliteMasterEric 09aa8fbf52 Rebindable controls for the Freeplay menu 2024-06-09 02:22:03 -04:00
Cameron Taylor 45b43108d1 lower fft amount on desktop 2024-06-07 22:36:25 -04:00
Eric 4169116129
Merge branch 'develop' into abstract-optionname 2024-06-07 21:44:28 -04:00
gamerbross 1172949a04 Fix Options Menu not enabled in transIn 2024-06-07 21:31:53 -04:00
EliteMasterEric d19e9e62fa Merge branch 'richtrash21/freeplay-camera-optimization' into develop 2024-06-07 21:21:11 -04:00
EliteMasterEric 2e4b94d528 Fix additional merge conflicts 2024-06-07 21:20:04 -04:00
EliteMasterEric 4382b3e16e Merge branch 'develop' into richtrash21/freeplay-camera-optimization 2024-06-07 21:13:13 -04:00
Eric 9a8ba4183e
Merge branch 'develop' into patch-1 2024-06-07 21:08:09 -04:00
gamerbross cd485213db Pause Camera Follow when pausing 2024-06-08 02:26:17 +02:00
gamerbross ee6c4478a9 Use FlxG.camera instead of camGame 2024-06-08 02:02:54 +02:00
Hundrec 393355b512
Fix botplay sustain release bug
Copied opponent's holdTimer code to the player's side
2024-06-07 19:59:02 -04:00
EliteMasterEric d39f3dc1e8 Merge branch 'main' into develop 2024-06-07 19:54:30 -04:00
Cameron Taylor 1d6315fe0e
Merge pull request #610 from FunkinCrew/2hot-freeplay
regexp for numbers
2024-06-07 14:33:56 -04:00
Cameron Taylor 34c91dae76 dadbattle hard/erect fix 2024-06-07 14:24:57 -04:00
Cameron Taylor a0adbc72b3 regexp for numbers 2024-06-07 13:04:45 -04:00
Cameron Taylor 6fd030cb30 Merge branch 'patch-1' into rewrite/master 2024-06-07 11:38:57 -04:00
EliteMasterEric ca345e6c4f Play song IDs based on the chart file's "instrumental" field, not the variation ID. 2024-06-06 21:38:00 -04:00
Cameron Taylor c54c10f562 lower fft res on desktop 2024-06-06 20:46:12 -04:00
Cameron Taylor fa270aa6ca Merge branch 'rewrite/master' into fix/grig-viz 2024-06-06 20:17:25 -04:00
Cameron Taylor e45e359de7 Merge branch 'mainmenu-remember-selection' into rewrite/master 2024-06-06 20:15:11 -04:00
Cameron Taylor 7ef14b24c7 Merge branch 'prshit' into rewrite/master 2024-06-06 20:13:36 -04:00
Cameron Taylor 3aa3007dbb Merge branch 'fix-url-open' into rewrite/master 2024-06-06 20:12:28 -04:00
Cameron Taylor 73c7bcf609
Merge branch 'rewrite/master' into burgerballs/scroll-speed-event 2024-06-06 19:49:47 -04:00
Cameron Taylor 02be65c383
Merge branch 'rewrite/master' into pursnake/character-scale 2024-06-06 19:47:48 -04:00
EliteMasterEric 70f027cc3f Fix another crash with the chart editor event toolbox 2024-06-06 16:44:47 -04:00
EliteMasterEric a81b6b2d6e Fix issue with rendering the grid in 3/4 time signature 2024-06-06 16:44:20 -04:00
FabsTheFabs 642f272bce freeplay polish + new text 2024-06-06 01:49:33 +01:00
EliteMasterEric 6fb19dc4d3 Update chart editor dropdowns to be searchable 2024-06-05 20:09:26 -04:00
EliteMasterEric 6d133f007d Fix a bug where the event data toolbox wouldn't rebuild, and it would crash. 2024-06-05 19:25:53 -04:00
Cameron Taylor bc783a278a rank clipping fix 2024-06-05 18:21:57 -04:00
Cameron Taylor 4311dd2074 hopefully dadbattle fix lol 2024-06-05 17:58:22 -04:00
Cameron Taylor e01fa2c85e Merge branch 'result-percentage' into rewrite/master 2024-06-05 17:11:47 -04:00
Cameron Taylor 6334d16984 Merge branch 'ninjamuffin99/funk-250' into rewrite/master 2024-06-05 17:11:22 -04:00
Cameron Taylor eaa63196b3 fix for dadbattle appearing on freeplay 2024-06-05 17:10:53 -04:00
Cameron Taylor c1bfc67f52 remove effin trace 2024-06-05 15:43:25 -04:00
Cameron Taylor 5bcc0f9b25 partial sound loading should be more resiliant 2024-06-05 15:02:29 -04:00
Cameron Taylor 6e761ba156 hardcode the songname position 2024-06-05 14:47:29 -04:00
Cameron Taylor fa1fafba68 less effin traces 2024-06-05 14:13:06 -04:00
Cameron Taylor 88248233b0
Merge pull request #599 from FunkinCrew/bugfix/results-percent-display
Fix some display issues with the clear percent in the results screen.
2024-06-05 01:48:43 -04:00