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

2026-05-26 05:54:46 -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/resources/dolphin/L1_Read_books_128x64/frame_0.bm
+++ b/assets/resources/dolphin/L1_Read_books_128x64/frame_0.bm
--- a/assets/resources/dolphin/L1_Read_books_128x64/frame_1.bm
+++ b/assets/resources/dolphin/L1_Read_books_128x64/frame_1.bm
--- a/assets/resources/dolphin/L1_Read_books_128x64/frame_2.bm
+++ b/assets/resources/dolphin/L1_Read_books_128x64/frame_2.bm
--- a/assets/resources/dolphin/L1_Read_books_128x64/frame_3.bm
+++ b/assets/resources/dolphin/L1_Read_books_128x64/frame_3.bm
--- a/assets/resources/dolphin/L1_Read_books_128x64/frame_4.bm
+++ b/assets/resources/dolphin/L1_Read_books_128x64/frame_4.bm
--- a/assets/resources/dolphin/L1_Read_books_128x64/frame_5.bm
+++ b/assets/resources/dolphin/L1_Read_books_128x64/frame_5.bm
--- a/assets/resources/dolphin/L1_Read_books_128x64/frame_6.bm
+++ b/assets/resources/dolphin/L1_Read_books_128x64/frame_6.bm
--- a/assets/resources/dolphin/L1_Read_books_128x64/frame_7.bm
+++ b/assets/resources/dolphin/L1_Read_books_128x64/frame_7.bm
--- a/assets/resources/dolphin/L1_Read_books_128x64/frame_8.bm
+++ b/assets/resources/dolphin/L1_Read_books_128x64/frame_8.bm
--- a/assets/resources/dolphin/L1_Read_books_128x64/meta.txt
+++ b/assets/resources/dolphin/L1_Read_books_128x64/meta.txt
@@ -1,23 +0,0 @@
-Filetype: Flipper Animation
-Version: 1
-
-Width: 128
-Height: 64
-Passive frames: 13
-Active frames: 2
-Frames order: 0 1 0 2 3 3 4 0 1 5 6 1 1 7 8
-Active cycles: 2
-Frame rate: 2
-Duration: 360
-Active cooldown: 5
-
-Bubble slots: 1
-
-Slot: 0
-X: 5
-Y: 28
-Text: Predictable twist
-AlignH: Right
-AlignV: Bottom
-StartFrame: 14
-EndFrame: 16