Commit Graph
60 Commits
Author SHA1 Message Date
Furo 9bd8ad0ad7 Merge branch 'main' into translations-system 2025-07-21 12:58:53 +02: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 c987a0cd19 Fix New-Conductor 2025-07-16 20:06:15 +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
⍚~Nex d91e36e294 conditional saving parameter for events 2025-04-03 01:25:05 +02: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
Ne_Eo 68f3a64466 Allow setting the positions for events 2025-03-08 19:14:24 +01:00
TheZoroForce240 3e13bf50c6 Continuous bpm change event, lots of other reworks and fixes 2025-02-01 21:13:46 +00:00
Ne_Eo 0e47728d0f Merge branch 'main' into pr/397 2025-01-10 16:33:08 +01:00
Ne_Eo 80ef390095 Merge branch 'main' into translations-system 2024-11-29 22:06:37 +01:00
Ne_Eo 0d357171cf Merge branch 'main' into new-editors 2024-11-29 22:05:11 +01:00
Ne_Eo cd0f06f448 Merge remote-tracking branch 'upstream/main' 2024-11-29 22:02:37 +01:00
NyxieFemboyandGitHub 4bf58aeda5 Fixing the split vocals not pausing issue in charter (#456) 2024-11-24 19:39:17 +01:00
Ne_Eo 79dae9ed61 Added Event UI Scripts 2024-11-19 20:20:42 +01:00
Ne_Eo 204a151170 Merge branch 'main' into new-editors 2024-11-15 18:50:48 +01:00
Ne_Eo 82178e37a4 Merge branch 'main' into translations-system 2024-11-03 22:46:36 +01:00
Ne_Eo 9d1a27d404 Small fix to dropdowns 2024-10-28 23:11:18 +01:00
lunarcleint bbecab14c0 GUYS THIS IS DEV BRANCH 2024-10-14 18:15:56 -07:00
Ne_Eo a69d6ce35f Made translation documentation + more
Made UpdateScreen translatable
Small fixes
2024-10-04 22:21:02 +02:00
Ne_Eo d8d4c5907d Charter translatable 2024-08-17 01:26:10 +02:00
Ne_Eo dd09a5c28c Merge branch 'main' into new-editors 2024-08-10 14:43:11 +02:00
haven 363f82860d character and stage type for events 2024-08-06 12:01:43 -05:00
Ne_Eo 0319dad155 Drop down button + Optimization 2024-08-02 02:28:33 +02:00
NeeEoo d17ea72c74 Organize Imports and remove unused Imports 2024-04-11 14:23:02 +02:00
lunarcleint 864239108a wip ui for waveforms 2024-03-20 15:52:23 -07:00
lunarcleint f72a7682fd STATIC CHARTER SHIT :DDD 2024-02-05 15:43:11 -07:00
⍚~Nex be3ffd6e4f possibility to undo and redo note type changes yay 2024-01-05 03:26:55 +01:00
lunarcleint 6774061fca i forgot what i added 2023-09-09 20:31:12 -07:00
lunarcleint be234004ad move undos to their own class 2023-08-23 16:54:15 -07:00
lunarcleint 67bc6ee9b9 add undos to all actions in chart editor 2023-08-23 15:41:54 -07:00
lunarcleint 9918b83efa here 2023-08-20 11:55:01 -07:00
NeeEoo 4985ffbd86 Small fixes 2023-08-12 13:22:28 +02:00
NeeEoo 8475a7d9f1 Fixed bugs with cameras 2023-08-11 13:48:36 +02:00
lunarcleint e341380f49 event screen looks better 2023-08-03 16:43:03 -07:00
lunarcleint c9e631e776 fixing some stuff 2023-08-03 16:39:34 -07:00
lunarcleint 5138ba72e7 dumping a bunch of stuff (ui button list still fucking broken) 2023-08-02 19:10:23 -07:00
Frakist 34136a490f new event list thing something thing 2023-07-31 19:17:31 +03:00
lunarcleint 19119d491e fix undos with events again lol!!! 2023-07-30 14:28:13 -07:00
lunarcleint d5d8ef2564 move events data to funkin.backend.chart 2023-07-30 14:24:48 -07:00
lunarcleint 2d65f6f6d2 fix some bugs events 2023-07-28 19:08:48 -07:00
lunarcleint 33e94be993 Charter Event Undos 2023-07-28 18:51:11 -07:00
lunarcleint da38c1738a ok i think it works now 2023-07-26 21:34:09 -07:00
lunarcleint b8643ad1f7 New add strumline button + editing + other charter bug fixes 2023-06-30 23:05:51 -07:00
lunarcleint 15030beab9 f 2023-06-11 00:04:57 -07:00
lunarcleint 2e6ae6c506 better event ui placing 2023-06-11 00:01:37 -07:00
lunarcleint 657dc14db5 fixing event color wheels (YES IT WAS A BUG!!!) 2023-06-10 23:28:02 -07:00
lunarcleint 6f0a104fdd Fixing Dropdowns 2023-06-06 00:26:07 -07:00
lunarcleint cca30b5697 color wheel and dropdown event params 2023-06-06 00:15:36 -07:00
InkyBox 75f6bec829 Rerevert Commit Fuck You 2023-05-22 13:47:07 -05:00