cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-11-05 06:14:36 +00:00
Code Issues Releases Wiki Activity
2071 commits 3 branches 3 tags 3 GiB
Commit graph

2071 commits

This branch
This branch
All branches
Author SHA1 Message Date
Cameron Taylor b09ed369e8 f 2023-12-13 09:20:15 -05:00
Cameron Taylor 6ca0e32391 Merge branch 'rewrite/master' of github.com:FunkinCrew/Funkin-secret into icon-charswitcher 2023-12-13 09:20:11 -05:00
Cameron Taylor b39e952408 Merge pull request #243 from FunkinCrew/mac-delete 
Mac chart editor delete key fix
 2023-12-13 03:47:53 -05:00
Eric 34673c3f6c Merge branch 'rewrite/master' into mac-delete 2023-12-12 19:44:04 -05:00
Eric f36cb84797 Merge pull request #242 from FunkinCrew/copy-flash 
chart editor: copy notes polish
 2023-12-12 19:29:17 -05:00
Eric a6e7fc6d2c Merge pull request #241 from FunkinCrew/copy-preview 
note highlight preview
 2023-12-12 19:29:06 -05:00
Eric 591de9bf6d Merge branch 'rewrite/master' into icon-charswitcher 2023-12-12 14:29:06 -05:00
EliteMasterEric 52f16ce457 Redo icon dialog and add support to metadata dialog. 2023-12-12 05:24:43 -05:00
Cameron Taylor 8f85e09de8 Merge pull request #245 from FunkinCrew/bugfix/quick-mac-fixes 
Some quick fixes to get Mac to build.
 2023-12-11 11:31:50 -05:00
Cameron Taylor b33f27f097 tiny lil polish and cleanin 2023-12-11 04:35:39 -05:00
Cameron Taylor 05f977f85f character selector 2023-12-11 03:38:44 -05:00
Cameron Taylor 9ffffe9c8a player char select 2023-12-11 02:40:58 -05:00
Cameron Taylor 181e3f85b8 switching opp 2023-12-11 02:26:37 -05:00
Cameron Taylor ac3f27edd4 icon char select in progres 2023-12-11 00:19:33 -05:00
EliteMasterEric e24c5877a9 Some quick fixes to get Mac to build. 2023-12-10 23:33:08 -05:00
Cameron Taylor 7876b07c37 mac delete key fix 2023-12-09 18:00:32 -05:00
Cameron Taylor 87c866f662 copy notifier polish 2023-12-08 22:55:14 -05:00
Cameron Taylor 6f141e5f52 copy text popup 2023-12-08 22:28:34 -05:00
Cameron Taylor 796e1fcbab note highlight preview 2023-12-08 20:21:55 -05:00
Cameron Taylor cf41eb661d Merge pull request #239 from FunkinCrew/feature/chart-editor-offsets-part-2 
Feature/chart editor offsets part 2
 2023-12-08 19:21:17 -05:00
EliteMasterEric 87c3d7d330 Update assets module. 2023-12-08 16:14:30 -05:00
EliteMasterEric 6060282f20 Merge remote-tracking branch 'origin/rewrite/master' into feature/chart-editor-offsets-part-2 2023-12-08 16:12:56 -05:00
EliteMasterEric 64cba7ca2d Okay offsets should be actually done now. 2023-12-08 16:12:36 -05:00
EliteMasterEric 7c6baea7d2 Rework to fix variant issues 2023-12-08 14:01:12 -05:00
Cameron Taylor 2858cbf56b mac file filter fix 2023-12-08 02:14:26 -05:00
Cameron Taylor 8f30532ed4 offsets null fix quick 2023-12-08 01:57:46 -05:00
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
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 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
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