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

2199 commits

This branch
This branch
All branches
Author SHA1 Message Date
Cameron Taylor
75dfed8229 -release fix 2024-01-12 19:50:13 -05:00
Cameron Taylor
9b400bf7a1 Merge pull request #278 from FunkinCrew/feature/toggle-charting-theme 
Add theme music toggle and extend fade in to 30 seconds
 2024-01-12 18:54:01 -05:00
EliteMasterEric
9fe0c68256 Add theme music toggle and extend fade in 2024-01-12 18:29:02 -05:00
Cameron Taylor
761940b5c0 Merge pull request #276 from FunkinCrew/bugfix/chart-editor-positioning-fixes 
Some positioning fixes
 2024-01-12 08:19:50 -05:00
Cameron Taylor
99b7a8a75d Merge branch 'rewrite/master' into bugfix/chart-editor-positioning-fixes 2024-01-12 08:19:26 -05:00
Cameron Taylor
772c1b2626 Merge pull request #275 from FunkinCrew/feature/chart-editor-drag-edit-holds 
Click and drag on a sustain to edit it.
 2024-01-12 08:15:34 -05:00
Cameron Taylor
e87c895131 Merge branch 'rewrite/master' into feature/chart-editor-drag-edit-holds 2024-01-12 08:13:30 -05:00
Cameron Taylor
a419cd2331 Merge pull request #277 from FunkinCrew/offsets-null-fix 
null fixy
 2024-01-12 08:08:01 -05:00
Cameron Taylor
7f83daf23b null fixy 2024-01-12 08:04:28 -05:00
Cameron Taylor
304cee188a Merge pull request #273 from FunkinCrew/bugfix/controller-overflow 
Gamepad Overflow fix for release builds
 2024-01-12 07:48:55 -05:00
Eric
2a7f9a0880 Merge branch 'rewrite/master' into bugfix/controller-overflow 2024-01-12 07:48:03 -05:00
EliteMasterEric
25c10d205d Some positioning fixes 2024-01-12 06:35:41 -05:00
Cameron Taylor
df80513190 Merge pull request #274 from FunkinCrew/bugfix/freeplay-icon-offsets 
Freeplay Visual Tweaks
 2024-01-12 06:18:19 -05:00
Cameron Taylor
fad569519d Merge branch 'rewrite/master' into bugfix/freeplay-icon-offsets 2024-01-12 06:15:15 -05:00
Cameron Taylor
fdd9bdd82c Merge branch 'rewrite/master' into bugfix/freeplay-icon-offsets 2024-01-12 06:14:58 -05:00
Cameron Taylor
1d1bab3b14 assets merging 2024-01-12 06:14:22 -05:00
EliteMasterEric
025fd326bd Click and drag on a sustain to edit it. 2024-01-12 06:13:34 -05:00
Cameron Taylor
820cf0fac2 Merge pull request #267 from FunkinCrew/feature/chart-editor-selection-tweak 
Redo logic around note selection, add new buttons for selecting individual sides.
 2024-01-12 04:44:46 -05:00
Cameron Taylor
2539b90ab8 Merge branch 'rewrite/master' into feature/chart-editor-selection-tweak 2024-01-12 04:43:17 -05:00
Cameron Taylor
d19924ae41 assets submod update 2024-01-12 04:18:04 -05:00
EliteMasterEric
c05131e6a9 Additional freeplay cleanup 2024-01-11 00:52:42 -05:00
EliteMasterEric
315aeea998 Update assets submodule 2024-01-11 00:31:18 -05:00
EliteMasterEric
462eece09a Use proper difficulty rating data, proper clear percentage 2024-01-11 00:30:00 -05:00
EliteMasterEric
fc12f956f6 Fix alignment of character pixel icons in freeplay menu 2024-01-10 20:58:29 -05:00
EliteMasterEric
06964ce1e3 Fix HTML5 build issue 2024-01-10 20:58:06 -05:00
EliteMasterEric
eea9ac1883 Update to include linux fix (???) 2024-01-10 20:27:40 -05:00
EliteMasterEric
9947425a9e Merge remote-tracking branch 'origin/rewrite/master' into bugfix/controller-overflow 2024-01-10 00:23:36 -05:00
EliteMasterEric
043fb553f6 Fix an issue causing an overflow error when using gamepad (WINDOWS ONLY) 2024-01-10 00:20:00 -05:00
EliteMasterEric
59999aa8fd Fix an issue with release builds 2024-01-10 00:16:51 -05:00
Eric
90dd067aa0 Merge pull request #272 from FunkinCrew/ninjamuffin99-patch-1 
Update Project.xml
 2024-01-09 20:47:20 -05:00
Cameron Taylor
27d5a6d5a5 Update Project.xml 2024-01-09 19:31:39 -05:00
Cameron Taylor
49984fb359 Merge pull request #271 from FunkinCrew/feature/crash-log-haxelibs 
Implement haxelib versions into crash logs
 2024-01-09 16:17:46 -05:00
EliteMasterEric
14df32d908 Implement haxelib versions into crash logs 2024-01-09 14:48:20 -05:00
Cameron Taylor
e507cbd327 Merge pull request #269 from FunkinCrew/feature/chart-editor-measure-numbers 
Measure numbers next to ticks and support for initial time signature.
 2024-01-05 20:41:07 -05:00
Cameron Taylor
ac902c19c5 beats per measure conductor instance fix 2024-01-05 20:38:46 -05:00
Cameron Taylor
ff88c53f7c steps per measure instance conductor fix 2024-01-05 20:38:20 -05:00
Cameron Taylor
350ce19783 conductor instnace small fix lol! 2024-01-05 20:37:13 -05:00
Cameron Taylor
8f7c449194 Merge branch 'rewrite/master' into feature/chart-editor-measure-numbers 2024-01-05 20:35:15 -05:00
Cameron Taylor
dcc79d56a3 assets submod update 2024-01-05 20:33:15 -05:00
Cameron Taylor
b6b0f9fa46 Merge pull request #266 from FunkinCrew/feature/chart-editor-context-menus 
Chart Editor: Context menus and song event editing.
 2024-01-05 20:31:13 -05:00
Cameron Taylor
cc7577a333 fix conductor instance stuf on watchPlugin 2024-01-05 20:25:54 -05:00
Cameron Taylor
97ea4b0891 re-add debug_refreshModules? 2024-01-05 20:23:15 -05:00
Cameron Taylor
da4e77bf44 Merge branch 'rewrite/master' into feature/chart-editor-context-menus 2024-01-05 20:11:38 -05:00
Cameron Taylor
e25f3bc073 assets/art submomd 2024-01-05 20:07:41 -05:00
Cameron Taylor
595f5a68c2 Merge pull request #250 from FunkinCrew/bugfix/chart-editor-modifies-freeplay 
Fix a bug where modifying a copied template song's BPM in the chart editor would modify BPM in Freeplay.
 2024-01-05 17:41:43 -05:00
Cameron Taylor
1e07b6ae22 Merge branch 'rewrite/master' into bugfix/chart-editor-modifies-freeplay 2024-01-05 17:41:07 -05:00
Cameron Taylor
dcb5c496a4 Merge pull request #251 from FunkinCrew/bugfix/conductor-rewrite 
Conductor rewrite plus notification bugfix
 2024-01-05 17:31:11 -05:00
Cameron Taylor
ab316017f7 removed beatTime nullability? 2024-01-05 17:22:01 -05:00
Cameron Taylor
65aee1dd13 Merge branch 'rewrite/master' into bugfix/conductor-rewrite 2024-01-05 15:32:42 -05:00
Cameron Taylor
56aa6f1dd8 submod update 2024-01-05 15:29:15 -05:00