Commit Graph

110 Commits

Author SHA1 Message Date
Willy-JL
72281d9666 Merge remote-tracking branch 'ofw/dev' into mntm-dev 2025-02-18 16:25:29 +00:00
Astra
5bd35f435b [FL-3951] Add the Showtime animation (#4100)
* Add the Showtime animation
* Format images
2025-02-10 18:35:39 +09:00
Willy-JL
f2011a446b Merge remote-tracking branch 'ofw/dev' into mntm-dev 2025-01-11 05:06:46 +00:00
Astra
6d20bc7e50 [FL-3938] Add winter animations (#4032)
* Add winter animations
* Format images

Co-authored-by: あく <alleteam@gmail.com>
2024-12-23 10:09:40 +09:00
Willy-JL
6ba39dd7a8 Merge remote-tracking branch 'ofw/dev' into mntm-dev --nobuild 2024-08-29 23:20:07 +02:00
Astra
7c88a4a8f1 [FL-3899] Add the Procrastination animation (#3860)
* Add the Procrastination animation: sorry been putting off doing this for a while
* Reformat images
2024-08-29 21:21:25 +09:00
Willy-JL
637bc6d0ad Desktop: Fix butthurt and levels, respects Flipper mood better 2024-07-10 16:14:22 +01:00
Willy-JL
6f2580405e Merge remote-tracking branch 'ofw/dev' into mntm-dev 2024-07-10 15:37:47 +01:00
Astra
d60ce6edde [FL-3866] Intruder animation (#3779) 2024-07-10 13:02:07 +01:00
Willy-JL
f7e38c72ec Desktop: Add TV anim from OFW, rebalance some levels 2024-06-04 03:47:43 +01:00
Willy-JL
6fc958681e Merge branch 'dev' of https://github.com/flipperdevices/flipperzero-firmware into mntm-dev 2024-05-14 00:13:54 +01:00
Astra
b60e6042a5 [FL-3813] Add the Akira animation (#3636)
* Add the Akira animation
* Dolphin: adjust weight for new animation

Co-authored-by: あく <alleteam@gmail.com>
2024-05-13 15:47:07 +01:00
Chonk_m
de265b282a Add Dolphin 3d printing and wardriving animation (#86)
* Add files via upload

* Add files via upload

* Update manifest.txt

* Update manifest.txt

* Rebalance levels

* Naming consistency

* Consistent cycle time

---------

Co-authored-by: Willy-JL <49810075+Willy-JL@users.noreply.github.com>
2024-04-10 06:16:34 +01:00
Willy-JL
d610e20060 Merge branch 'dev' of https://github.com/flipperdevices/flipperzero-firmware into mntm-dev 2024-03-21 02:07:27 +00:00
Astra
ff0952d66a [FL-3776] Add the Freedom_2_dolphins animation (#3521)
* Add the Freedom_2_dolphins animation
* Dolphin: rebalance animation weights

Co-authored-by: あく <alleteam@gmail.com>
2024-03-20 18:37:07 +09:00
Willy-JL
b7220237de Small bump in the road
- Update assets and references for new project
- Revert DFU image and CLI motd
- Remove NSFW text and flag
- Remove credits animation (will be replaced with a setting menu soon)
- New EvilPortal example HTML and better error message
- Initial standalone naming for asset packs and mainmenu apps
- File migration fixes/improvements
- Remove hotfix workflow
2024-03-01 06:11:16 +00:00
Willy-JL
05ae0dbf14 Merge branch 'dev' of https://github.com/flipperdevices/flipperzero-firmware into dev 2023-12-02 06:09:01 +00:00
Astra
a849d49c92 [FL-3682] Add the secret door animation (#3233)
Co-authored-by: あく <alleteam@gmail.com>
2023-11-30 18:51:38 +09:00
Willy-JL
0d3a12c00d Add back option to disable credits for base pack 2023-11-29 17:52:31 +00:00
Willy-JL
76a16af423 Show anim errors, move credits to default pack
Remove fallback anim setting
Retry when anim manager resumes error anim
Always skip error anim when manager picks new anim
2023-11-28 03:13:03 +00:00
Willy-JL
4ad6297285 Merge branch 'dev' of https://github.com/DarkFlippers/unleashed-firmware into dev --nobuild 2023-09-30 19:26:24 +01:00
MX
5031540a8f sync anims 2023-09-25 16:53:46 +03:00
MX
fc1ec55a40 Merge branch 'ofw_dev' into dev 2023-09-25 16:53:05 +03:00
Astra
a6bb9698ef [FL-3609] Add the coding in the shell animation (#3106)
Co-authored-by: あく <alleteam@gmail.com>
2023-09-25 17:03:51 +09:00
Willy-JL
1e2f2cc784 Merge branch 'dev' of https://github.com/DarkFlippers/unleashed-firmware into xfw-dev --nobuild 2023-08-13 02:33:47 +02:00
MX
4b81046b6f Merge branch 'ofw-dev' into dev 2023-08-11 18:08:12 +03:00
Astra
12d9b1069c [FL-3480] Add the Sad song animation (#2973)
Co-authored-by: あく <alleteam@gmail.com>
2023-08-11 01:31:01 +09:00
Willy-JL
9d1987e661 Merge branch 'dev' of https://github.com/DarkFlippers/unleashed-firmware into xfw-dev 2023-07-13 20:08:56 +02:00
MX
c4b04a06bb Merge branch 'ofw-dev' into dev 2023-07-12 21:19:16 +03:00
あく
b1e13d44b8 Dolphin: add new animation (#2865) 2023-07-12 12:28:51 +04:00
Willy-JL
6517485d0d Typo 2023-06-07 21:21:55 +01:00
Willy-JL
b48579e4a7 Add missing anims, fix butthurt values 2023-06-07 21:19:31 +01:00
MX
0d394a6f87 Merge branch 'ofw-dev' into dev 2023-06-07 00:29:06 +03:00
あく
61394b8be4 [FL-3352] Dolphin: new animation (#2735)
Co-authored-by: hedger <hedger@users.noreply.github.com>
2023-06-06 22:04:27 +04:00
MX
a783612076 Merge branch 'ofw-dev' into dev 2023-05-30 19:30:08 +03:00
あく
a76c189ca5 [FL-3335] Dolphin: new animation (#2713) 2023-05-30 20:47:28 +09:00
Willy-JL
afc1fb0c3f Ignore butthurt in sfw pack (fix credits bug) 2023-05-14 21:54:15 +01:00
Willy-JL
efe6dbf008 Revert "Formatting"
This reverts commit a441feec83.
2023-05-09 18:11:05 +01:00
Willy-JL
a441feec83 Formatting 2023-03-28 23:59:32 +01:00
Willy-JL
ed38c1fa68 Update animation manifests 2023-03-18 00:09:57 +00:00
MX
dd99c22792 Merge branch 'fz-dev' into dev 2023-03-14 19:55:16 +03:00
あく
ccaa3864d5 Dolphin: new spring animation, weight adjust, drop winter animation. (#2489)
* Dolphin: add new spring animation, drop winter animation, adjust weights
* Readme: update application folder structure info
2023-03-15 01:02:27 +10:00
Willy-JL
fe6a95c93d Rebalance some SFW anim levels 2023-02-17 23:54:34 +00:00
Willy-JL
2e135f078e Remove holiday animations 2023-02-17 23:50:26 +00:00
Willy-JL
3e7c67ba4c Sort sfw anims like ofw 2023-02-17 23:49:31 +00:00
MX
85f6ee2870 Merge branch 'fz-dev' into dev 2023-02-15 23:33:35 +03:00
あく
25e8947282 Dolphin: drop holiday animation (#2398) 2023-02-15 20:05:08 +10:00
MX
416a6425de Disable New Year Animation 2023-02-11 04:33:47 +03:00
Willy-JL
6555082e2a Revert "Merge branch 'dev' of https://github.com/ClaraCrazy/Flipper-Xtreme into dev"
This reverts commit 708dd167c8.
2023-02-10 20:50:30 +00:00
VerstreuteSeele
708dd167c8 Merge branch 'dev' of https://github.com/ClaraCrazy/Flipper-Xtreme into dev 2023-02-10 17:36:22 +01:00