Commit graph

3128 commits

Author SHA1 Message Date
EliteMasterEric
042dfb7442 Merge branch 'rewrite/master' into abnormalpoof/stage-prop-flipx 2024-09-28 09:18:41 -04:00
Cameron Taylor
7a3d983bba Merge branch 'feature/discord-rpc-resurrected' into rewrite/master 2024-09-27 17:47:59 -04:00
Cameron Taylor
db0944712d Merge branch 'rewrite/master' into bugfix/mod-dev-fixes 2024-09-27 17:27:59 -04:00
Cameron Taylor
fb1b3cc1cd Merge branch 'bugfix/week-7-pico-stress' into rewrite/master 2024-09-27 17:00:54 -04:00
Cameron Taylor
9a57762a9c Merge remote-tracking branch 'origin/bugfix/web-screenshots' into rewrite/master 2024-09-27 16:56:12 -04:00
Cameron Taylor
06fee5599c
Merge pull request #796 from FunkinCrew/lemz1/completion-fix
[PUBLIC PR] Fix an issue where getting the same rank (but a different clear %) will override the rating
2024-09-27 16:50:53 -04:00
AbnormalPoof
cd2b458da2 add flipx and flipy 2024-09-27 15:15:35 -05:00
EliteMasterEric
5630e74584 Rework Freeplay variation handling... again. 2024-09-27 14:26:08 -04:00
EliteMasterEric
067f52ca91 Kill intro music when leaving Results state. 2024-09-27 14:25:32 -04:00
EliteMasterEric
2eb5208c46 Hide the pixel icon in the Results screen when there's no matching character 2024-09-27 14:25:17 -04:00
EliteMasterEric
b5f3996236 Properly sort difficulties/variations. Validate variation IDs (alphanumeric only) 2024-09-27 12:21:17 -04:00
EliteMasterEric
378179d1f7 Change crash keybind to Ctrl-Alt-Shift-L 2024-09-27 12:20:36 -04:00
EliteMasterEric
f1c1e63375 Use more dynamic API version rules for checking mod versions. 2024-09-27 12:19:41 -04:00
EliteMasterEric
e321861b9f Fix an issue where animations wouldn't loop properly on AnimateAtlasCharacters. 2024-09-27 03:09:59 -04:00
EliteMasterEric
c4ed31b246 Fix a bug where force-ending a song could occasionally try to draw destroyed sprites. 2024-09-27 02:52:01 -04:00
Cameron Taylor
4669ac03a9
Merge pull request #795 from FunkinCrew/nebulazorua/classic-camera-fix
[PUBLIC PR] Fix an issue where the Classic FocusCamera event would cause the camera to snap in place
2024-09-25 19:25:45 -04:00
Cameron Taylor
cb16a8d55e
Merge pull request #793 from FunkinCrew/cyn0x8/module-ondestroy-fix
[PUBLIC PR] Fix an issue when interacting with modules during onDestroy()
2024-09-25 19:24:48 -04:00
EliteMasterEric
67126b33fa Suppress some spammy log calls 2024-09-25 10:02:18 -04:00
EliteMasterEric
998bbb213a Merge branch 'rewrite/master' into nebulazorua/classic-camera-fix 2024-09-25 08:48:20 -04:00
EliteMasterEric
8d02a3f984 A bunch of controls fixes 2024-09-25 08:39:57 -04:00
Eric
85763813ae
Merge branch 'develop' into patch-2 2024-09-25 07:38:14 -04:00
EliteMasterEric
5693d626b5 Update so that album art works. 2024-09-25 03:58:43 -04:00
EliteMasterEric
ec9b5db210 Create shader for Week 5 once and reuse it rather than recreating it every frame. 2024-09-23 21:41:48 -04:00
Cameron Taylor
7e75308423 capitalization hxCodec 2024-09-23 18:51:48 -04:00
Cameron Taylor
073dbaa023 Merge remote-tracking branch 'origin/bugfix/input-offsets-crash' into rewrite/master 2024-09-23 18:48:22 -04:00
Cameron Taylor
f6697f8ddc Merge branch 'bugfix/html5-video-error' into rewrite/master 2024-09-23 18:47:48 -04:00
Cameron Taylor
78d0ad9956 Merge remote-tracking branch 'origin/feature/tracy' into rewrite/master 2024-09-23 17:41:01 -04:00
EliteMasterEric
52f5c24f96 Add frame market support, and enable on demand tracing. 2024-09-23 16:09:34 -04:00
Cameron Taylor
252b87c451
Merge pull request #763 from FunkinCrew/feature/tracy
Add Tracy support for performance profiling
2024-09-23 15:03:33 -04:00
EliteMasterEric
0389cd6760 Fix a compile issue on HTML5 with video sprites 2024-09-23 14:45:12 -04:00
Cameron Taylor
50f65177cb Merge branch 'rewrite/master' into spirit-trail 2024-09-23 13:09:03 -04:00
Cameron Taylor
1c2a403dea Merge branch 'rewrite/master' into kadedev/fix-audio-offsets 2024-09-23 13:07:32 -04:00
Til Tjardes
cca997b724 fix develop branch cuz git is on crack 2024-09-22 17:59:18 -06:00
Cameron Taylor
15bce04a50
Merge pull request #783 from FunkinCrew/nothyper474/chart-selection
[PUBLIC PR] Chart Editor: Fi bug where selecting area left of the chart would select the player's left notes
2024-09-22 13:30:32 -04:00
Cameron Taylor
5c6d72d8d5
Merge pull request #782 from FunkinCrew/cyn0x8/funkinsound-persist
[PUBLIC PR] If FunkinSound.persist is true, don't destroy it when switching states
2024-09-22 13:30:17 -04:00
EliteMasterEric
0bf1bead03 Fix some issues causing the Input Offsets view to crash on web. 2024-09-22 12:14:15 -04:00
Cameron Taylor
58508755f9 revert extra flxtrail function 2024-09-22 10:57:00 -04:00
lemz
bcb7bc4cbc
Merge branch 'develop' into completion-fix 2024-09-22 16:12:17 +02:00
EliteMasterEric
28d50a4567 Merge branch 'rewrite/master' into nothyper474/chart-selection 2024-09-22 01:10:56 -04:00
Eric
6a113addca
Merge branch 'develop' into bugfix/chart-selection 2024-09-22 01:09:37 -04:00
EliteMasterEric
c7238fcfd1 Stop the volume tray from hiding as long as the game is muted 2024-09-22 00:45:30 -04:00
EliteMasterEric
29a7005d8a Fix a bug where you can hear the game a little when setting the volume to 0 ticks 2024-09-22 00:44:57 -04:00
EliteMasterEric
6c743b3b89 Remove some spammy trace calls. 2024-09-21 20:33:51 -04:00
Cameron Taylor
e978f5df76 fix for spirit's trail 2024-09-21 16:32:44 -04:00
EliteMasterEric
2c73b241e8 Rework offset+vocal sync handling to fix the "Swing Mode" bug 2024-09-21 06:33:47 -04:00
Eric
3ef238a2f6
Merge pull request #3282 from TechnikTil/playsound-typo
[DOCUMENTATION] playSound Typo in NoteScriptEvent
2024-09-21 05:45:35 -04:00
Cameron Taylor
690f3090b7 proper audio scaling for hxcodec / desktop 2024-09-20 20:11:12 -04:00
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