 Furo
|
9bd8ad0ad7
|
Merge branch 'main' into translations-system
|
2025-07-21 12:58:53 +02:00 |
|
|
Ralty
|
31b2f5bcb9
|
Merge branch 'furo-charter-bookmarks' into new-editors-conductor
# Conflicts:
# source/funkin/backend/utils/CoolUtil.hx
# source/funkin/editors/charter/Charter.hx
|
2025-07-20 00:24:17 +07:00 |
|
|
Ralty
|
b1829aa4ad
|
Merge branch 'new-conductor' into new-editors-conductor
# Conflicts:
# source/funkin/editors/charter/Charter.hx
# source/funkin/editors/charter/CharterBackdropGroup.hx
# source/funkin/editors/charter/CharterEvent.hx
|
2025-07-19 19:17:27 +07:00 |
|
|
Ralty
|
52184f0470
|
Merge remote-tracking branch 'upstream/main' into new-editors-main
# Conflicts:
# commandline/commands/Compiler.hx
# source/funkin/backend/FunkinSprite.hx
# source/funkin/backend/MusicBeatState.hx
# source/funkin/backend/MusicBeatSubstate.hx
# source/funkin/backend/chart/Chart.hx
# source/funkin/backend/chart/EventsData.hx
# source/funkin/backend/scripting/GlobalScript.hx
# source/funkin/backend/system/Controls.hx
# source/funkin/backend/system/MainState.hx
# source/funkin/backend/utils/AudioAnalyzer.hx
# source/funkin/backend/utils/CoolUtil.hx
# source/funkin/editors/character/CharacterInfoScreen.hx
# source/funkin/editors/charter/Charter.hx
# source/funkin/editors/charter/CharterSelection.hx
# source/funkin/editors/charter/CharterStrumline.hx
# source/funkin/editors/charter/CharterStrumlineButton.hx
# source/funkin/editors/charter/SongCreationScreen.hx
# source/funkin/editors/ui/UIDropDown.hx
# source/funkin/editors/ui/UIFileExplorer.hx
# source/funkin/game/Note.hx
# source/funkin/game/PlayState.hx
# source/funkin/game/SplashGroup.hx
# source/funkin/game/Stage.hx
# source/funkin/game/Strum.hx
# source/funkin/menus/FreeplayState.hx
# source/funkin/options/Options.hx
# source/funkin/options/keybinds/KeybindsOptions.hx
|
2025-07-19 00:57:08 +07:00 |
|
|
Ralty
|
e4be3bd427
|
Merge branch 'Time-Signature-Changes' into new-conductor
# Conflicts:
# .gitignore
# source/funkin/backend/FunkinSprite.hx
# source/funkin/backend/chart/ChartData.hx
# source/funkin/backend/chart/EventsData.hx
# source/funkin/backend/system/Conductor.hx
# source/funkin/backend/utils/CoolUtil.hx
# source/funkin/editors/charter/Charter.hx
# source/funkin/editors/charter/CharterEvent.hx
# source/funkin/editors/charter/CharterEventScreen.hx
# source/funkin/editors/charter/CharterMetaDataScreen.hx
# source/funkin/editors/charter/SongCreationScreen.hx
# source/funkin/game/PlayState.hx
|
2025-07-16 19:27:05 +07:00 |
|
|
Ralty
|
34b4de31fc
|
Should be done
|
2025-07-06 10:33:25 +07:00 |
|
|
⍚~Nex
|
1b0ad7d3a6
|
some more stuff SOMEONE HAVE TO TEST THESE 2 COMM
|
2025-07-06 04:44:46 +02:00 |
|
|
⍚~Nex
|
066dc7d57a
|
Merge remote-tracking branch 'public/main'
|
2025-07-06 04:40:21 +02:00 |
|
|
Ralty
|
1a66b7109c
|
Merge remote-tracking branch 'upstream/main' into pr/397
|
2025-07-05 18:23:41 +07:00 |
|
|
|
7a8f1f0ded
|
Update FreeplayState.hx (#669)
* Update FreeplayState.hx
* should be good
* pretty print the color
---------
Co-authored-by: ⍚~Nex <87421482+NexIsDumb@users.noreply.github.com>
|
2025-07-05 01:06:57 +02:00 |
|
|
Frakits
|
9db001101a
|
[REQUIRES TESTING] removed lowercasing requirement in song parsing
|
2025-07-01 10:18:46 +03:00 |
|
|
Ralty
|
9982236321
|
Whoops!
|
2025-06-30 22:29:21 +07:00 |
|
|
Ralty
|
241b87ad58
|
Change event params a bit and fix cam zooming
|
2025-06-30 10:49:38 +07:00 |
|
|
Ne_Eo
|
a6fcb3d237
|
Merge branch 'main' into pr/397
|
2025-06-06 20:39:24 +02:00 |
|
|
⍚~Nex
|
f59864d8a4
|
StoryWeeklist + Week class+ loading weeks fix
BIG REWRITE!!
a 2 YEARS OLD commit, are we DEADASS for never noticing the way they loaded😭🥀
|
2025-05-08 18:04:42 +02:00 |
|
|
⍚~Nex
|
44aba206e8
|
im gonna end it all
dawg i swear sleeping 4h doesnt help
|
2025-05-05 01:46:43 +02:00 |
|
|
⍚~Nex
|
7970265e6b
|
oh it was so broken LMAOO
|
2025-05-04 23:03:55 +02:00 |
|
|
⍚~Nex
|
921ab3da63
|
forgor vslice shits + better camera tweens
hopefully works, sen pls test these with your vslice charts🥹
|
2025-05-04 22:34:53 +02:00 |
|
|
⍚~Nex
|
5751ad5d43
|
fixing a bunch of stuff + camera position event
|
2025-05-04 19:53:54 +02:00 |
|
|
SenDoesStuff
|
4b2acd4a8e
|
buh
|
2025-05-04 12:21:19 -04:00 |
|
|
SenDoesStuff
|
22f78da8fb
|
Fix Camera Zoom Event
Please let me know if this breaks anything and I will fix it as soon as I can :0
|
2025-05-04 12:18:05 -04:00 |
|
|
⍚~Nex
|
226c7f84a6
|
more progress + psych/legacy importer
|
2025-04-05 03:38:36 +02:00 |
|
|
⍚~Nex
|
cfe209067c
|
updated vslice structures + using the class funcs
|
2025-04-04 23:28:49 +02:00 |
|
|
⍚~Nex
|
c44fa191dd
|
bruh
|
2025-04-04 00:47:59 +02:00 |
|
|
⍚~Nex
|
20afbbd084
|
fixing and optimizing the camera focus
|
2025-04-04 00:25:35 +02:00 |
|
|
⍚~Nex
|
4972593b5f
|
animation context for play animation event
|
2025-04-03 16:13:26 +02:00 |
|
|
⍚~Nex
|
56e0b3a1e5
|
also
|
2025-04-03 02:25:00 +02:00 |
|
|
⍚~Nex
|
9698c1e2f9
|
making vslice ease get saved properly
|
2025-04-03 02:18:08 +02:00 |
|
|
⍚~Nex
|
d91e36e294
|
conditional saving parameter for events
|
2025-04-03 01:25:05 +02:00 |
|
|
⍚~Nex
|
4b145bf62e
|
A LOT OF NEW STUFF + more vslice events WIP
JUST GOTTA MAKE THE TWEEN ON THE CAMERA MOVEMENT FRUNCTION PROPERLY AND WE'RE GOOD
(and also make the charter not save not changed paramteres)
|
2025-04-02 01:50:00 +02:00 |
|
|
⍚~Nex
|
1c6ec00d23
|
vslice bpm changes
|
2025-04-01 14:28:20 +02:00 |
|
|
Furo
|
d67f537cdf
|
added vslice fnfc format (psych import soon)
|
2025-03-29 16:43:22 +01:00 |
|
|
⍚~Nex
|
612fd84aaa
|
more fixes + update song charts and events
MF gotta wait for monster cuz bpm changes are broken as FUCK
i'll prob merge the bpm pr soon at this point
|
2025-03-09 17:50:06 +01:00 |
|
|
⍚~Nex
|
39aadbe8a0
|
finished global/local events + HUGE SAVES FIX
HOW DID WE NEVER NOTICE??
anyways im really happy on how everything came out :D
more than a fix it also ended up like a rewrite!
|
2025-03-09 06:11:36 +01:00 |
|
|
Ne_Eo
|
68f3a64466
|
Allow setting the positions for events
|
2025-03-08 19:14:24 +01:00 |
|
|
NyxieFemboy
|
8e88a1545f
|
fixed chart parsing
|
2025-02-18 21:38:05 -05:00 |
|
|
TheZoroForce240
|
3e13bf50c6
|
Continuous bpm change event, lots of other reworks and fixes
|
2025-02-01 21:13:46 +00:00 |
|
|
Ne_Eo
|
5f51df0f3f
|
Merge branch 'main' into new-editors
|
2025-01-22 22:25:21 +01:00 |
|
|
Ne_Eo
|
fd2d44dc80
|
Merge branch 'main' into translations-system
|
2025-01-17 15:32:42 +01:00 |
|
|
Ne_Eo
|
108b385e6c
|
Merge remote-tracking branch 'upstream/main'
|
2025-01-17 15:23:44 +01:00 |
|
|
Ne_Eo
|
0e47728d0f
|
Merge branch 'main' into pr/397
|
2025-01-10 16:33:08 +01:00 |
|
|
Ne_Eo
|
a94a1f43bf
|
Merge branch 'new-editors' into furo-charter-bookmarks
|
2025-01-09 20:31:08 +01:00 |
|
|
Ne_Eo
|
fe0542a32c
|
Merge branch 'main' into translations-system
|
2025-01-09 20:26:29 +01:00 |
|
|
Ne_Eo
|
fdf53b3d4f
|
Merge branch 'main' into new-editors
|
2025-01-09 20:05:06 +01:00 |
|
|
|
2557fc4fb3
|
Allow for Float as BPM (#489)
* Allow for Float as BPM
Please bro 🙏
* making it unlimited
---------
Co-authored-by: ⍚~Nex <87421482+NexIsDumb@users.noreply.github.com>
|
2025-01-07 00:30:13 +01:00 |
|
|
Ne_Eo
|
aec73ab2b6
|
Added some more documentation
|
2024-12-16 04:37:18 +01:00 |
|
|
Ne_Eo
|
d6dc3ea232
|
Fix typos
|
2024-12-10 04:35:32 +01:00 |
|
|
Ne_Eo
|
012c8f76fc
|
Merge remote-tracking branch 'upstream/main'
|
2024-12-09 22:52:29 +01:00 |
|
|
⍚~Nex
|
eada3105a4
|
psych 1.0 format + some charts improvements
Fixes #448
|
2024-11-30 02:15:35 +01:00 |
|
|
Furo
|
66953e4609
|
I like the part when the bookmark said its color picker time and then started coloring all over the place
|
2024-11-28 18:03:19 +01:00 |
|