Kolo and GitHub
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
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 and GitHub
970816592f
Merge branch 'develop' into bugfix/charselect-crash
2024-09-18 06:20:44 -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 and GitHub
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
EliteMasterEric
f7fb640e52
Copy TracyProfiler from pull request
2024-09-18 02:29:11 -04:00
EliteMasterEric
119148acf0
Define for enabling/disabling log trace
2024-09-18 02:11:31 -04:00
Eric and GitHub
598a3bea24
Merge branch 'develop' into fps-setting
2024-09-18 02:09:38 -04:00
Eric and GitHub
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 and GitHub
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 and GitHub
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
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 and GitHub
f38a95bbf7
Merge branch 'develop' into fps-setting
2024-09-16 18:59:55 -04:00
Eric and GitHub
8cad10263e
Merge branch 'develop' into bugfix/animation-editor
2024-09-16 18:37:35 -04:00
Eric and GitHub
6bde7c34a0
Merge branch 'develop' into tweak/funkinsound-playonce-return-value
2024-09-16 18:36:45 -04:00
Eric and GitHub
6ee1bddacb
Merge branch 'develop' into fix-sync
2024-09-16 18:27:27 -04:00
Eric and GitHub
bab4ac4902
Merge branch 'develop' into bugfix/default-face-icon
2024-09-16 18:21:20 -04:00
lemz
224d930ae6
Update PreferencesMenu.hx
2024-09-17 00:17:56 +02:00
lemz
18edadb712
Merge branch 'fps-setting' of https://github.com/lemz1/Funkin into fps-setting
2024-09-17 00:16:33 +02:00
lemz
80fc0cd526
Update Preferences.hx
2024-09-17 00:16:27 +02:00
lemz and GitHub
e7674ec31c
Merge branch 'develop' into fps-setting
2024-09-17 00:13:49 +02:00
Abnormal and GitHub
0b531c5b21
add getPath
2024-09-16 22:13:16 +00:00
Til Tjardes
4be4570c94
Merge branch 'main' of https://github.com/FunkinCrew/Funkin into playsound-typo
2024-09-16 16:08:58 -06:00
lemz and GitHub
d0ec26c44a
Merge branch 'develop' into completion-fix
2024-09-17 00:08:19 +02:00
lemz and GitHub
8252b2a6b3
Merge branch 'develop' into substate-dispatch-event-fix
2024-09-17 00:07:25 +02:00
EliteMasterEric
16aff6e7c3
Fix bugs with highscore display in Freeplay
2024-09-14 21:37:02 -04:00
EliteMasterEric
9f3af1ab94
Add a separate Gold Perfect animation for modders
2024-09-14 20:56:21 -04:00
EliteMasterEric
fd6ca6e267
Remove some spammy log traces.
2024-09-14 20:26:33 -04:00
EliteMasterEric
d5c7e4ffdb
Fix bug where Pico would become locked on every game restart.
2024-09-14 20:26:19 -04:00
Til Tjardes
0a8719088d
techniktil coming back with another typo lets go
2024-09-14 15:06:03 -06:00