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

4024 commits

This branch
This branch
All branches
Author SHA1 Message Date
lemz
49d302be95 make code a bit simpler 2024-07-12 02:13:15 -04:00
lemz
bb97549171 fixed a bit 2024-07-12 02:13:14 -04:00
lemz
040fc85a62 change note style on change 2024-07-12 02:13:14 -04:00
lemz
ca2cbb44f5 display custom note style in chart editor 2024-07-12 02:13:14 -04:00
lemz
9d7846a0d5 loop through all note style entries 2024-07-12 02:13:13 -04:00
lemz
ca69e7b850 custom note styles in chart editor 2024-07-12 02:13:13 -04:00
lemz
328e590f92 hold assets are updated aswell 2024-07-12 02:13:13 -04:00
lemz
b6eda8e498 remove note kind logic from playstate 2024-07-12 02:13:12 -04:00
lemz
14771e72de no more note getter 2024-07-12 02:13:12 -04:00
lemz
3f39d9509c make custom note style less clunky 2024-07-12 02:13:12 -04:00
lemz
e3e4e9fac0 helper function 2024-07-12 02:13:11 -04:00
lemz
c83e505f5b onUpdate, etc. works now too 2024-07-12 02:13:11 -04:00
lemz
606d9d4af4 Update NoteKindManager.hx 2024-07-12 02:13:11 -04:00
lemz
134b467876 rename stuff 2024-07-12 02:13:10 -04:00
lemz
a7482410b9 add note kind scripts 2024-07-12 02:13:10 -04:00
EliteMasterEric
50b587e3b8 Merge remote-tracking branch 'public/develop' into rewrite/master 2024-07-11 20:58:42 -04:00
EliteMasterEric
3721fb688f Merge branch 'main' into develop 2024-07-11 20:38:45 -04:00
Cameron Taylor
7cd19a0135
Merge pull request #656 from FunkinCrew/feature/nene-combo-anims 
Implement combo animations for Nene + other changes
 2024-07-11 19:52:01 -04:00
Cameron Taylor
966fce3426 Merge branch 'rewrite/master' into feature/nene-combo-anims 2024-07-11 19:51:13 -04:00
Cameron Taylor
261d68c410 assets submod 2024-07-11 19:51:00 -04:00
Cameron Taylor
cffe41985d
Merge pull request #663 from FunkinCrew/gamerbross/hold-note-forced-alpha 
[PUBLIC PR] Fix a bug where mods can't change the transparency of hold notes
 2024-07-11 19:48:35 -04:00
Cameron Taylor
068a660a91 Merge branch 'rewrite/master' of github.com:FunkinCrew/Funkin-secret into rewrite/master 2024-07-11 19:46:40 -04:00
Cameron Taylor
19fd8b5e4e Merge branch 'gamerbross/chart-editor-key' into rewrite/master 2024-07-11 19:45:10 -04:00
Eric
71947c581e
[PUBLIC PR] Fix a bug where the memory counter would overflow into the negatives (#662) 
* get Float instead of Int in cpp (Float is 64-bit in so it works easier than Int64)

* use Math.fround instead of Math.round

---------

Co-authored-by: Karim Akra <144803230+KarimAkra@users.noreply.github.com>
 2024-07-11 19:35:41 -04:00
Eric
66b103c650
[PUBLIC PR] Remove 5 duplicate audio files from the DadBattle folder. (#657) 
* Remove 5 duplicate audio files from the DadBattle folder.

* assets submod merge

---------

Co-authored-by: Cameron Taylor <cameron.taylor.ninja@gmail.com>
 2024-07-11 19:34:34 -04:00
Cameron Taylor
411484351a
Merge pull request #655 from FunkinCrew/doggogit/pico-death-fix 
[PUBLIC PR] Fix an issue with Pico's death animation spritesheet
 2024-07-11 18:39:23 -04:00
Cameron Taylor
ddec0070e3 Merge branch 'rewrite/master' into doggogit/pico-death-fix 2024-07-11 18:39:04 -04:00
Cameron Taylor
cfb2cf36de assets submod merge 2024-07-11 18:38:29 -04:00
Cameron Taylor
93148e97e8
Merge pull request #658 from FunkinCrew/bugfix/song-title-fixes 
Song title fixes.
 2024-07-11 18:37:31 -04:00
Cameron Taylor
dd3f41ab1b
Merge pull request #659 from FunkinCrew/feature/commas-in-score 
Add commas to the score to make it more readable
 2024-07-11 18:36:35 -04:00
Cameron Taylor
69859b80ee
Merge pull request #661 from FunkinCrew/applehair/menu-back-sounds 
[PUBLIC PR] Fixed back sound not playing in Story and Options menus
 2024-07-11 18:36:23 -04:00
Eric
1a44853c88
Merge pull request #2452 from eltociear/patch-1 
Update ScriptEventType.hx
 2024-07-11 03:56:07 -04:00
Eric
9b483de1da
Merge pull request #3003 from Hundrec/issue-templates 
New Issue and PR templates tweaks
 2024-07-11 03:49:11 -04:00
Hundrec
25a90d8419
Reword in crash report 2024-07-10 20:33:12 -07:00
Hundrec
6698ee6770
. 2024-07-10 20:31:06 -07:00
Hundrec
ffadce45e0
More crash report tweaks 2024-07-10 18:50:12 -07:00
Hundrec
ca5e08f967
Specify crash log location 2024-07-10 18:47:34 -07:00
Hundrec
0f35618a15
PR template tweak 2024-07-10 18:43:15 -07:00
Hundrec
ce24a6f7a3
Tweak Enhancement Template 2024-07-10 18:42:25 -07:00
Hundrec
ac11e5238d
Tweak Crash Report Template 2024-07-10 18:40:38 -07:00
Hundrec
88b35ce8c2
Tweak Bug Report Template 2024-07-10 18:37:19 -07:00
Hundrec
7353747ca5
Simplify PR template 2024-07-10 18:25:32 -07:00
Hundrec
fd37e2121c
PR template rename 2024-07-10 18:13:27 -07:00
Eric
712792c385
Merge pull request #2717 from tposejank/better-templates 
[FEATURE] Better issue and pull request templates
 2024-07-10 20:48:10 -04:00
tposejank
2915fd7717 efgh 2024-07-10 20:42:08 -04:00
tposejank
738a21eeb6 abcd 2024-07-10 20:41:40 -04:00
tposejank
a27e743c5f Merge remote-tracking branch 'upstream/main' into better-templates 2024-07-10 20:37:31 -04:00
Eric
dd763c4b64
Merge pull request #2996 from Hundrec/issue-templates 
[DOCS] Automatically assign 'status: pending triage' label to all new issues
 2024-07-10 20:21:49 -04:00
gamerbross
8107d1a290 Remove SustainTrail forced alpha 2024-07-10 20:18:29 -04:00
EliteMasterEric
49b7876b5a Add change counts labels to Actions labeler 2024-07-10 20:18:28 -04:00