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

2354 commits

This branch
This branch
All branches
Author SHA1 Message Date
Cameron Taylor
2fa5b1a9db Merge branch 'rewrite/master' into bugfix/pico-death-anim-fix 2024-01-18 00:57:25 -05:00
Cameron Taylor
4919d893c8 submod merg 2024-01-18 00:53:06 -05:00
Cameron Taylor
ab9b6d6c47 Merge pull request #292 from FunkinCrew/bugfix/chart-editor-selection-box 
Fix a bug where the drag-to-select box in the chart editor is not visible
 2024-01-18 00:40:05 -05:00
Cameron Taylor
ff9ebbed98 Merge pull request #293 from FunkinCrew/feature/separate-character-vocal-volumes 
Side sliders for individual side voice/hitsound volume
 2024-01-18 00:28:47 -05:00
Cameron Taylor
ef11f89632 Merge branch 'rewrite/master' into feature/separate-character-vocal-volumes 2024-01-18 00:24:47 -05:00
Cameron Taylor
ad7c16238e assets 2024-01-18 00:24:25 -05:00
Cameron Taylor
3be0a0c406 assets submod 2024-01-18 00:18:32 -05:00
EliteMasterEric
8c770e6c62 Stop audio playback when starting playtest, fixing the button icon. 2024-01-18 00:00:57 -05:00
EliteMasterEric
25fe2c0d39 Rewrite Upload Vocals dialog. 2024-01-17 23:53:23 -05:00
EliteMasterEric
26b7610663 Fix an error with playable Pico death 2024-01-17 23:14:28 -05:00
EliteMasterEric
a0c4499b03 Fix a bug where replaying a level makes a pink screen 2024-01-17 23:12:59 -05:00
EliteMasterEric
027c2843f4 This bug took me like 4-5 hours of staring at code to fix i am going crazy graaaa 2024-01-17 22:19:40 -05:00
Cameron Taylor
33982b140a Merge pull request #289 from FunkinCrew/feature/stage-solids 
Stage solids
 2024-01-17 21:41:50 -05:00
Cameron Taylor
96d02261c5 Merge branch 'rewrite/master' into feature/stage-solids 2024-01-17 21:40:26 -05:00
Cameron Taylor
44ec62c2a0 Merge pull request #290 from FunkinCrew/bugfix/flxdrawitems-animate-crash 
Fix an FlxDrawItems crash tied to FlxAnimate
 2024-01-17 21:22:08 -05:00
Jenny Crowe
e44b028946 Added side sliders that alter the volume of vocals and hitsounds on player/opponent sides. 2024-01-17 16:24:03 -07:00
EliteMasterEric
19cd7da8ee Fix an FlxDrawItems crash tied to FlxAnimate 2024-01-17 01:01:13 -05:00
EliteMasterEric
cd9035da19 Update assets 2024-01-16 17:08:41 -05:00
EliteMasterEric
80c7bcdfdf Rewrite Stage data handling to use the Registry pattern, and add support for solid colors. 2024-01-16 17:08:25 -05:00
Cameron Taylor
ba0660c2c0 ansi 2024-01-16 08:58:31 -05:00
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
Cameron Taylor
1dcd0debc7 conductor stuff 2024-01-16 05:37:06 -05:00
Cameron Taylor
53d3db2007 assets subjod 2024-01-16 04:06:56 -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