cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-11-13 02:02:46 +00:00
Code Issues Releases Wiki Activity
2275 commits 3 branches 3 tags 3 GiB
Commit graph

2275 commits

This branch
This branch
All branches
Author SHA1 Message Date
Cameron Taylor 4375dfd13a Merge pull request #285 from FunkinCrew/feature/play-state-note-polish 
Feature/play state note polish
 2024-01-16 06:27:30 -05:00
Cameron Taylor 6564aba2c1 Merge pull request #286 from FunkinCrew/bugfix/story-menu-animations 
Reuse LevelProps (this fixes animations when switching weeks)
 2024-01-16 06:27:18 -05:00
Cameron Taylor f371559e81 Merge pull request #287 from FunkinCrew/bugfix/week-7-death 
Fix week 7 death animations.
 2024-01-16 06:26:21 -05:00
EliteMasterEric 673f7f57d4 Fix pink rim on low zoom levels. 2024-01-16 00:03:30 -05:00
EliteMasterEric 5ac4b14891 Fix week 7 death animations. 2024-01-15 23:51:37 -05:00
EliteMasterEric b4edcc4b3c Reuse LevelProps (this fixes animations when switching weeks) 2024-01-15 23:43:05 -05:00
EliteMasterEric 3d2e50906f I was in fact a dumbass. 2024-01-15 22:13:01 -05:00
EliteMasterEric e391c02015 Polish note display visuals, and scrap Killer judgement. 2024-01-15 22:10:42 -05:00
EliteMasterEric e0dfdd40a2 Merge remote-tracking branch 'origin/rewrite/master' into feature/play-state-note-polish 2024-01-15 21:55:23 -05:00
Cameron Taylor 3b078ee42c Merge pull request #284 from FunkinCrew/bugfix/chart-editor-edit-context 
Fix "Edit Event" menu item when right clicking chart events
 2024-01-15 21:30:22 -05:00
Cameron Taylor 4786091bbe Merge pull request #283 from FunkinCrew/bugfix/chart-f4-crash 
Fix a crash when closing chart editor with no music playing
 2024-01-15 21:30:04 -05:00
EliteMasterEric 3366240eb5 Fix "Edit Event" menu item when right clicking chart events 2024-01-15 18:21:49 -05:00
EliteMasterEric 6f0f5ea610 Fix a crash when closing chart editor with no music playing 2024-01-15 15:33:28 -05:00
EliteMasterEric 313fd55e98 WIP 2024-01-15 14:20:44 -05:00
Cameron Taylor 4dec9827f2 Merge pull request #281 from FunkinCrew/freeplay-rand-fixy 
Freeplay rand fixy
 2024-01-14 12:11:34 -05:00
Cameron Taylor 0504918530 Merge branch 'rewrite/master' into freeplay-rand-fixy 2024-01-14 12:11:24 -05:00
Cameron Taylor efb919b332 Merge pull request #282 from FunkinCrew/bugfix/song-data-offset-fix 
Fixes to BF fakeout animation and music playback
 2024-01-14 12:11:04 -05:00
Cameron Taylor f1f8cce6e4 Merge branch 'rewrite/master' into bugfix/song-data-offset-fix 2024-01-14 12:08:23 -05:00
Cameron Taylor 3c4f5d596b assets subjod 2024-01-14 12:07:50 -05:00
EliteMasterEric d53dbd67e3 Rewrite to character animation, boyfriend death animation should be fixed 2024-01-14 09:18:32 -05:00
Cameron Taylor 0f03021c20 tooltip fix 2024-01-14 08:52:43 -05:00
Cameron Taylor bf11071349 null check on daSong for difficultyStars 2024-01-14 08:48:50 -05:00
Cameron Taylor 5dbed6d4dd Merge pull request #280 from FunkinCrew/bugfix/song-data-offset-fix 
Fix a freeplay crash and a Week 5 script error.
 2024-01-14 08:39:20 -05:00
EliteMasterEric 180e9eefc8 Fix an issue with parsing enums in HScript. 2024-01-14 06:47:17 -05:00
EliteMasterEric 549d461172 Fix an issue where Song offsets would be null rather than zero. 2024-01-14 06:46:58 -05:00
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