Commit Graph
25 Commits
Author SHA1 Message Date
Ralty 0b0b30239e oops 2025-07-19 19:19:25 +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 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
lunarcleint 1198a7d983 charter batching optimzatioin 2025-03-09 03:22:34 -07:00
TheZoroForce240 3e13bf50c6 Continuous bpm change event, lots of other reworks and fixes 2025-02-01 21:13:46 +00:00
TheZoroForce240andGitHub 2f6207b11b fixing beat and measure lines with time sig changes (#2) 2025-01-11 14:16:46 -05:00
lunarcleint 16f500ff69 radioactive events 2024-11-11 15:16:16 -07:00
Ne_Eo f54c485d0c Important rendering bug fix + optimizations 2024-11-08 23:49:52 +01:00
lunarcleint bbecab14c0 GUYS THIS IS DEV BRANCH 2024-10-14 18:15:56 -07:00
TheZoroForce240 da18a1a570 Merge branch 'new-editors' into zoro-charterstuffs 2024-08-25 14:49:21 +01:00
Ne_Eo 6359463850 Small optimization 2024-08-25 15:40:03 +02:00
Ne_Eo e5d25ccf26 Optimizations + FlxLayers 2024-08-25 14:54:24 +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 879531a397 Optimization 2024-07-31 20:31:42 +02:00
lunarcleint 960ab248ec cleaner code 2024-04-15 14:21:00 -07:00
NeeEoo d17ea72c74 Organize Imports and remove unused Imports 2024-04-11 14:23:02 +02:00
NeeEoo 7b279bfed0 Small cleanup 2024-04-05 20:25:10 +02:00
lunarcleint d343018d90 waveforms bassicly done 2024-03-20 19:38:31 -07:00
lunarcleint 864239108a wip ui for waveforms 2024-03-20 15:52:23 -07:00
lunarcleint c5a0f5eab2 s 2024-03-20 05:00:36 -07:00
NeeEoo f8b20774e3 Remove useless indentation 2024-03-16 21:15:18 +01:00
NeeEoo 4a34bb19d7 Cleanup 2024-03-05 17:54:34 +01:00
lunarcleint a033e92476 beatsPerMeasure 2023-11-19 15:00:31 -07:00
Frakist 14491a0b9c fixed the dumbass conductor line in charter 2023-10-01 15:37:13 +03:00
lunarcleint 0d17236e3b sexy grid layering (shitton of bug fixes) 2023-09-04 13:39:53 -07:00