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

2026-04-24 03:29:57 -07:00 · 2023-02-10 17:36:22 +01:00
parent 5b1fe0caa0
commit 708dd167c8
2348 changed files with 298 additions and 216 deletions
--- a/assets/dolphin/external/L1_Leaving_sad_128x64/frame_0.png
+++ b/assets/dolphin/external/L1_Leaving_sad_128x64/frame_0.png
--- a/assets/dolphin/external/L1_Leaving_sad_128x64/frame_1.png
+++ b/assets/dolphin/external/L1_Leaving_sad_128x64/frame_1.png
--- a/assets/dolphin/external/L1_Leaving_sad_128x64/frame_10.png
+++ b/assets/dolphin/external/L1_Leaving_sad_128x64/frame_10.png
--- a/assets/dolphin/external/L1_Leaving_sad_128x64/frame_11.png
+++ b/assets/dolphin/external/L1_Leaving_sad_128x64/frame_11.png
--- a/assets/dolphin/external/L1_Leaving_sad_128x64/frame_12.png
+++ b/assets/dolphin/external/L1_Leaving_sad_128x64/frame_12.png
--- a/assets/dolphin/external/L1_Leaving_sad_128x64/frame_2.png
+++ b/assets/dolphin/external/L1_Leaving_sad_128x64/frame_2.png
--- a/assets/dolphin/external/L1_Leaving_sad_128x64/frame_3.png
+++ b/assets/dolphin/external/L1_Leaving_sad_128x64/frame_3.png
--- a/assets/dolphin/external/L1_Leaving_sad_128x64/frame_4.png
+++ b/assets/dolphin/external/L1_Leaving_sad_128x64/frame_4.png
--- a/assets/dolphin/external/L1_Leaving_sad_128x64/frame_5.png
+++ b/assets/dolphin/external/L1_Leaving_sad_128x64/frame_5.png
--- a/assets/dolphin/external/L1_Leaving_sad_128x64/frame_6.png
+++ b/assets/dolphin/external/L1_Leaving_sad_128x64/frame_6.png
--- a/assets/dolphin/external/L1_Leaving_sad_128x64/frame_7.png
+++ b/assets/dolphin/external/L1_Leaving_sad_128x64/frame_7.png
--- a/assets/dolphin/external/L1_Leaving_sad_128x64/frame_8.png
+++ b/assets/dolphin/external/L1_Leaving_sad_128x64/frame_8.png
--- a/assets/dolphin/external/L1_Leaving_sad_128x64/frame_9.png
+++ b/assets/dolphin/external/L1_Leaving_sad_128x64/frame_9.png
--- a/assets/dolphin/external/L1_Leaving_sad_128x64/meta.txt
+++ b/assets/dolphin/external/L1_Leaving_sad_128x64/meta.txt
@@ -1,32 +0,0 @@
-Filetype: Flipper Animation
-Version: 1
-
-Width: 128
-Height: 64
-Passive frames: 4
-Active frames: 42
-Frames order: 0 1 2 1 3 4 5 6 7 8 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 10 11 12 4 3
-Active cycles: 1
-Frame rate: 2
-Duration: 360
-Active cooldown: 7
-
-Bubble slots: 1
-
-Slot: 0
-X: 51
-Y: 49
-Text: Adios.
-AlignH: Center
-AlignV: Top
-StartFrame: 6
-EndFrame: 9
-
-Slot: 0
-X: 1
-Y: 49
-Text: Forgot something...
-AlignH: Center
-AlignV: Top
-StartFrame: 42
-EndFrame: 45