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
4839 commits 30 branches 20 tags 3 GiB
Commit graph

3131 commits

Author SHA1 Message Date
Cameron Taylor
a41d3033d5 small Assets -> OpenFLAssets fix 2024-09-20 18:20:40 -04:00
Cameron Taylor
d02e834460 Merge branch 'rewrite/master' into abnormalpoof/assets-getpath 2024-09-20 18:13:13 -04:00
Cameron Taylor
2a6eadcbff Merge branch 'justkolosaki/char-select-gf' into rewrite/master 2024-09-20 18:11:14 -04:00
Cameron Taylor
4946e7f4c7
Merge pull request #765 from FunkinCrew/lethrial/fps-counter-bugfix 
[PUBLIC PR] Fix bug where FPS counter would display even if Debug Display option was disabled
 2024-09-20 16:52:02 -04:00
Cameron Taylor
ccb2e1889f Merge branch 'lemz1/substate-event-dispatch' into rewrite/master 2024-09-20 00:25:53 -04:00
Cameron Taylor
e3a13bee8c
Merge pull request #773 from FunkinCrew/process-cleanup 
close sys.io.Process stuff when we're done with them
 2024-09-20 00:24:10 -04:00
Cameron Taylor
426bff3bf5
Merge pull request #768 from FunkinCrew/kadedev/addcharacter-type 
[PUBLIC PR] Move characterType assignment to Stage.addCharacter
 2024-09-20 00:23:53 -04:00
Cameron Taylor
4af4c2defc Merge branch 'lemz1/fps-setting' into rewrite/master 2024-09-19 23:56:04 -04:00
Cameron Taylor
69bcd0834e
Merge branch 'rewrite/master' into techniktil/chart-editor-icons 2024-09-19 23:31:26 -04:00
Cameron Taylor
29e89c8acb
Merge branch 'rewrite/master' into actualmandm/char-select-crash 2024-09-19 22:50:18 -04:00
Cameron Taylor
778ce54047 Merge branch 'rewrite/master' of github.com:FunkinCrew/Funkin-secret into rewrite/master 2024-09-19 22:49:59 -04:00
Cameron Taylor
47ed9d7fb2 Merge branch 'rewrite/master' into dombomb64/note-style-scaling 2024-09-19 22:35:16 -04:00
Cameron Taylor
0b908b3cab
Merge branch 'rewrite/master' into abnormalpoof/opening-urls 2024-09-19 22:31:12 -04:00
Cameron Taylor
50de041251 Merge branch 'public-release/develop' into rewrite/master 2024-09-19 22:11:05 -04:00
Kade
f9186b67a7
less tolerance 2024-09-19 17:00:52 -07:00
Kade
a8aeae4f7f
do not include offset in vocal (they're offset by inst) 
Fix a tiny little issue with vocal resync @ start
 2024-09-19 14:26:18 -07:00
Kade
4d73e0cc47
fix some interesting issues with this 
redundant trace removal
 2024-09-19 14:26:18 -07:00
Kade
b03c8a9cf8
Limit the song time to 0 and the songs max length 
use the new bool to tell if we should start the song

add a public static bool to countdown: finished
 2024-09-19 14:26:18 -07:00
EliteMasterEric
3cbba8ba29 Resolve merge issues. 2024-09-19 17:16:31 -04:00
EliteMasterEric
35aa8731d0 Better status messages, buttons, updated album art, basic chart editor support 2024-09-19 11:13:05 -04:00
EliteMasterEric
8fd84f9d13 Functioning Discord Rich Presence! 2024-09-19 10:03:16 -04:00
EliteMasterEric
25cafe7550 Resolve merge issues. 2024-09-19 04:22:05 -04:00
EliteMasterEric
7d6fa19ff4 Merge remote-tracking branch 'secret/rewrite/master' into lemz1/substate-event-dispatch 2024-09-19 04:20:24 -04:00
EliteMasterEric
9f0bc2bd52 Refactor char select GF data handling. 2024-09-19 04:16:40 -04:00
Eric
d81e09b1c3
Merge branch 'rewrite/master' into abnormalpoof/opening-urls 2024-09-19 03:46:46 -04:00
Eric
a128afedf7
Merge pull request #772 from FunkinCrew/results-sfx-fix 
Results Percentage Sound Spam Fix
 2024-09-19 03:24:52 -04:00
Cameron Taylor
472d41a893 close sys.io.Process stuff when we're done with them 2024-09-18 16:15:10 -04:00
Cameron Taylor
3c30575727 Merge branch 'kadedev/chart-editor-fixes' into rewrite/master 2024-09-18 15:23:07 -04:00
Cameron Taylor
f30c0cff49 Merge branch 'feature/gold-perfect-anim-for-modders' into rewrite/master 2024-09-18 15:20:38 -04:00
Cameron Taylor
35005df32a Merge branch 'feature/pico-character-script' into rewrite/master 2024-09-18 15:17:37 -04:00
Cameron Taylor
fdddfba3be
Merge pull request #760 from FunkinCrew/bugfix/pico-mix-highscores 
Fix bugs with highscore display in Freeplay (FUNK-714)
 2024-09-18 15:14:46 -04:00
Cameron Taylor
ab3b976f3c fix rounding for sound results sfx 2024-09-18 15:07:15 -04:00
lemz
e02bb9b21c
Merge branch 'develop' into completion-fix 2024-09-18 18:19:31 +02:00
lemz
afcb57aaf0
Merge branch 'develop' into substate-dispatch-event-fix 2024-09-18 18:18:57 +02:00
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
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
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
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
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
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
f38a95bbf7
Merge branch 'develop' into fps-setting 2024-09-16 18:59:55 -04:00
Eric
8cad10263e
Merge branch 'develop' into bugfix/animation-editor 2024-09-16 18:37:35 -04:00
Eric
6bde7c34a0
Merge branch 'develop' into tweak/funkinsound-playonce-return-value 2024-09-16 18:36:45 -04:00
Eric
6ee1bddacb
Merge branch 'develop' into fix-sync 2024-09-16 18:27:27 -04:00
Eric
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
e7674ec31c
Merge branch 'develop' into fps-setting 2024-09-17 00:13:49 +02:00
Abnormal
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
d0ec26c44a
Merge branch 'develop' into completion-fix 2024-09-17 00:08:19 +02:00
lemz
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
EliteMasterEric
df87d677e1 Typo lol 2024-09-14 17:00:41 -04:00
EliteMasterEric
517984d120 Fix a bug where Shit judgement would always display with anti-aliasing. 2024-09-13 18:46:49 -04:00
EliteMasterEric
d59594ee45 Fix animations not looping on Char Select 2024-09-12 22:02:05 -04:00
Cameron Taylor
af31be5436 makeship linky 2024-09-12 20:14:48 -04:00
Cameron Taylor
47f3c6f00a vid sizing 2024-09-12 19:56:04 -04:00
Cameron Taylor
d826f2a7bc Merge branch 'rewrite/master' into char-unlock-tinkers 2024-09-12 19:55:35 -04:00
Cameron Taylor
3103768d91
Merge pull request #747 from FunkinCrew/charselect-fade-fix 
Fix transition out of character select
 2024-09-12 19:14:34 -04:00
Cameron Taylor
10dfc96cf4 Merge branch 'freeplay-charselect-hint' into rewrite/master 2024-09-12 19:11:42 -04:00
CheemsAndFriends
1e9c6f0c4c Add Char Select stuff 2024-09-13 00:31:52 +02:00
FabsTheFabs
bc86f1f459 character select hint text 2024-09-12 22:44:40 +01:00
FabsTheFabs
5f60be6d75 allow controls to get dialouge name from control + ignore brackets 2024-09-12 22:44:22 +01:00
FabsTheFabs
703e899288 apply shader filter 2024-09-12 22:43:12 +01:00
CheemsAndFriends
34d1c568ea locked fixin 2024-09-12 23:22:20 +02:00
CheemsAndFriends
6dca858fd7 Introbizz 2024-09-12 23:13:30 +02:00
CheemsAndFriends
2a9814e030 port SAVE from develop 2024-09-12 22:58:31 +02:00
CheemsAndFriends
395de4ee95 Char select subs stuff 2024-09-12 22:53:01 +02:00
Cameron Taylor
89f4703977 Merge branch 'framerate-pref' into rewrite/master 2024-09-12 16:47:13 -04:00
EliteMasterEric
a9667c54f3 Fix FlxAtlasSprite completion handling and music looping 2024-09-12 15:48:41 -04:00
EliteMasterEric
3970189fe9 Ensure save data gets flushed when you see a character 2024-09-12 15:43:40 -04:00
Cameron Taylor
721cecd271 add preference option for framerate capping 2024-09-12 15:38:44 -04:00
EliteMasterEric
e5673549cf Fix issues with the difficulty selector showing non-existant difficulties in Freeplay 2024-09-12 15:38:20 -04:00
EliteMasterEric
386dc22d7b Debug hotkey properly resets char select cutscene 2024-09-12 15:34:16 -04:00
Cameron Taylor
bfb19cc67e lastTime error fix 2024-09-12 14:46:29 -04:00
Cameron Taylor
3de7047d22 Merge branch 'master-bugs' into rewrite/master 2024-09-12 14:34:21 -04:00
CheemsAndFriends
3553d008cf tinkering shit 2024-09-12 01:37:32 +02:00
CheemsAndFriends
70ab000be4 Readd CharSelectSubState from char unlock 2024-09-11 21:16:02 +02:00
CheemsAndFriends
cfcfc773da readd Save from char unlock 2024-09-11 20:53:05 +02:00
CheemsAndFriends
9f5c154b1d readd IntroSubState from char unlock 2024-09-11 20:49:55 +02:00
CheemsAndFriends
bea23c37a8 readd FlxAtlasSprite from char unlock branch 2024-09-11 20:47:45 +02:00
CheemsAndFriends
c81f041695 Tinkering with atlassprite 2024-09-11 20:05:39 +02:00
CheemsAndFriends
17a48bfc2b D'oh! 2024-09-11 19:26:38 +02:00
CheemsAndFriends
68d87a0837 Add one more conditional in atlas + add ignoreExclusions in Bopper/BaseCharacter 2024-09-11 19:24:21 +02:00
CheemsAndFriends
5c1766a00f Fix char select substate crash 2024-09-11 18:29:47 +02:00
CheemsAndFriends
0dc286e1d3 Fix Eggnog santa not playing plus Ugh fix 2024-09-11 18:29:31 +02:00
CheemsAndFriends
2aa9e58f67 Fix titlestate reentering crash 2024-09-11 18:29:00 +02:00
EliteMasterEric
0956b692d7 Add a debug hotkey to set characters as not seen. 2024-09-11 06:18:16 -04:00
EliteMasterEric
c63feaafbd BF force plays the unlock animation even when he would fist pump 2024-09-11 06:00:06 -04:00
EliteMasterEric
d1622040b6 Fix a bug where vocals would restart after a song ends 2024-09-11 04:22:33 -04:00
Cameron Taylor
22b1a5d9c0 Merge branch 'rewrite/master' into feature/char-unlock-merging 2024-09-10 23:52:52 -04:00
Cameron Taylor
9891dc7309 Merge branch 'rewrite/master' into bugfix/web-fixes 2024-09-10 23:43:26 -04:00
EliteMasterEric
9a242c5d00 Fix an issue where New labels wouldn't show on character mixes 2024-09-10 19:32:10 -04:00
EliteMasterEric
a530d91a76 Fix a bug where StickerSubState was being loaded as a state and not a substate, breaking some transitions 2024-09-10 19:16:48 -04:00
CheemsAndFriends
f74365f230 Add Changes 2024-09-11 00:55:14 +02:00
EliteMasterEric
c678cabbf2 Fix issue where difficulty names wouldn't show up properly sometimes. 2024-09-10 17:30:33 -04:00
EliteMasterEric
5021b49915 Enable the New Character backing card 2024-09-10 17:27:04 -04:00
Cameron Taylor
9c8142b769 Merge branch 'html5-fps' into rewrite/master 2024-09-10 15:40:30 -04:00
Cameron Taylor
96657e9e41 Merge branch 'rewrite/master' into week2-erect-bg-fixes 2024-09-10 07:38:38 -04:00
FabsTheFabs
03d9416ab1 texture swap shader 2024-09-10 07:26:15 +01:00
FabsTheFabs
34e93fa95a color util (with just one function lol) 2024-09-10 07:25:11 +01:00
EliteMasterEric
f6bd203786 Fix an issue where base inst wouldn't be chosen properly on remixes 2024-09-10 01:33:15 -04:00
Cameron Taylor
06389cb5cd Merge branch 'rewrite/master' into bugfix/doppel-random 2024-09-09 23:50:00 -04:00
EliteMasterEric
4c1b4859e7 Fix a bug where the random event in Week 3 would always trigger 2024-09-09 22:35:02 -04:00
EliteMasterEric
877d64c32b Fixed a bug where the instrumental selector would be ignored sometimes 2024-09-09 21:21:50 -04:00
CheemsAndFriends
af8fe0c0d2 Remove onAnimationLoopComplete 2024-09-10 01:11:41 +02:00
Cameron Taylor
e2c287e112 logarithmic volume control 2024-09-09 13:01:19 -04:00
Cameron Taylor
591d4a29f4 gameover positioning fixes 2024-09-09 12:34:55 -04:00
CheemsAndFriends
35af057f88 Fix scaleY not parsing 2024-09-09 17:41:25 +02:00
CheemsAndFriends
6961e6cc63 Add a buncho Gizmos 2024-09-09 08:23:46 +02:00
Abnormal
16905c8210
Update ScriptedFunkinSprite.hx 2024-09-08 21:48:48 +00:00
lemz
77346696f8 Update MusicBeatSubState.hx 2024-09-07 19:49:08 +02:00
Cameron Taylor
fbcf553bd9 Merge branch 'rewrite/master' into week5-alt-bg 2024-09-06 20:23:21 -04:00
CheemsAndFriends
f3722e5da2 Add hmm flxanimate, new conditional for Cheems' PC sake and more wip char select animation 2024-09-07 02:07:00 +02:00
FabsTheFabs
e0a4818e5a registry updates 2024-09-07 00:52:38 +01:00