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

4671 commits

This branch
This branch
All branches
Author SHA1 Message Date
Kolo
99657da1f9
accidentally also put the save changes oops 2024-09-18 17:46:13 +02:00
Kolo
3bb981adb0
Update CharSelectGF.hx 2024-09-18 17:32:37 +02:00
Kolo
50a5304ad4
Update PlayerData.hx 2024-09-18 17:30:23 +02:00
Kolo
a4b59d14bf
applySongRank fix 
fixes the bug with the percent being overriden when the song has the same letter rank but lower percent (eg. E Rank with 99% being overriden by E Rank with 93%)
 2024-09-18 13:40:02 +02:00
EliteMasterEric
9d5cde0bf1 Update assets submodule 2024-09-18 06:48:45 -04:00
EliteMasterEric
5efbff044b Resolve merge issues 2024-09-18 06:32:06 -04:00
EliteMasterEric
a469385cdb Resolve merge issues 2024-09-18 06:22:02 -04:00
Eric
970816592f
Merge branch 'develop' into bugfix/charselect-crash 2024-09-18 06:20:44 -04:00
EliteMasterEric
ba90a6abe0 Add behavior when setting status: rejected 2024-09-18 06:08:18 -04:00
EliteMasterEric
d54dc6179a Add several new Github Actions for issue management 2024-09-18 06:02:13 -04:00
EliteMasterEric
b5ed7f40d4 Remove redundant character type assignment 2024-09-18 05:24:57 -04:00
EliteMasterEric
b28af79eb3 Fix build issues 2024-09-18 05:18:16 -04:00
Eric
5f563f0555
Merge branch 'develop' into chart-editor-icon-fix 2024-09-18 05:10:30 -04:00
EliteMasterEric
1beb21e57a Replace all instances of openfl/lime Assets with funkin.Assets 2024-09-18 05:04:32 -04:00
EliteMasterEric
b6b2248aa3 Make funkin.Assets and funkin.Paths default imports for all scripts 2024-09-18 05:04:10 -04:00
EliteMasterEric
d30fe61ca0 Add a bunch of other functions to funkin.Assets, and add documentation 2024-09-18 05:03:04 -04:00
EliteMasterEric
7b7d5deed5 Tweaks to framerate preference 2024-09-18 03:13:21 -04:00
EliteMasterEric
19e6029fb2 Fix some compilation errors 2024-09-18 03:13:10 -04:00
Eric
598a3bea24
Merge branch 'develop' into fps-setting 2024-09-18 02:09:38 -04:00
Eric
b03d320c12
Merge pull request #3139 from AbnormalPoof/patch-1 
chore: Update ScriptedFunkinSprite.hx
 2024-09-18 01:58:40 -04:00
Kade
de07497ae3
Make addCharacter actually set the characters type 2024-09-17 17:29:12 -07:00
Lethrial
ea9dab4b73 Update Main.hx 2024-09-18 00:25:20 +01:00
Michael
f2b3f47e73 Disable input in CharSelect until stayFunky plays 2024-09-17 15:57:50 -07:00
dombomb64
6e33cac9ec ...Okay it wasn't that simple 2024-09-17 16:47:16 -04:00
Eric
dab417b391
Merge branch 'rewrite/master' into kadedev/chart-editor-fixes 2024-09-17 16:15:02 -04:00
dombomb64
0706192cbe Fix note scaling with one simple trick! 2024-09-17 13:50:59 -04:00
AbnormalPoof
aae7dcdada fix crash when opening urls 2024-09-16 23:35:23 -05:00
Til Tjardes
e6525d0129 stop being on the kickstarter crack me 2024-09-16 20:44:29 -06:00
Eric
6efdbde8da
Merge branch 'develop' into fps-setting 2024-09-16 22:09:54 -04:00
Til Tjardes
b7c3f5ac9f Chart Editor Icons are fixed now! 2024-09-16 20:04:04 -06:00
EliteMasterEric
811caf6b70 Suppress a spammy log trace 2024-09-16 21:54:33 -04:00
EliteMasterEric
d710318830 Update HaxeUI 2024-09-16 21:54:24 -04:00
Eric
1fc835494d
Merge pull request #3020 from anysad/custom-popups-countdowns 
[ENHANCEMENT] Custom Popups and Countdowns
 2024-09-16 20:56:26 -04:00
EliteMasterEric
2e9223ec72 Merge remote-tracking branch 'origin/develop' into anysad/custom-popups-countdowns 2024-09-16 20:50:13 -04:00
Kade
9624b57e44
This does fix it now 2024-09-16 17:23:49 -07:00
Kade
7d2b946e9c
depreciated screen X/Y to view X/Y 2024-09-16 17:13:14 -07:00
Kade
5a877a14a0
only show last two digits 
digit
 2024-09-16 17:13:13 -07:00
Kade
535ac0e528
add milliseconds to the playbar in charting state 
remove laggy redundant traces

Revert "remove laggy redundant traces"

This reverts commit 204113840473dd5069f5d508d50e15e21104b45a.
 2024-09-16 17:13:13 -07:00
Eric
35b5957715
Merge pull request #3007 from anysad/tutorial-hey-events 
[CLEANUP] Softcode Tutorial HEY! events from code to JSON
 2024-09-16 19:33:04 -04:00
EliteMasterEric
e915b637c5 Merge remote-tracking branch 'origin/develop' into anysad/tutorial-hey-events 2024-09-16 19:09:58 -04:00
Eric
f38a95bbf7
Merge branch 'develop' into fps-setting 2024-09-16 18:59:55 -04:00
Eric
ebfce9f990
Merge pull request #2820 from gamerbross/bugfix/animation-editor 
[ENHANCEMENT/BUGFIX] Few animation editor bugfixes and improvements
 2024-09-16 18:48:50 -04:00
Eric
359e4b41e5
Merge branch 'develop' into bugfix/animation-editor 2024-09-16 18:48:33 -04:00
Eric
b0c9365c56
Merge pull request #2942 from FlooferLand/new-settings-items 
New settings widgets (Number, Checkbox, Enum)
 2024-09-16 18:42:48 -04:00
Eric
65fddd95bb
Merge branch 'develop' into new-settings-items 2024-09-16 18:42:43 -04:00
Eric
f1d3ace247
Merge pull request #2925 from gamerbross/bugfix/character-danceevery 
[BUGFIX] Implement `danceEvery` for Characters
 2024-09-16 18:42:40 -04:00
Eric
9e90e67673
Merge branch 'develop' into bugfix/character-danceevery 2024-09-16 18:42:32 -04:00
Eric
3ce7cd6990
Merge pull request #2903 from AbnormalPoof/develop 
[ENHANCEMENT] Enable auto-pause for Video Cutscenes
 2024-09-16 18:42:20 -04:00
Eric
d4cd2d031c
Merge branch 'develop' into develop 2024-09-16 18:41:33 -04:00
Eric
081d2d8fd8
Merge pull request #2992 from gamerbross/bugfix/charteditor-liveinput-number-6 
[BUGFIX + REFACTOR] ChartEditor Live Input
 2024-09-16 18:40:24 -04:00