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

2595 commits

This branch
This branch
All branches
Author SHA1 Message Date
Eric
edd8bdc014 Merge branch 'rewrite/master' into bugfix/chart-editor-monday-fixes 2023-12-19 19:04:40 -05:00
EliteMasterEric
711253a202 Update HaxeUI to latest 2023-12-19 16:12:25 -05:00
EliteMasterEric
8fea7eb734 Fix a bug where the background of the game over screen is pink 2023-12-19 01:57:39 -05:00
EliteMasterEric
f01535e431 Don't forget to update hmm! 2023-12-19 01:28:24 -05:00
EliteMasterEric
70b7de94aa Fix to Metadata toolbox causing crash when no GF :( 2023-12-19 01:28:13 -05:00
EliteMasterEric
ad02bf2ee0 Fix to GameOverSubstate exiting to Freeplay instead of Chart Editor 2023-12-19 01:27:58 -05:00
EliteMasterEric
bb0fb02813 Fix to launching directly into Chart Editor 2023-12-19 01:26:43 -05:00
EliteMasterEric
3e65e7ecc5 Fix for vocals not loading properly and not getting cleared properly. 2023-12-19 01:26:26 -05:00
EliteMasterEric
328bb7b938 Fixes to Erect/Nightmare only 2023-12-19 01:25:15 -05:00
EliteMasterEric
4ff5bd21df Fixes to the FNF Legacy JSON parser 2023-12-19 01:23:42 -05:00
EliteMasterEric
9e27095659 Update assets. 2023-12-19 01:21:26 -05:00
Cameron Taylor
f16f2b8f84 Merge pull request #258 from FunkinCrew/bugfix/selection-highlight 
Fix a bug where making one selection and then making a different one would leave the original highlighted
 2023-12-19 01:19:08 -05:00
Cameron Taylor
41ad47db52 Merge branch 'rewrite/master' into bugfix/selection-highlight 2023-12-19 01:18:49 -05:00
Cameron Taylor
48f916240f playstate import fixes and asset update 2023-12-18 21:33:29 -05:00
Cameron Taylor
360ba69496 shaderslmfao fix 2023-12-18 20:49:01 -05:00
shr
7fcf4c4175 added custom blend feature 2023-12-18 20:15:40 -05:00
shr
90036ee75d removing da dumb needless functions 2023-12-18 20:15:40 -05:00
shr
dc8dfeb336 add lightmaps 2023-12-18 20:15:40 -05:00
shr
bc20b81723 squiiish 2023-12-18 20:15:40 -05:00
shr
f7a519b13f cleaning code 2023-12-18 20:15:40 -05:00
shr
ab7ba485cb added GrabbableCamera 2023-12-18 20:15:40 -05:00
shr
9fc3a46b48 shader update 2023-12-18 20:15:40 -05:00
shr
7c46bcb707 add docs 2023-12-18 20:15:40 -05:00
shr
ace89a44a5 cleaning up code 2023-12-18 20:15:40 -05:00
shr
26818e6d99 made it a library 2023-12-18 20:15:40 -05:00
shr
6d0a8cc535 testing poyopoyo 2023-12-18 20:15:40 -05:00
shr
883ef13e65 finally did it 2023-12-18 20:15:40 -05:00
shr
56cecf98a0 fix typo 2023-12-18 20:15:40 -05:00
shr
b88fbeb206 update draw() 2023-12-18 20:15:40 -05:00
shr
95b03debb3 still buggy 2023-12-18 20:15:40 -05:00
shr
eb27c679c3 update shader 2023-12-18 20:15:40 -05:00
Cameron Taylor
32ec724da6 rainshader prototype 2023-12-18 20:15:40 -05:00
Cameron Taylor
cf9915ef60 puddle positioning 2023-12-18 20:15:40 -05:00
Cameron Taylor
4815bed2cb abot in progresss 2023-12-18 20:15:40 -05:00
Cameron Taylor
4629702634 Merge pull request #255 from FunkinCrew/bugfix/move-to-funkincrew 
Fixes for updated HaxeUI and Flixel.
 2023-12-15 21:47:46 -05:00
Cameron Taylor
4fc56a2280 small fix to backups folder not existing 2023-12-15 21:46:09 -05:00
Cameron Taylor
efd85e0e14 Merge branch 'rewrite/master' into bugfix/move-to-funkincrew 2023-12-15 21:11:10 -05:00
EliteMasterEric
88ca58f9e2 Fixes for updated HaxeUI and Flixel. 2023-12-15 21:09:01 -05:00
Cameron Taylor
e0c4843ec6 Merge pull request #254 from FunkinCrew/bugfix/move-to-funkincrew 
Move all haxelib forks to the FunkinCrew organization.
 2023-12-15 05:01:54 -05:00
EliteMasterEric
8dd6f29e26 Move all haxelib forks to the FunkinCrew organization. 2023-12-15 04:34:59 -05:00
Cameron Taylor
e9ed7223b6 no debugger 2023-12-15 02:29:32 -05:00
Cameron Taylor
15f72adeed Merge branch 'rewrite/master' into bugfix/selection-highlight 2023-12-14 18:41:23 -05:00
EliteMasterEric
3f2d1b4c1b Update haxelibs, add flixel-text-input to fix overlapping text 2023-12-14 17:34:02 -05:00
EliteMasterEric
ba3bf4e846 Update HaxeUI again 2023-12-14 17:05:48 -05:00
EliteMasterEric
ca489b5609 Rewrite the Conductor to be a singleton instance. 2023-12-14 16:56:20 -05:00
EliteMasterEric
b3236e6134 Fix a bug where modifying a copied template song's BPM in the chart editor would modify BPM in Freeplay. 2023-12-14 00:47:04 -05:00
Cameron Taylor
e5ceb1a5e3 asst update 2023-12-13 23:53:09 -05:00
Cameron Taylor
4ea04a9a2e Merge branch 'icon-charswitcher' into rewrite/master 2023-12-13 23:11:51 -05:00
EliteMasterEric
e2b0ed98dd Fix a bug where making one selection and then making a different one would leave the original highlighted 2023-12-13 23:11:19 -05:00
Cameron Taylor
0a47689eaa ease 2023-12-13 23:11:12 -05:00