Parker2991/Funkin
1
0
Fork 0
mirror of https://github.com/FunkinCrew/Funkin.git synced 2024-11-27 10:05:41 -05:00
Code Issues Projects Releases Packages Wiki Activity
2200 commits 30 branches 20 tags 3 GiB
Commit graph

2200 commits

This branch
This branch
All branches
Author SHA1 Message Date
EliteMasterEric
f3fa9a58d3 Merge remote-tracking branch 'origin/rewrite/master' into feature/chart-editor-offsets-part-2 2023-12-08 01:16:16 -05:00
EliteMasterEric
7f0caeb026 Work in progress on offsets in Chart Editor state. 2023-12-08 01:15:22 -05:00
Cameron Taylor
8d8b8743ae Merge pull request #238 from FunkinCrew/feature/chart-editor-offsets-part-1 
Implement instrumental and vocal offsets into the PlayState.
 2023-12-07 19:30:54 -05:00
Cameron Taylor
3652550b1a Merge branch 'rewrite/master' of github.com:FunkinCrew/Funkin-secret into feature/chart-editor-offsets-part-1 2023-12-07 18:14:10 -05:00
Cameron Taylor
e753d63d1d assets merge 2023-12-07 18:12:31 -05:00
Cameron Taylor
90cf1edad1 Merge pull request #237 from FunkinCrew/feature/chart-editor-metronome-slider 
Metronome slider and scroll anchor
 2023-12-07 18:10:02 -05:00
Cameron Taylor
d3245b7ec7 assets update 2023-12-07 18:01:21 -05:00
EliteMasterEric
e23c1464f6 Merge remote-tracking branch 'origin/rewrite/master' into feature/chart-editor-offsets-part-1 2023-12-07 16:32:12 -05:00
Cameron Taylor
cd0bd7ff55 assets 2023-12-07 14:41:53 -05:00
Cameron Taylor
378cbbf32e Merge pull request #235 from FunkinCrew/bugfix/chart-editor-notif-in-bg 
Multiple chart editor fixes
 2023-12-07 14:30:00 -05:00
Cameron Taylor
554c7bb31d null + macro things? 2023-12-07 14:29:45 -05:00
EliteMasterEric
66611c5d2f Fixes to FlxSound when pausing before starting 2023-12-06 22:03:36 -05:00
EliteMasterEric
1abd587645 Rework offsets to be built into the FlxSound 2023-12-06 15:04:24 -05:00
EliteMasterEric
1716ffc57f Implement instrumental and vocal offsets into the PlayState. 2023-12-05 02:44:57 -05:00
Cameron Taylor
a750cc1620 vis wips wips wips 2023-12-01 19:58:58 -05:00
EliteMasterEric
a0ae30a7c1 Metronome slider and scroll anchor 2023-12-01 17:14:48 -05:00
EliteMasterEric
8ef380e0b2 Resolve merge issues 2023-11-29 16:53:08 -05:00
EliteMasterEric
eebb2e874f Merge branch 'rewrite/master' into bugfix/chart-editor-notif-in-bg 2023-11-29 16:42:40 -05:00
Cameron Taylor
df427c8ecb player vis in progress 2023-11-29 06:17:01 -05:00
Cameron Taylor
eea614b4f5 samples stability 2023-11-29 05:49:59 -05:00
Cameron Taylor
73810a5059 Merge branch 'rewrite/master' of https://github.com/funkincrew/funkin-secret into feature/chart-waveform 2023-11-29 04:44:37 -05:00
Cameron Taylor
0899c60e8d Merge pull request #234 from FunkinCrew/polish/welcome-screen 
more info on playbar
 2023-11-29 04:25:11 -05:00
Cameron Taylor
f691de6452 Merge pull request #236 from FunkinCrew/bugfix/platform-fixes 
HTML5 and MacOS platform fixes
 2023-11-29 01:48:14 -05:00
Cameron Taylor
87b1cabbac Merge branch 'rewrite/master' into bugfix/platform-fixes 2023-11-29 01:46:10 -05:00
Cameron Taylor
ca9f42fedf waveform in progres 2023-11-29 01:43:59 -05:00
EliteMasterEric
99ed8b94d7 Target the current time change rather than the first one. 2023-11-28 21:44:09 -05:00
EliteMasterEric
90fc00f9bb Additional web fixes, Github CI should be happy now. 2023-11-28 21:19:07 -05:00
EliteMasterEric
9a2f235bed Platform-specific fixes for HTML5 and MacOS 2023-11-28 20:52:45 -05:00
EliteMasterEric
ed10d2c5d0 Multiple chart editor bug fixes +tweaks 2023-11-28 20:36:59 -05:00
Cameron Taylor
21b79c0b83 bpm in playbar 2023-11-28 04:30:29 -05:00
Cameron Taylor
d9d5744f1e difficulty playbar 2023-11-28 04:05:17 -05:00
Cameron Taylor
aee8df4fcb default note snapps 2023-11-27 23:29:48 -05:00
Cameron Taylor
e44559d056 last modified 2023-11-27 20:37:10 -05:00
Eric
0704e9530b Merge pull request #232 from FunkinCrew/polish/charting-music-bg 
charting song polish + recents menu fix
 2023-11-27 19:35:11 -05:00
Cameron Taylor
6421b5d57d Merge branch 'rewrite/master' into polish/charting-music-bg 2023-11-27 17:50:27 -05:00
Cameron Taylor
1054662faa Merge pull request #233 from FunkinCrew/rewrite/ci-verify-submodule-commits 
fix(ci): submodules shallow cloning might run into issues when updating them
 2023-11-27 15:22:48 -05:00
Hazel
8c5c706013 update submod 2023-11-27 18:20:03 +00:00
Hazel
3cff8873ce possibly fix submodule issues 2023-11-27 18:07:25 +00:00
Hazel
e28c498dd8 huh 2023-11-27 18:06:29 +00:00
Cameron Taylor
41384ddf0d playtesting fix 2023-11-25 03:50:22 -05:00
Cameron Taylor
f3a38e0232 fixing the stop 2023-11-25 02:48:43 -05:00
Eric
d03543c197 Merge pull request #227 from FunkinCrew/rewrite/ci-verify-submodule-commits 
ci: verify whether submodules are functional before attempting build
 2023-11-25 02:40:48 -05:00
Cameron Taylor
99e3bc81ec Merge branch 'rewrite/master' into rewrite/ci-verify-submodule-commits 2023-11-25 02:37:51 -05:00
Cameron Taylor
64a4512980 charting song polish + recents menu fix 2023-11-25 02:18:39 -05:00
Cameron Taylor
418751d7a4 Merge pull request #231 from FunkinCrew/bugfix/chart-editor-macro-rework 
Chart Editor: Macro Rework + QA Bug Fixes
 2023-11-25 01:01:18 -05:00
Cameron Taylor
7f42c7930a assets update real lol! 2023-11-25 00:55:26 -05:00
Cameron Taylor
56fe099382 assets merging 2023-11-25 00:51:34 -05:00
EliteMasterEric
290c568cb5 Disable notification actions while playtest is open. 2023-11-24 16:11:53 -05:00
EliteMasterEric
a2cee82779 Fixing up a rough Git merge 2023-11-24 00:58:12 -05:00
EliteMasterEric
4e1945b373 Merge remote-tracking branch 'origin/rewrite/master' into bugfix/chart-editor-macro-rework 2023-11-24 00:49:51 -05:00