From 3250cdb4366d93190f7d861dc80ce5fe79ec0f0e Mon Sep 17 00:00:00 2001 From: NyxieFemboy <132237065+NyxieFemboy@users.noreply.github.com> Date: Tue, 18 Feb 2025 13:37:49 -0500 Subject: [PATCH] I think this should be everything? --- .../charter/event-icons/BPM Change End.png | Bin 215 -> 461 bytes .../charter/event-icons/BPM Change Start.png | Bin 204 -> 461 bytes .../charter/event-icons/components/end-plus.png | Bin 0 -> 427 bytes .../charter/event-icons/components/note.png | Bin 0 -> 402 bytes .../event-icons/components/start-plus.png | Bin 0 -> 427 bytes source/funkin/editors/charter/Charter.hx | 2 +- 6 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 assets/images/editors/charter/event-icons/components/end-plus.png create mode 100644 assets/images/editors/charter/event-icons/components/note.png create mode 100644 assets/images/editors/charter/event-icons/components/start-plus.png diff --git a/assets/images/editors/charter/event-icons/BPM Change End.png b/assets/images/editors/charter/event-icons/BPM Change End.png index c8e19949b03b6e8b7506d5667a6adf0e807bd3e6..28248791e3df48d2c3a33773ce5de83c4a78d803 100644 GIT binary patch literal 461 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G|^0G|+7Af06<`v3p`zeoBuC$IpymWIWeK#Hv-$S)Wu{{KJ2=KV|d14TFs zJR*x382Ao>Fr%o3R|8N`qQo_#Bsf2?|U7@5K1OhC3FBNNy+Q9yQPI}2Dm3&;k6 zPi2e@FMyte(P)-30Hr3dGl0BeU}S8-xBy}*$VS!$5R;|=*&x6KG?xjiGRV>b$b#xJ zG%x_k_E{eczbwAT56JZKba4#P2<|->$k$-N!F-`i_xt`$2OAHb;s2Rfo5FHL&t<~b z9k-d5PGS7UV$_(kKqXp8I_7FYjpg*Z1FsEKu4EiHRea3#1%;Y|Np=5@ASV%`Zg!9uxu90 zG7|*~@?B$Q15%77L4Lsu4$p3+0XY$#E{-7;w@UjxxsEvSFyHPD`Tzgpfs&5e&I8k% zCSBaw_}`b~L`t*6Ertma-Djp0>8RY4;x3pvUC3m|?bTPxw*OTM4=oS1W%+(~t3r~t ki;K@o@dtA%8MA-#C(dA+xA5jsf1o7{p00i_>zopr0K|eyQUCw| diff --git a/assets/images/editors/charter/event-icons/BPM Change Start.png b/assets/images/editors/charter/event-icons/BPM Change Start.png index 4011f562a415895872efde5165c1de32876780d0..166e71ed8bd76656c5024738ecb38a05bb835b48 100644 GIT binary patch literal 461 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G|^0G|+7AgyPW`~Uy{j=ld`sy73<3Af4(fD~IvkY6xR{QrN3&HI<^2a0eO zctjR6Fz_7$VMb96uLhu?M2TxeNpOBzNqJ&XDnmeGW?qS&pKFMMsh**p(eFLX+kk4e zrABzBd3tIwZ~!^13{s4&42(dQ7Z6KB*&x?zFfxP1nSg9VMkcUtqJZqob{4RB7LW}B zpUM~+UI0A_qtPs707^|@XJ7%UG%zwYU|aw(6=Wmp0*FadfNT(80-DPNRvBbz0c1gS z85)2BfT7R&VEAS6J$^u@kEe@ch(>Vlxj?=K0}kd3WxC(@Z#vj`@C^UY#M%^=BYG|q zzV5iqv~&vNHx{GDoCPY;Leeo;3u-K<*By9mpmHVSxT)e}{ueRUAD--Bc*Vv%J-Im4 P8Dxj2tDnm{r-UW|c>HfZ delta 176 zcmX@he1>s?NUx>sjRj zMT{lc{{kt-k|4ie28U-i(tw-*PZ!6Kid(h)o?HhQIF4K?{PbU4eAj}v3mNq%HXLJ} zV>}_?s95J-)`(9bAv7(-Y9;msZ__hvEl1a ZM%9%}jImSdD}jbHc)I$ztaD0e0swPoLy!Of diff --git a/assets/images/editors/charter/event-icons/components/end-plus.png b/assets/images/editors/charter/event-icons/components/end-plus.png new file mode 100644 index 0000000000000000000000000000000000000000..540f2ba05abdeb4c3fec4128f87688107931c810 GIT binary patch literal 427 zcmeAS@N?(olHy`uVBq!ia0vp^AT}2VGmzZ%#=aj&F%}28J29*~C-V}>VM%xNb!1@J z*w6hZkrl}23GfMV%`y}Hd!%o30t-;Ub{T6DNL@*gU-19`{}~*#R(=8UISV`@iy0XB z4ude`@%$AjKtYKT*NBqf{Irtt#G+J&fW*wa5@05M2E zj7GDR0qE}u>GIB8}@G#l_{XhS3XaMte=P8<=OKysuS^1_nD3J94+p$~5 f|9JOo_9BQ!3HF6HKu+5QjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`ISV`@iy0XB4ude`@%$AjKtYKT*NBqf{Irtt#G+J&fW*wa5@05M2Ej7GDRfti6}0y_f>P=$e!u>s=(h^ZhQtP3C}O#!k&fC*?0 z6If-Cr3H`$)n#a40Fr%q^_#`1TRBxgrlY5eV~9rZ-3bSI85DUAzqwui`~$;6rnwLP ztQ7LD6scnRa94MN3d74M&yE|JMx6dSQ&Z&hZoVt&-xf@LWutw6Hxo~2o`5)O$I~>B N!Je*uF6*2UngB!1Spon6 literal 0 HcmV?d00001 diff --git a/assets/images/editors/charter/event-icons/components/start-plus.png b/assets/images/editors/charter/event-icons/components/start-plus.png new file mode 100644 index 0000000000000000000000000000000000000000..36dc91d13c0dd2cde7a8f7404f5c814d353cab05 GIT binary patch literal 427 zcmeAS@N?(olHy`uVBq!ia0vp^AT}2VGmzZ%#=aj&F%}28J29*~C-V}>VM%xNb!1@J z*w6hZkrl}23GfMV)w9a&*!!QQdNWYKNb^@KNL@*gU-19`{}~*#R(=8UISV`@iy0XB z4ude`@%$AjKtYKT*NBqf{Irtt#G+J&fW*wa5@05M2E zj7GDR0qE}u>gCZIV?V3k3Z7C;tMm!W|HNcQE` zZx*L+mdKI;Vst0C|O5{Qv*} literal 0 HcmV?d00001 diff --git a/source/funkin/editors/charter/Charter.hx b/source/funkin/editors/charter/Charter.hx index 55f74e70..f4d7c87e 100644 --- a/source/funkin/editors/charter/Charter.hx +++ b/source/funkin/editors/charter/Charter.hx @@ -1247,7 +1247,7 @@ class Charter extends UIState { + '\nStep: ${curStep}' + '\nBeat: ${curBeat}' + '\nMeasure: ${curMeasure}' - + '\nBPM: ${Conductor.bpm}' + + '\nBPM: ${Math.floor(Conductor.bpm*1000)/1000}' + '\nTime Signature: ${Conductor.beatsPerMeasure}/${Conductor.stepsPerBeat}'; if (charterCamera.zoom != (charterCamera.zoom = lerp(charterCamera.zoom, __camZoom, __firstFrame ? 1 : 0.125)))