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

2843 commits

Author SHA1 Message Date
EliteMasterEric a9aa142b8d Added more pico results + charts 2024-07-07 04:10:37 -04:00
Cameron Taylor c9c94a5fda note fadein fix 2024-07-04 15:55:19 -04:00
Cameron Taylor 6593ddbbc8
Merge pull request #646 from FunkinCrew/gamerbross/playonce-returns
[PUBLIC PR] FunkinSound.playOnce now returns the created sound
2024-07-04 15:10:20 -04:00
Cameron Taylor 4d9b506380
Merge pull request #645 from FunkinCrew/gamerbross/char-danceevery
[PUBLIC PR + CHANGES] Fix danceEvery for characters
2024-07-04 15:08:51 -04:00
Cameron Taylor 67b1c3864e Merge branch 'rewrite/master' into feature/character-anim-fixes 2024-07-04 15:07:07 -04:00
Cameron Taylor 130440fd6e assets submod 2024-07-04 15:06:04 -04:00
Cameron Taylor eddfa23955
Merge pull request #644 from FunkinCrew/abnormalpoof/cutscene-auto-pause
[PUBLIC PR] Automatically pause video cutscenes when tabbing away from the game
2024-07-04 14:52:46 -04:00
Cameron Taylor a7cfae8545 mer 2024-07-04 14:48:24 -04:00
EliteMasterEric 7fbc765403 Implement Pico results (good animation) 2024-07-04 03:32:50 -04:00
EliteMasterEric e32fcee77c Migrate results animations to JSON data so we can implement them per-character 2024-07-03 22:50:39 -04:00
AppleHair bd17d965f5 [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-07-03 18:03:46 -04:00
EliteMasterEric ad57e64994 Working Pico DJ 2024-07-03 18:03:31 -04:00
EliteMasterEric 5c2bad888d Make Boyfriend DJ animations data driven 2024-07-03 18:02:16 -04:00
EliteMasterEric 72a00b9ae2 Implemented playable character registry, added Freeplay character filtering, added alt instrumental support 2024-07-03 18:01:49 -04:00
AppleHair b1021530d8 now using getVariationsByCharId instead 2024-07-03 18:00:59 -04:00
AppleHair 837efcea36 [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-07-03 18:00:58 -04:00
Cameron Taylor 105e3dccba spritesheet fixins for char select 2024-07-02 21:26:16 -04:00
FabsTheFabs 3fa9b2a635 new music 2024-07-01 22:18:04 -04:00
Cameron Taylor 8dfd36d227 menu spam fixie 2024-07-01 22:18:03 -04:00
FabsTheFabs b1b7a032be music updates 2024-07-01 22:17:55 -04:00
FabsTheFabs 28068b1a86 updating more stuff 2024-07-01 22:17:55 -04:00
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
FlooferLand! cd08116aed Added getWidth 2024-07-01 15:41:08 -04:00
FlooferLand! fbc78adb65 Added new settings items 2024-07-01 15:41:08 -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
EliteMasterEric 640c1cf236 Dave say 1 minute to make Dad sneak up and 2 minutes to play the cartoons 2024-06-05 00:49:59 -04:00
EliteMasterEric 5dda95c69b Fix some display issues with the clear percent in the results screen. 2024-06-05 00:40:14 -04:00
Cameron Taylor 50990b15e1 heart glow 2024-06-04 23:36:32 -04:00
Cameron Taylor f2dd626ed9 rollback viz hmm 2024-06-04 22:37:51 -04:00
Cameron Taylor 56c72716fc Merge branch 'bugfix/save-data-recovery' into rewrite/master 2024-06-04 22:08:51 -04:00
Cameron Taylor cb773ed137 Merge branch 'ninjamuffin99/funk-269' into rewrite/master 2024-06-04 22:00:49 -04:00
Cameron Taylor a643765db4 Merge branch 'ninjamuffin99/funk-270' into rewrite/master 2024-06-04 22:00:30 -04:00
EliteMasterEric ae950c7382 Finish save data repair (you should be able to transfer your save now) 2024-06-04 19:44:00 -04:00
Cameron Taylor 6a62f38c33 quicki fix for incorrect clip tweens 2024-06-04 16:51:27 -04:00
Cameron Taylor 84d4d044d6 check clip width when text changes 2024-06-04 16:47:58 -04:00
Cameron Taylor 29a33c8815 modifies behaviour of how the difficulty stars appear 2024-06-04 16:38:21 -04:00
Cameron Taylor d4712a8ef7 alphabetical filtering for freeplay non-all sort 2024-06-04 16:24:24 -04:00
EliteMasterEric c056c72762 Implement advanced save data repair. 2024-06-04 14:26:24 -04:00
Cameron Taylor e12a48b6fc fabs code stuff and difficulty fixin 2024-06-03 18:18:33 -04:00
Cameron Taylor 8c4709c25e Merge branch 'results-scrolling' into anim-rename-fixins 2024-06-03 18:11:45 -04:00
Cameron Taylor 75621435ea lil more polish to fav icon + clipping 2024-06-02 02:53:07 -04:00
Cameron Taylor c64db9966b Merge branch 'rewrite/master' into rank-fixes 2024-06-02 02:19:36 -04:00
Cameron Taylor 08f3b1d95b anim fixes on results 2024-06-02 00:15:10 -04:00
Cameron Taylor 51a44d4810 persistent draw false for results screen (fixes FUNK-256) 2024-06-01 23:36:57 -04:00
Cameron Taylor 7c6c51ea71 results dupe fix 2024-06-01 22:36:47 -04:00
EliteMasterEric 7aee1f900a Fix a Results->Freeplay crash 2024-06-01 20:54:24 -04:00
Cameron Taylor 8248cffbaf small bool cleanings, and maybe fixes 2024-06-01 20:36:14 -04:00
FabsTheFabs 63bd6f2ace sparks nd more fixes.. i think 2024-06-02 00:25:52 +01:00
Cameron Taylor bd7875e86a fix rank icons appearing when they shouldn't be 2024-06-01 17:13:07 -04:00
Cameron Taylor c95ebaa948 Merge branch 'rewrite/master' into nothyper474/cwd-preloader 2024-06-01 16:27:08 -04:00
Cameron Taylor ded413ab77
Merge branch 'rewrite/master' into gamerbross/chart-importer-suffix 2024-06-01 16:26:18 -04:00
Cameron Taylor c2cc73077f
Merge pull request #588 from FunkinCrew/ninjamuffin99/funk-244-preview-songs-on-freeplay-should-last-longer
make songs last longer on freeplay
2024-06-01 16:25:49 -04:00
Cameron Taylor de92a7ba5c Merge branch 'rewrite/master' into bugfix/may-31st-fixes 2024-06-01 16:23:37 -04:00
EliteMasterEric 12acdcd9d9 Fix a Results->Freeplay crash 2024-05-31 21:55:27 -04:00
FabsTheFabs 1cffc36ba8 results timing redo + fixed anims for all ranks 2024-06-01 01:17:11 +01:00
FabsTheFabs e08cdac35b score number shuffling 2024-06-01 01:16:52 +01:00
EliteMasterEric 074b1afc76 Readd a reverted freeplay bugfix 2024-05-31 20:16:23 -04:00
EliteMasterEric acdd6ba403 Merge remote-tracking branch 'secret/rewrite/master' into bugfix/may-31st-fixes 2024-05-31 20:08:31 -04:00
EliteMasterEric 9088570b92 Make sure JSON data uses latest version/generatedBy when writing. 2024-05-31 19:21:21 -04:00
EliteMasterEric 06daa9d402 Increase Great threshold to 80% 2024-05-31 19:20:39 -04:00
EliteMasterEric 8bf26322e9 Update generatedBy to the latest value when saving a chart. 2024-05-31 18:09:30 -04:00
EliteMasterEric 98eda8ef55 Give timeFormat a default value (fixes the Stress issues!) 2024-05-31 18:09:07 -04:00
Cameron Taylor a1e34123f5
Merge pull request #582 from FunkinCrew/title-bg-fix
fix the one random slice of pixels where the bg doesnt show... lol (FUNK-239)
2024-05-31 18:08:05 -04:00
Cameron Taylor 72ca1145ba
Merge pull request #584 from FunkinCrew/hard-erect-lag-fix
removes trace() that lags freeplay
2024-05-31 18:07:48 -04:00
Cameron Taylor 00566848e9
Merge pull request #586 from FunkinCrew/bugfix/mod-songs-freeplay-preview
Disable song previews for mod songs rather than crashing the game
2024-05-31 18:07:32 -04:00
Cameron Taylor d89a898e6c make songs last longer on freeplay 2024-05-31 17:16:26 -04:00
FabsTheFabs 28444fd478 rank tweaks, favourite changes + rank anim fixes 2024-05-31 10:39:53 +01:00
FabsTheFabs 1e65cacb0e fix funkinsound compile error 2024-05-31 10:39:06 +01:00
EliteMasterEric 2a8cdfaffa Fix an extra crash. 2024-05-31 02:30:42 -04:00
EliteMasterEric 9e0a993746 Disable song previews for mod songs rather than crashing the game 2024-05-31 02:03:40 -04:00
EliteMasterEric 0d4f3cdc33 Scrolling results text 2024-05-31 01:42:41 -04:00
Eric 3b74a14a0d
Merge pull request #2610 from PurSnake/fixing
[BUGFIX] Correct characters scaling on stage
2024-05-30 23:54:38 -04:00
EliteMasterEric 573e1575a7 Merge branch 'rewrite/master' into pursnake/character-scale 2024-05-30 23:40:00 -04:00
Cameron Taylor 7347b66ce4 removes trace() that lags freeplay 2024-05-30 23:07:41 -04:00
Cameron Taylor 7a2f3c81a1 fix the one random slice of pixels where the bg doesnt show... lol 2024-05-30 21:11:17 -04:00
Cameron Taylor c322e2aeef Merge branch 'rewrite/master' into feature/results-freeplay-transition 2024-05-30 21:05:32 -04:00
Cameron Taylor 5f70e1be0b Merge branch 'develop-0.4.0' into rewrite/master 2024-05-30 20:54:27 -04:00
Cameron Taylor d015e73066 Merge branch 'bugfix/multifix' into develop-0.4.0 2024-05-30 20:53:18 -04:00
Eric 2380058820
Merge pull request #2328 from nebulazorua/new-judge-applying
New judge application logic
2024-05-30 16:10:17 -04:00
EliteMasterEric b7a828e7d8 Make Freeplay use correct ranks, play the slam animation after Results, new Results music 2024-05-30 05:25:51 -04:00
EliteMasterEric ee70e85dec Merge branch 'rewrite/master' into feature/freeplay-shit+santa-cutscene 2024-05-29 23:56:51 -04:00
FabsTheFabs e7079452fb freeplay visual changes + base rank visuals 2024-05-30 04:34:00 +01:00
FabsTheFabs 68e9937b43 interval shake class 2024-05-30 04:33:26 +01:00
Eric 6cc9c3d968
Merge pull request #2409 from Burgerballs/scroll-speed-fix
[FEATURE] Scroll Speed Event
2024-05-29 23:22:03 -04:00
EliteMasterEric 6572d13a7f Improve documentation a bit. 2024-05-29 23:21:32 -04:00
Eric 0388f887b5
Merge pull request #2565 from gamerbross/bugfix/charting-sustain-trails
[BUGFIX] Charting Editor Sustain Trails (2 bugs)
2024-05-29 22:54:49 -04:00
EliteMasterEric 174c595837 Fix crash caused by improperly canceling a tween 2024-05-29 22:49:57 -04:00
EliteMasterEric 8d7591a796 Fix an issue where Story Menu props wouldn't render. 2024-05-29 21:43:54 -04:00
Cameron Taylor 75b4baefca Merge branch 'gamerbross/chart-editor-sustains' into develop-0.4.0 2024-05-29 16:54:19 -04:00
Cameron Taylor 4dca6671c4 Merge branch 'gamerbross/freeplay-crash' into develop-0.4.0 2024-05-29 16:53:26 -04:00
Cameron Taylor a2fd14c031 Merge branch 'richtrash21/main-menu-camera' into develop-0.4.0 2024-05-29 16:51:24 -04:00
Cameron Taylor 3ba778606b Merge branch 'sector-a/story-menu-score' into develop-0.4.0 2024-05-29 16:50:05 -04:00
Cameron Taylor 5adeada357 Merge branch 'gamerbross/scripted-stage-tostring' into develop-0.4.0 2024-05-29 16:49:12 -04:00
Cameron Taylor e449dfa0ef Merge branch 'bugfix/titlestate-startintro-crash' into develop-0.4.0 2024-05-29 16:48:10 -04:00
Cameron Taylor 4f34079b98 Merge branch 'audio-stream' into develop-0.4.0 2024-05-29 16:45:35 -04:00
Your Name ee4be81062 Now Preloader resets CWD 2024-05-29 15:16:31 -03:00
Eric 934d6c2518
Merge pull request #2539 from gamerbross/bugfix/titlestate-startintro-crash
[BUGFIX] Fix TitleState bugs + crash
2024-05-29 01:50:46 -04:00
Eric d02ecd17e8
Merge pull request #2576 from richTrash21/develop-mainmenu-fix
[BUGFIX] Main Menu Camera Fix
2024-05-29 01:17:34 -04:00
Eric 972f649d82
Merge pull request #2604 from gamerbross/bugfix/legacy-chart-importer-instrumental
[BUGFIX] Chart Importer Wrong Instrumental
2024-05-29 01:10:40 -04:00
Eric 60d90c6698
Merge pull request #2585 from sector-a/main
Make texts update on difficulty change in Story Menu
2024-05-29 00:54:32 -04:00
EliteMasterEric d97d77566e Make song score lerp faster 2024-05-29 00:53:32 -04:00
Eric eeaae74b46
Merge pull request #2603 from gamerbross/bugfix/unscripted-stage-trace
[BUGFIX] Unscripted Stage Log Trace (missing toString for Stage)
2024-05-29 00:27:36 -04:00
Cameron Taylor 9aa2411b50 Merge branch 'rewrite/master' into audio-stream 2024-05-28 23:59:36 -04:00
Cameron Taylor 2d300039ae promises + error out partial sounds that attempt to load multiple times 2024-05-28 23:53:50 -04:00
Eric fd9cfc2cb1
Merge pull request #2457 from gamerbross/bugfix/freeplay-no-song-data-crash
[BUGFIX] Freeplay Crash when song is invalid
2024-05-28 23:47:46 -04:00
Eric 5e1f61665a
Merge pull request #2553 from lemz1/loadingbar-fix
[BUGFIX] Fix Web Loading Bar (Again)
2024-05-28 23:37:16 -04:00
Eric db7b97d513
Merge pull request #562 from FunkinCrew/loadingbar-fix
[PUBLIC PR] Loading Bar Fix
2024-05-28 23:37:10 -04:00
EliteMasterEric 58415d49c9 Merge remote-tracking branch 'secret/bugfix/html5-save-data' into loadingbar-fix 2024-05-28 22:52:19 -04:00
Eric 34ca8dcd24
Merge pull request #2488 from MaybeMaru/downscroll
Fix hold notes on downscroll
2024-05-28 22:02:46 -04:00
EliteMasterEric f0cd6c50c8 Merge remote-tracking branch 'secret/rewrite/master' into downscroll 2024-05-28 21:57:29 -04:00
gamerbross cf61b9ef90 Add toString to Stage + Revert "Fix Unscripted Stage Log Trace" 2024-05-28 14:51:16 +02:00
Cameron Taylor f89e33d551 Merge branch 'rewrite/master' into Ethan-makes-music/main 2024-05-28 02:41:16 -04:00
Cameron Taylor 9ccee66b47 Merge branch 'rewrite/master' into downscroll 2024-05-28 02:24:40 -04:00
Cameron Taylor 8b73d4ef22 Merge branch 'rewrite/master' into bugfix/titlestate-startintro-crash 2024-05-28 02:20:45 -04:00
Cameron Taylor e04a181d2c Merge branch 'rewrite/master' into loadingbar-fix 2024-05-28 02:13:37 -04:00
EliteMasterEric 9a47666fc7 Fix a merge issue. 2024-05-28 01:37:30 -04:00
EliteMasterEric 3b5e85d050 Merge remote-tracking branch 'secret/rewrite/master' into bugfix/html5-save-data 2024-05-28 01:35:43 -04:00
Axuko 004ed32fad Remove alot of unused imoprts 2024-05-27 22:34:28 -07:00
EliteMasterEric 3f9d8ccda9 Merge branch 'rewrite/master' into bugfix/html5-save-data 2024-05-28 01:34:16 -04:00
Cameron Taylor 827ad61602 Merge branch 'rewrite/master' into feature/results-clear-rank 2024-05-28 00:56:18 -04:00
PurSnake cb2f4b0f06
[BUGFIX] Correct characters scaling
bruh
2024-05-25 21:00:10 +03:00
gamerbross 4acfbfb76d Fix Legacy Chart Importer wrong instrumental 2024-05-25 01:21:37 +02:00
gamerbross 07959d3e88 Fix Unscripted Stage Log Trace 2024-05-25 01:08:17 +02:00
EliteMasterEric dd3e241f0c Fix some merge conflicts 2024-05-24 16:44:12 -04:00
Cameron Taylor 85bfd00bad desktop vis testing 2024-05-24 16:38:35 -04:00
EliteMasterEric e44266f5c0 Merge remote-tracking branch 'secret/feature/results-clear-rank' into develop-0.4.0 2024-05-24 13:29:35 -04:00
Burgerballs eb2b143a1c
Merge branch 'develop' into scroll-speed-fix 2024-05-24 17:23:45 +01:00
Eric b167e485a1
Merge pull request #2593 from gamerbross/feature/legacy-healthicon-winning
[FEATURE] Add Winning support to Legacy Health Icons
2024-05-24 01:51:10 -04:00
EliteMasterEric 44880fa569 Implement placeholder GREAT animation 2024-05-24 00:06:26 -04:00
Burgerballs b40bb98bb4
Merge branch 'develop' into scroll-speed-fix 2024-05-23 22:44:25 +01:00
Cameron Taylor b8ed779660 Merge branch 'rewrite/master' into feature/save-favorites 2024-05-23 17:14:07 -04:00
Cameron Taylor c02d75b94a Merge branch 'public-release/develop' into rewrite/master 2024-05-23 16:38:34 -04:00
Cameron Taylor a2ee359e46 fix for songs overlapping each other on desktop 2024-05-23 16:31:18 -04:00
richTrash21 4ca30a571d safety 2024-05-23 21:52:28 +04:00
richTrash21 1c352e4e11 simplify freeplay camera 2024-05-23 21:50:11 +04:00
gamerbross 5e130eeffc Add Winning support to Legacy Health Icons 2024-05-23 18:18:37 +02:00
EliteMasterEric 0514e05328 Merge branch 'bugfix/html5-save-data' into develop-0.4.0 2024-05-22 15:15:56 -04:00
EliteMasterEric 55d66b858b Merge branch 'feature/save-favorites' into develop-0.4.0 2024-05-22 15:15:47 -04:00
EliteMasterEric 30fd86befb Merge branch 'feature/charter-in-pause-menu' into develop-0.4.0 2024-05-22 12:01:27 -04:00
EliteMasterEric 42ab0b74e3 Merge branch 'feature/results-clear-rank' into develop 2024-05-22 11:40:00 -04:00
sector-a d84e832c6c
Make texts update on difficulty change in Story Menu 2024-05-22 12:57:57 +03:00
EliteMasterEric f17f639304 Finish implementing smaller numbers. 2024-05-22 01:07:20 -04:00
Keoiki 4e47bfe68b Fix Note Styles in PlayState & Chart Editor 2024-05-21 23:52:40 +03:00
EliteMasterEric 6d3b58cecd Fix some additional compiling issues. 2024-05-21 04:02:53 -04:00
EliteMasterEric fed6d1146c Do some cleanup (replace several utility functions with a utility library we already depend on!) 2024-05-21 04:02:32 -04:00
EliteMasterEric 6cb5816378 Add freeplay favorites to the save data so they persist between sessions. 2024-05-21 02:49:07 -04:00
EliteMasterEric f3868c2ee8 An attempt at an HTML5 save data fix 2024-05-21 02:23:21 -04:00
richTrash21 1050176b27 main menu camera fix 2024-05-20 23:52:48 +04:00
etvx86 9968c8eabc
Fix some trace typos 2024-05-20 10:42:17 -04:00
gamerbross 9a18e3fde6 Fix Charting Dragging Sustain Trails 2024-05-20 01:38:52 +02:00
gamerbross dcfc51cdcd Fix Charting Sustain Trails Inverted 2024-05-20 01:37:35 +02:00
EliteMasterEric 13595fca70 Changelog entry for chart metadata 2024-05-19 01:49:06 -04:00