Commit graph

204 commits

Author SHA1 Message Date
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
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
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
6334d16984 Merge branch 'ninjamuffin99/funk-250' into rewrite/master 2024-06-05 17:11:22 -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
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
Cameron Taylor
50990b15e1 heart glow 2024-06-04 23:36:32 -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
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
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
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
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
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
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
EliteMasterEric
2a8cdfaffa Fix an extra crash. 2024-05-31 02:30:42 -04:00
Cameron Taylor
7347b66ce4 removes trace() that lags freeplay 2024-05-30 23:07:41 -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
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
Cameron Taylor
4dca6671c4 Merge branch 'gamerbross/freeplay-crash' into develop-0.4.0 2024-05-29 16:53:26 -04:00
Cameron Taylor
9aa2411b50 Merge branch 'rewrite/master' into audio-stream 2024-05-28 23:59:36 -04:00
Cameron Taylor
827ad61602 Merge branch 'rewrite/master' into feature/results-clear-rank 2024-05-28 00:56:18 -04: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
richTrash21
4ca30a571d safety 2024-05-23 21:52:28 +04:00
richTrash21
1c352e4e11 simplify freeplay camera 2024-05-23 21:50:11 +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
b6b93bb0c6 Added clear percent, rank name, and background text. 2024-05-17 20:26:34 -04:00
rich
7a19bd4b50
Merge branch 'FunkinCrew:main' into debelop-freeplay-patch 2024-05-15 16:31:57 +04:00
Cameron Taylor
2434f64381 web fix for scroll 2024-05-14 21:21:47 -04:00
Cameron Taylor
1619751eab Merge branch 'public-release/develop' into freeplayscrollwheel-bugfix 2024-05-14 21:13:48 -04:00
Cameron Taylor
0428482d04 Merge branch 'bugfix/freeplay-exiting-active' into public-release/develop 2024-05-13 21:30:02 -04:00
rich
59e409f8e6
ensure that only freeplay camera gets destroyed 2024-05-14 04:30:36 +04:00
rich
3810662f9f
freeplay optimization 2024-05-14 04:20:23 +04:00
gamerbross
090e4fc6e8 Fixed doing actions when exiting Freeplay menu 2024-05-12 02:42:02 +02:00
JugieNoob
b22f09d4da Fixed Scrolling on HTML5 Platforms 2024-05-12 02:21:59 +02:00
JugieNoob
4f8a0dbebf Fixed Freeplay Scrolling Issue 2024-05-12 01:35:04 +02:00
gamerbross
c0485fd1a2
Fix Freeplay Crash when song is invalid 2024-05-11 20:11:51 +02:00
EliteMasterEric
6c2d18c72c Resurrected difficulty stars, fixed flame animation, fixed Random showing an album. 2024-05-11 01:05:51 -04:00
Cameron Taylor
f2a06ad37b fading in and erect track loading 2024-05-09 01:56:52 -04:00
Cameron Taylor
1b6febf01c initial freeplay songs loading 2024-05-09 01:15:01 -04:00
EliteMasterEric
2e74678caf Fix an issue where the Freeplay menu never displays 100% clear. 2024-05-08 01:54:48 -04:00
Cameron Taylor
7efc633f45 Merge branch 'actual-merch-fix' into develop-0.3.2 2024-05-03 01:12:23 -04:00
Cameron Taylor
ae9a132ccd remove typing bit 2024-05-03 01:12:18 -04:00
Cameron Taylor
6620b2e83c actual merch fix stuff 2024-05-02 23:02:47 -04:00
EliteMasterEric
a2aa1bd84a Remove unused "typing" element. 2024-05-02 21:23:55 -04:00
EliteMasterEric
1e5f90774c What if modded songs showed up in game with no extra work? 😳 2024-05-01 21:51:33 -04:00
Cameron Taylor
192f1113b4 merch link freeplay fix 2024-05-01 15:22:20 -04:00
EliteMasterEric
11c0249f42 Fix an issue with Freeplay sorting when leaving an Erect song. 2024-04-30 14:36:57 -04:00
EliteMasterEric
e7a09fcee2 Fix an issue where returning to Freeplay from gameplay would let you interact with the menu underneath 2024-04-30 13:58:39 -04:00
Cameron Taylor
61012fab68 dad art tween and shader on ost text 2024-04-30 03:22:30 -04:00
Cameron Taylor
84668432ba better tween in for bg dad art 2024-04-30 01:38:00 -04:00
Cameron Taylor
b12d86c959 completion number and box fadeout 2024-04-30 01:33:29 -04:00
Cameron Taylor
81f8338c99 sets the selected track as first one in group when swapping sorts on freeplay 2024-04-29 03:49:28 -04:00
EliteMasterEric
01b80ab5c8 Merge remote-tracking branch 'origin/input-offsets' into rewrite/master 2024-04-28 19:07:44 -04:00
EliteMasterEric
f474bc32a5 Merge remote-tracking branch 'origin/rewrite/master' into input-offsets 2024-04-24 21:54:45 -04:00
Cameron Taylor
1197f9646e fix main menu -> freeplay camera positioning 2024-04-24 19:45:17 -04:00
Cameron Taylor
def8fc6977 Merge pull request #494 from FunkinCrew/freeplay-sorting-fixes
fix letter sort regex, and tiny LetterSort.hx cleanin
2024-04-23 04:52:40 -04:00
Cameron Taylor
5d8c28ca2b Merge branch 'rewrite/master' into bugfix/blazin-death-confirm 2024-04-19 14:05:52 -04:00
Cameron Taylor
035db7f00a Merge branch 'rewrite/master' into bugfix/draw-crash 2024-04-19 14:03:58 -04:00
Cameron Taylor
1adef48995 some cleanins with letter sorts 2024-04-18 11:32:11 -04:00
Cameron Taylor
c3e777154e fix letter sort regex, and tiny LetterSort.hx cleanin 2024-04-18 11:32:11 -04:00
EliteMasterEric
bc0a27c985 Fix references to missing graphics in Freeplay 2024-04-16 18:43:11 -04:00
Eric
b553dbd517 Remove janky animation on Freeplay menu. (#488) 2024-04-16 13:24:41 -04:00
EliteMasterEric
6f5c3a043f Fix crash caused when game tries to render disposed sprites during a Sticker transition. 2024-04-10 14:45:07 -04:00
Cameron Taylor
3b87ecf6f5 Merge branch 'html5/asset-optimization' of github.com:FunkinCrew/Funkin-secret into html5/asset-optimization 2024-04-05 19:59:25 -04:00
Cameron Taylor
da4f1fb424 remove difficulty stars 2024-04-05 19:47:33 -04:00
EliteMasterEric
a6d44b1f15 Removed many unused assets to optimize bandwidth usage. 2024-04-05 19:43:52 -04:00
EliteMasterEric
a764112bd4 Removed many unused assets to optimize bandwidth usage. 2024-04-05 01:24:03 -04:00
EliteMasterEric
72a3742890 Fixes and improvements to LatencyState 2024-04-04 19:46:08 -04:00
EliteMasterEric
07092269b8 Merge branch 'rewrite/master' into input-offsets 2024-04-04 18:45:16 -04:00
EliteMasterEric
823baa3326 Add new album roll animation (again) 2024-04-04 16:30:04 -04:00
Cameron Taylor
8f3406cb0e Merge branch 'rewrite/master' into feature/results-screen-score 2024-04-04 05:34:29 -04:00
Cameron Taylor
544dcdf809 Merge branch 'rewrite/master' into bugfix/chart-editor-weekend-1 2024-04-04 05:32:26 -04:00
EliteMasterEric
57d6ed118d Hide Rating on the right side of the items in Freeplay 2024-04-04 03:31:03 -04:00
EliteMasterEric
f129cb7997 Fix a bug where if Weekend 1 wasn't cleared, you can't chart those songs 2024-04-03 21:57:29 -04:00
EliteMasterEric
e9d8546737 More results screen changes 2024-04-03 04:52:12 -04:00
EliteMasterEric
f7141e7096 Fixed an issue with save data not loading defaults properly. 2024-04-03 01:41:52 -04:00
EliteMasterEric
2b4bf42ac4 Fix multiple music, and crashes in freeplay 2024-04-03 01:41:47 -04:00
Cameron Taylor
dcffe0537f Merge branch 'rewrite/master' into bugfix/buncha-2hot-fixes 2024-04-01 22:40:10 -04:00
Cameron Taylor
03cbba4a4e Merge branch 'rewrite/master' into feature/freeplay-ost-text 2024-04-01 22:21:29 -04:00