Commit graph

2537 commits

Author SHA1 Message Date
EliteMasterEric
4382b3e16e Merge branch 'develop' into richtrash21/freeplay-camera-optimization 2024-06-07 21:13:13 -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
EliteMasterEric
d39f3dc1e8 Merge branch 'main' into develop 2024-06-07 19:54:30 -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
FabsTheFabs
642f272bce freeplay polish + new text 2024-06-06 01:49:33 +01: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