Commit Graph
6373 Commits
Author SHA1 Message Date
EricandGitHub 6bde7c34a0 Merge branch 'develop' into tweak/funkinsound-playonce-return-value 2024-09-16 18:36:45 -04:00
EricandGitHub 3ac10fb45c Merge pull request #2981 from gamerbross/bugfix/forced-sustaintrail-alpha
[BUGFIX] SustainTrail forced alpha
2024-09-16 18:35:31 -04:00
EricandGitHub fb0b277a9c Merge branch 'develop' into bugfix/forced-sustaintrail-alpha 2024-09-16 18:35:17 -04:00
EricandGitHub 519a6f3412 Merge pull request #2873 from JVNpixels/JVNPixels-story-menu-scrolling-fixed
[ENHANCEMENT]: Story Mode Menu Mouse Scrolling
2024-09-16 18:34:58 -04:00
EricandGitHub 27f700dd98 Merge branch 'develop' into JVNPixels-story-menu-scrolling-fixed 2024-09-16 18:34:43 -04:00
EricandGitHub f015976521 Merge pull request #2712 from gamerbross/bugfix/freeplay-difficulty-stack-overflow
[BUGFIX] Song with no "Normal" causes Stack Overflow
2024-09-16 18:34:06 -04:00
EricandGitHub 265039b025 Merge branch 'develop' into bugfix/freeplay-difficulty-stack-overflow 2024-09-16 18:33:57 -04:00
EricandGitHub 8c6cb72d47 Merge pull request #2986 from AppleHair/bugfix/cancel-menu-sound
[BUGFIX] Fixed `cancelMenu` sound not playing after switching state
2024-09-16 18:30:02 -04:00
EricandGitHub b3221c0e3f Merge branch 'develop' into bugfix/cancel-menu-sound 2024-09-16 18:29:51 -04:00
EricandGitHub c7cb03dd1d Merge pull request #2990 from gamerbross/bugfix/f5-reload-chart
[BUGFIX] F5 now reloads the chart in the PlayState
2024-09-16 18:29:39 -04:00
EricandGitHub a7c0512503 Merge branch 'develop' into bugfix/f5-reload-chart 2024-09-16 18:29:33 -04:00
EricandGitHub 74a94d0080 Merge branch 'develop' into bugfix/charteditor-liveinput-number-6 2024-09-16 18:28:22 -04:00
EricandGitHub d214ae1747 Merge pull request #3058 from Burgerballs/fix-sync
Use chart inst offset for song resync + other resync fixes
2024-09-16 18:27:35 -04:00
EricandGitHub 6ee1bddacb Merge branch 'develop' into fix-sync 2024-09-16 18:27:27 -04:00
EricandGitHub 8b96d1bbac Merge pull request #2863 from gamerbross/bugfix/stickers-f5-crash
[BUGFIX] Crash after coming back from stickers and pressing F5
2024-09-16 18:26:42 -04:00
EricandGitHub d4e11f786c Merge branch 'develop' into bugfix/stickers-f5-crash 2024-09-16 18:26:31 -04:00
EricandGitHub 724c415016 Merge pull request #2739 from gamerbross/bugfix/chart-key
[BUGFIX] When pressing chart key while charting, chart gets reset
2024-09-16 18:25:42 -04:00
EricandGitHub 055ae5b932 Merge branch 'develop' into bugfix/chart-key 2024-09-16 18:25:35 -04:00
EricandGitHub 85e9dbb959 Merge pull request #2713 from KarimAkra-Stuff/memory-counter-fix
[BUGFIX] Fixed memory counter displaying negative numbers
2024-09-16 18:25:15 -04:00
EricandGitHub c5060b6eec Merge pull request #2749 from NotHyper-474/path-trace-fix
Fix small oversight in LoadingState
2024-09-16 18:24:42 -04:00
EricandGitHub df77d11896 Merge branch 'develop' into path-trace-fix 2024-09-16 18:24:34 -04:00
EricandGitHub aa2d934f22 Merge pull request #3036 from AppleHair/bugfix/freeplay-infinite-recursion
[BUGFIX] Prevented infinite recursion on freeplay when a song doesn't have the `normal` difficulty
2024-09-16 18:24:22 -04:00
EricandGitHub 3f6ad6f8ad Merge branch 'develop' into bugfix/freeplay-infinite-recursion 2024-09-16 18:24:15 -04:00
EricandGitHub 45efd78931 Merge pull request #3037 from AppleHair/bugfix/valid-vari-story-mode
[BUGFIX] Ensure the variation used for the next song is valid.
2024-09-16 18:23:50 -04:00
EricandGitHub b95e228322 Merge branch 'develop' into bugfix/valid-vari-story-mode 2024-09-16 18:23:39 -04:00
EricandGitHub c9e2e7bef5 Merge pull request #3005 from gamerbross/bugfix/default-face-icon
[BUGFIX] Default health icon (face) not used
2024-09-16 18:23:23 -04:00
EricandGitHub bab4ac4902 Merge branch 'develop' into bugfix/default-face-icon 2024-09-16 18:21:20 -04:00
EricandGitHub b8d1341a21 Merge pull request #2850 from MaybeMaru/constants
Use constants pixels per ms
2024-09-16 18:20:46 -04:00
EricandGitHub 55e0970e4c Merge branch 'develop' into constants 2024-09-16 18:20:35 -04:00
EricandGitHub 82c2d54079 Merge pull request #2567 from gamerbross/bugfix/pause-sticker-zoom
[BUGFIX] Pause Menu and Stickers have same zoom as HUD
2024-09-16 18:20:20 -04:00
EricandGitHub c4b475e86a Merge branch 'develop' into bugfix/pause-sticker-zoom 2024-09-16 18:20:11 -04:00
EricandGitHub 9fddb727b8 Merge pull request #2724 from KarimAkra-Stuff/FlxPartialSound-openfl/polymod-support
[BUGFIX] Fixed Polymod and Mods Support in FlxPartialSound
2024-09-16 18:19:20 -04:00
lemz 224d930ae6 Update PreferencesMenu.hx 2024-09-17 00:17:56 +02:00
EricandGitHub 3b9d400f57 Merge pull request #3328 from FunkinCrew/docs/troubleshooting-update
[DOCS] Update to troubleshooting guide
2024-09-16 18:17:25 -04:00
EliteMasterEric f8d0ddef34 Update troubleshooting guide 2024-09-16 18:17:07 -04:00
lemz 18edadb712 Merge branch 'fps-setting' of https://github.com/lemz1/Funkin into fps-setting 2024-09-17 00:16:33 +02:00
lemz 80fc0cd526 Update Preferences.hx 2024-09-17 00:16:27 +02:00
lemzandGitHub e7674ec31c Merge branch 'develop' into fps-setting 2024-09-17 00:13:49 +02:00
AbnormalandGitHub 0b531c5b21 add getPath 2024-09-16 22:13:16 +00:00
EricandGitHub 8efcd1eae1 Merge pull request #2584 from FunkinCrew/docs/compiling-guide
[DOCS] Update compiling guide with more troubleshooting
2024-09-16 18:12:55 -04:00
EricandGitHub 06485518db Merge branch 'develop' into docs/compiling-guide 2024-09-16 18:12:49 -04:00
EricandGitHub 57523c9439 Merge pull request #3035 from 7oltan/character-path-fix
FIXES CHARACTER PATH ONLY CHECKING IN SHARED
2024-09-16 18:10:25 -04:00
EricandGitHub 42544ee757 Merge branch 'develop' into character-path-fix 2024-09-16 18:10:09 -04:00
Til Tjardes 4be4570c94 Merge branch 'main' of https://github.com/FunkinCrew/Funkin into playsound-typo 2024-09-16 16:08:58 -06:00
lemzandGitHub d0ec26c44a Merge branch 'develop' into completion-fix 2024-09-17 00:08:19 +02:00
lemzandGitHub 8252b2a6b3 Merge branch 'develop' into substate-dispatch-event-fix 2024-09-17 00:07:25 +02:00
EricandGitHub a5ac717677 Merge branch 'develop' into bugfix/freeplay-difficulty-stack-overflow 2024-09-16 18:03:47 -04:00
EricandGitHub ea2e6506c8 Merge pull request #2494 from cyn0x8/flash_fix
consistent flashing
2024-09-16 18:03:18 -04:00
EricandGitHub 1e8d3c715b Merge branch 'develop' into flash_fix 2024-09-16 18:03:05 -04:00
Cameron Taylor 4bc2510d3c Merge remote-tracking branch 'origin/bugfix/pixel-shit-aliasing' into rewrite/master 2024-09-16 17:40:44 -04:00