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
parent c4af35d9dd 34b4de31fc
commit e4be3bd427
32 changed files with 1288 additions and 311 deletions
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextureAtlas imagePath="arrow-down.png">
+	<SubTexture name="tail" x="0" y="0" width="8" height="3"/>
+	<SubTexture name="segment" x="0" y="3" width="8" height="1"/>
+	<SubTexture name="arrow" x="0" y="6" width="8" height="6"/>
+</TextureAtlas>