Revert "Merge branch 'dev' of https://github.com/ClaraCrazy/Flipper-Xtreme into dev"

This reverts commit 708dd167c8.
2026-05-26 05:54:46 -07:00 · 2023-02-10 20:50:30 +00:00
parent 176c01c0da
commit 6555082e2a
2348 changed files with 216 additions and 298 deletions
--- a/assets/resources/dolphin/L1_Sleigh_ride_128x64/frame_0.bm
+++ b/assets/resources/dolphin/L1_Sleigh_ride_128x64/frame_0.bm
--- a/assets/resources/dolphin/L1_Sleigh_ride_128x64/frame_1.bm
+++ b/assets/resources/dolphin/L1_Sleigh_ride_128x64/frame_1.bm
--- a/assets/resources/dolphin/L1_Sleigh_ride_128x64/frame_10.bm
+++ b/assets/resources/dolphin/L1_Sleigh_ride_128x64/frame_10.bm
--- a/assets/resources/dolphin/L1_Sleigh_ride_128x64/frame_11.bm
+++ b/assets/resources/dolphin/L1_Sleigh_ride_128x64/frame_11.bm
--- a/assets/resources/dolphin/L1_Sleigh_ride_128x64/frame_12.bm
+++ b/assets/resources/dolphin/L1_Sleigh_ride_128x64/frame_12.bm
--- a/assets/resources/dolphin/L1_Sleigh_ride_128x64/frame_13.bm
+++ b/assets/resources/dolphin/L1_Sleigh_ride_128x64/frame_13.bm
--- a/assets/resources/dolphin/L1_Sleigh_ride_128x64/frame_14.bm
+++ b/assets/resources/dolphin/L1_Sleigh_ride_128x64/frame_14.bm
--- a/assets/resources/dolphin/L1_Sleigh_ride_128x64/frame_15.bm
+++ b/assets/resources/dolphin/L1_Sleigh_ride_128x64/frame_15.bm
--- a/assets/resources/dolphin/L1_Sleigh_ride_128x64/frame_16.bm
+++ b/assets/resources/dolphin/L1_Sleigh_ride_128x64/frame_16.bm
--- a/assets/resources/dolphin/L1_Sleigh_ride_128x64/frame_17.bm
+++ b/assets/resources/dolphin/L1_Sleigh_ride_128x64/frame_17.bm
--- a/assets/resources/dolphin/L1_Sleigh_ride_128x64/frame_18.bm
+++ b/assets/resources/dolphin/L1_Sleigh_ride_128x64/frame_18.bm
--- a/assets/resources/dolphin/L1_Sleigh_ride_128x64/frame_19.bm
+++ b/assets/resources/dolphin/L1_Sleigh_ride_128x64/frame_19.bm
--- a/assets/resources/dolphin/L1_Sleigh_ride_128x64/frame_2.bm
+++ b/assets/resources/dolphin/L1_Sleigh_ride_128x64/frame_2.bm
--- a/assets/resources/dolphin/L1_Sleigh_ride_128x64/frame_20.bm
+++ b/assets/resources/dolphin/L1_Sleigh_ride_128x64/frame_20.bm
--- a/assets/resources/dolphin/L1_Sleigh_ride_128x64/frame_21.bm
+++ b/assets/resources/dolphin/L1_Sleigh_ride_128x64/frame_21.bm
--- a/assets/resources/dolphin/L1_Sleigh_ride_128x64/frame_22.bm
+++ b/assets/resources/dolphin/L1_Sleigh_ride_128x64/frame_22.bm
--- a/assets/resources/dolphin/L1_Sleigh_ride_128x64/frame_23.bm
+++ b/assets/resources/dolphin/L1_Sleigh_ride_128x64/frame_23.bm
--- a/assets/resources/dolphin/L1_Sleigh_ride_128x64/frame_24.bm
+++ b/assets/resources/dolphin/L1_Sleigh_ride_128x64/frame_24.bm
--- a/assets/resources/dolphin/L1_Sleigh_ride_128x64/frame_25.bm
+++ b/assets/resources/dolphin/L1_Sleigh_ride_128x64/frame_25.bm
--- a/assets/resources/dolphin/L1_Sleigh_ride_128x64/frame_26.bm
+++ b/assets/resources/dolphin/L1_Sleigh_ride_128x64/frame_26.bm
--- a/assets/resources/dolphin/L1_Sleigh_ride_128x64/frame_27.bm
+++ b/assets/resources/dolphin/L1_Sleigh_ride_128x64/frame_27.bm
--- a/assets/resources/dolphin/L1_Sleigh_ride_128x64/frame_28.bm
+++ b/assets/resources/dolphin/L1_Sleigh_ride_128x64/frame_28.bm
--- a/assets/resources/dolphin/L1_Sleigh_ride_128x64/frame_29.bm
+++ b/assets/resources/dolphin/L1_Sleigh_ride_128x64/frame_29.bm
--- a/assets/resources/dolphin/L1_Sleigh_ride_128x64/frame_3.bm
+++ b/assets/resources/dolphin/L1_Sleigh_ride_128x64/frame_3.bm
--- a/assets/resources/dolphin/L1_Sleigh_ride_128x64/frame_30.bm
+++ b/assets/resources/dolphin/L1_Sleigh_ride_128x64/frame_30.bm
--- a/assets/resources/dolphin/L1_Sleigh_ride_128x64/frame_31.bm
+++ b/assets/resources/dolphin/L1_Sleigh_ride_128x64/frame_31.bm
--- a/assets/resources/dolphin/L1_Sleigh_ride_128x64/frame_32.bm
+++ b/assets/resources/dolphin/L1_Sleigh_ride_128x64/frame_32.bm
--- a/assets/resources/dolphin/L1_Sleigh_ride_128x64/frame_33.bm
+++ b/assets/resources/dolphin/L1_Sleigh_ride_128x64/frame_33.bm
--- a/assets/resources/dolphin/L1_Sleigh_ride_128x64/frame_34.bm
+++ b/assets/resources/dolphin/L1_Sleigh_ride_128x64/frame_34.bm
--- a/assets/resources/dolphin/L1_Sleigh_ride_128x64/frame_35.bm
+++ b/assets/resources/dolphin/L1_Sleigh_ride_128x64/frame_35.bm
--- a/assets/resources/dolphin/L1_Sleigh_ride_128x64/frame_36.bm
+++ b/assets/resources/dolphin/L1_Sleigh_ride_128x64/frame_36.bm
--- a/assets/resources/dolphin/L1_Sleigh_ride_128x64/frame_4.bm
+++ b/assets/resources/dolphin/L1_Sleigh_ride_128x64/frame_4.bm
--- a/assets/resources/dolphin/L1_Sleigh_ride_128x64/frame_5.bm
+++ b/assets/resources/dolphin/L1_Sleigh_ride_128x64/frame_5.bm
--- a/assets/resources/dolphin/L1_Sleigh_ride_128x64/frame_6.bm
+++ b/assets/resources/dolphin/L1_Sleigh_ride_128x64/frame_6.bm
--- a/assets/resources/dolphin/L1_Sleigh_ride_128x64/frame_7.bm
+++ b/assets/resources/dolphin/L1_Sleigh_ride_128x64/frame_7.bm
--- a/assets/resources/dolphin/L1_Sleigh_ride_128x64/frame_8.bm
+++ b/assets/resources/dolphin/L1_Sleigh_ride_128x64/frame_8.bm
--- a/assets/resources/dolphin/L1_Sleigh_ride_128x64/frame_9.bm
+++ b/assets/resources/dolphin/L1_Sleigh_ride_128x64/frame_9.bm
--- a/assets/resources/dolphin/L1_Sleigh_ride_128x64/meta.txt
+++ b/assets/resources/dolphin/L1_Sleigh_ride_128x64/meta.txt
@@ -0,0 +1,23 @@
+Filetype: Flipper Animation
+Version: 1
+
+Width: 128
+Height: 64
+Passive frames: 18
+Active frames: 19
+Frames order: 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36
+Active cycles: 1
+Frame rate: 2
+Duration: 360
+Active cooldown: 7
+
+Bubble slots: 1
+
+Slot: 0
+X: 21
+Y: 25
+Text: AAAAaAAAAHHh!!
+AlignH: Right
+AlignV: Bottom
+StartFrame: 30
+EndFrame: 32