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

3894 commits

Author SHA1 Message Date
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
Cameron Taylor 5686bfcd6b ### Changed
- Tweaked the chart for Lit Up some more to fix some offset notes.Merge branch 'bugfix/spaz-charts' into rewrite/master
2024-06-11 11:27:57 -04:00
Cameron Taylor 93c0bd0b63 assets submod 2024-06-11 11:25:43 -04:00
EliteMasterEric b30faad7d9 Save high scores and high ranks separately. 2024-06-11 00:40:43 -04:00
EliteMasterEric c0a7e4f728 Readd camera events to Roses 2024-06-10 19:32:53 -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
Cameron Taylor 13d49017ac removed compiling help and question templates 2024-06-10 16:45:22 -04:00
Cameron Taylor f91f4b2ddb simplified the bug template to have less clutter 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 cd2bbcb43b Merge branch 'ninjamuffin99/funk-292' into rewrite/master 2024-06-10 12:05:08 -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 b811aeec80 fix for pico explo 2024-06-09 16:15:33 -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
Cameron Taylor 9a26837374
Merge pull request #2730 from eltociear/patch-2
chore: update MenuList.hx
2024-06-09 14:19:37 -04:00
Ikko Eltociear Ashimine bdaadfbfdd
chore: update MenuList.hx
lenth -> length
2024-06-10 02:26:55 +09:00
Cameron Taylor 9f960f5c28 removed compiling help and question templates 2024-06-09 12:43:43 -04:00
Cameron Taylor 9455b6eadc simplified the bug template to have less clutter 2024-06-09 12:41:00 -04:00
Cameron Taylor eb979a8625
Merge pull request #2701 from zacksgamerz/develop
Fixed that one mistake in .github/ISSUE_TEMPLATE/bug.md
2024-06-09 12:21:45 -04:00
EliteMasterEric 839d6a0841 A couple chart fixes 2024-06-09 02:27:36 -04:00
EliteMasterEric 09aa8fbf52 Rebindable controls for the Freeplay menu 2024-06-09 02:22:03 -04:00
zacksgamerz bc80e39a85
you're to your 2024-06-08 19:07:22 +07:00
Cameron Taylor 45b43108d1 lower fft amount on desktop 2024-06-07 22:36:25 -04:00
Eric 9a78060329
Merge pull request #2451 from nebulazorua/abstract-optionname
abstract enum pagename
2024-06-07 22:02:18 -04:00
Eric 4169116129
Merge branch 'develop' into abstract-optionname 2024-06-07 21:44:28 -04:00
Eric 5bd9ff8c21
Merge pull request #2551 from gamerbross/bugfix/fast-enter-options
[BUGFIX] Options Menu not enabled in transIn
2024-06-07 21:36:21 -04:00
Eric f38f5a268b
Merge branch 'develop' into bugfix/fast-enter-options 2024-06-07 21:35:56 -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 195663638e
Merge pull request #2683 from Hundrec/patch-1
Fix botplay sustain release bug
2024-06-07 21:08:19 -04:00
Eric 9a8ba4183e
Merge branch 'develop' into patch-1 2024-06-07 21:08:09 -04:00
Eric aace5e2326
Merge pull request #2684 from gamerbross/bugfix/camfollow-pause-game
[BUGFIX] Pause Camera Follow when pausing
2024-06-07 20:56:01 -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 7b90a3cee3 lil changelog in progres 2024-06-07 14:36:14 -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