Furo
|
9bd8ad0ad7
|
Merge branch 'main' into translations-system
|
2025-07-21 12:58:53 +02: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 |
|
⍚~Nex
|
066dc7d57a
|
Merge remote-tracking branch 'public/main'
|
2025-07-06 04:40:21 +02: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 |
|
⍚~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
|
226c7f84a6
|
more progress + psych/legacy importer
|
2025-04-05 03:38:36 +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
|
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 |
|
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 |
|
Ne_Eo
|
204a151170
|
Merge branch 'main' into new-editors
|
2024-11-15 18:50:48 +01:00 |
|
Ne_Eo
|
5f16024b3e
|
Merge branch 'main' into translations-system
|
2024-11-15 18:13:04 +01:00 |
|
 ⍚~NexandNe_Eo
|
596cb850cc
|
What? Constants is evolving into Flags!
Co-Authored-By: Ne_Eo <NeeEoo@users.noreply.github.com>
|
2024-11-15 13:58:35 +01:00 |
|
⍚~Nex
|
500cf98e0c
|
editable static costants!
for scripts :D
|
2024-08-31 02:31:05 +02:00 |
|
TheZoroForce240
|
5f7913affb
|
chart version tag
|
2024-08-28 21:56:17 +01:00 |
|
TheZoroForce240
|
da18a1a570
|
Merge branch 'new-editors' into zoro-charterstuffs
|
2024-08-25 14:49:21 +01:00 |
|
Ne_Eo
|
fe05ae66ce
|
Merge branch 'main' into translations-system
|
2024-08-16 17:17:13 +02:00 |
|
 TheZoroForce240andNe_Eo
|
00dde96956
|
ported over charter multikey and other stuff
Co-Authored-By: Ne_Eo <NeeEoo@users.noreply.github.com>
|
2024-08-03 14:34:01 +01:00 |
|
Ne_Eo
|
ffcc9e7476
|
Optimizations
|
2024-08-02 23:42:42 +02:00 |
|
Ne_Eo
|
8cb833a38d
|
Fix compiling issues
|
2024-08-02 14:24:50 +02:00 |
|
⍚~Nex
|
3683a54298
|
Merge branch 'main' into translations-system
|
2024-06-09 01:38:14 +02:00 |
|
Frakits
|
30fbf0c1bc
|
needsvoices is finally removed!
|
2024-04-23 20:23:36 +03:00 |
|
NeeEoo
|
308af270eb
|
Small Improvements
|
2024-04-12 12:14:51 +02:00 |
|
NeeEoo
|
070db1c2bd
|
Merge branch 'main' into translations-system
|
2024-04-11 14:30:58 +02:00 |
|
NeeEoo
|
d17ea72c74
|
Organize Imports and remove unused Imports
|
2024-04-11 14:23:02 +02:00 |
|
NeeEoo
|
d955e00ece
|
Cleaned up Warning And Error Code
|
2024-04-10 16:37:19 +02:00 |
|
NeeEoo
|
a8f35ad81c
|
Merge branch 'main' into translations-system
|
2024-04-10 16:14:55 +02:00 |
|
NeeEoo
|
e662cd4733
|
Fixed bug + Cleaner Code
|
2024-04-10 01:28:23 +02:00 |
|
NeeEoo
|
c8ef7ef967
|
Cleanup
|
2024-04-09 13:33:55 +02:00 |
|
lunarcleint
|
20fe94cd5a
|
ok NOW we need to merge
|
2024-03-29 14:39:42 -07:00 |
|
lunarcleint
|
217cade22c
|
Exporting to other engines wip
|
2024-03-23 05:08:53 -07:00 |
|
lunarcleint
|
ac4617437a
|
autosaves :D
|
2024-03-22 04:30:09 -07:00 |
|
⍚~Nex
|
3de8fcc804
|
bugfix for loading deleted mods + safe saves
|
2024-03-17 18:00:18 +01:00 |
|
⍚~Nex
|
7d0945502e
|
finalized event files shits
|
2024-02-27 17:07:52 +01:00 |
|
swordcube
|
80cd593113
|
Chart events can now be saved into a separate JSON file
|
2024-02-26 21:50:53 -06:00 |
|
lunarcleint
|
a033e92476
|
beatsPerMeasure
|
2023-11-19 15:00:31 -07:00 |
|
NeeEoo
|
008ad05bf1
|
Revert "Note types use strings instead of ints"
This reverts commit 17e177a695.
|
2023-08-21 22:18:21 +02:00 |
|
lunarcleint
|
17e177a695
|
Note types use strings instead of ints
|
2023-08-20 15:28:00 -07:00 |
|
 swordcubeandGitHub
|
d9de98fd5c
|
Fix chart saving on Linux/Mac (#148)
* Fix chart saving on Linux/Mac
* No need for back slashes actually!!
|
2023-06-16 00:37:56 +02:00 |
|
NeeEoo
|
d22c27250a
|
Fix for double converted old events
|
2023-06-10 17:23:51 +02:00 |
|
lunarcleint
|
5f5a6a84fe
|
Backwards compat on old events
|
2023-05-22 15:00:19 -07:00 |
|
Yoshman29
|
06828cade7
|
time to break your mods again for ease of use
|
2023-04-18 02:13:04 +02:00 |
|