Commit Graph

131 Commits

Author SHA1 Message Date
WillyJL
aa66330ccc Merge remote-tracking branch 'ul/dev' into mntm-dev --nobuild 2025-12-09 23:27:26 +01:00
MX
c8e756a3c5 enable winter anims 2025-12-03 22:52:09 +03:00
MX
c87205fe9a upd changelog and readme 2025-11-04 16:12:19 +03:00
MX
dbc5895b30 upd anims 2025-10-13 22:26:31 +03:00
Willy-JL
a0619c01d7 Merge remote-tracking branch 'ofw/dev' into mntm-dev --nobuild 2025-04-01 07:42:00 +00:00
Konstantin Volkov
cf63b38ce0 [FL-3972]: Added Doom animation (#4164)
* added new doom animation, updated manifests, re-enabled some animations

* added doom animation to manifest

* reverted manifest to original, new animation added

* fixed metadata and images

* removed old holiday animation

---------

Co-authored-by: doomwastaken <k.volkov@flipperdevices.com>
Co-authored-by: hedger <hedger@users.noreply.github.com>
2025-03-31 18:36:17 +04:00
MX
dd009e38df Merge remote-tracking branch 'OFW/doom/3972-add-doom-animation' into dev 2025-03-28 14:39:47 +03:00
doomwastaken
1c080ecc63 reverted manifest to original, new animation added 2025-03-28 14:15:36 +03:00
doomwastaken
bfe9f20650 added doom animation to manifest 2025-03-28 14:11:22 +03:00
doomwastaken
0c5cab9f1a added new doom animation, updated manifests, re-enabled some animations 2025-03-28 14:09:32 +03:00
Willy-JL
72281d9666 Merge remote-tracking branch 'ofw/dev' into mntm-dev 2025-02-18 16:25:29 +00:00
MX
36327877ba move seasonal anims to temp folder
todo: make automatic selection???
2025-02-13 04:04:36 +03:00
MX
a3ffdac763 Merge remote-tracking branch 'OFW/dev' into dev 2025-02-10 21:55:03 +03: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
MX
1739f57c7a enable anim 2024-12-24 01:02:05 +03:00
MX
9c5341edb1 Merge remote-tracking branch 'OFW/dev' into dev 2024-12-23 15:56:12 +03: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
MX
00a0c6ee1a Merge remote-tracking branch 'OFW/dev' into dev 2024-09-04 03:16:37 +03: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
MX
ce1ac07fbe Merge remote-tracking branch 'OFW/dev' into dev 2024-07-10 21:18:49 +03: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
MX
1afa3f7ef3 Merge remote-tracking branch 'OFW/dev' into dev 2024-05-15 18:22:54 +03: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
MX
71111b0d2f sync anims with OFW
[FL-3776] Add the Freedom_2_dolphins animation
2024-03-20 12:48:50 +03: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
MX
924520a9a7 Revert "its time to enable this one"
This reverts commit bc1fdabce4.
2024-01-13 03:24:00 +03:00
MX
bc1fdabce4 its time to enable this one 2023-12-20 01:25:35 +03:00
Willy-JL
05ae0dbf14 Merge branch 'dev' of https://github.com/flipperdevices/flipperzero-firmware into dev 2023-12-02 06:09:01 +00:00
MX
fdcfd5996b Merge branch 'ofw_dev' into dev 2023-12-01 02:33:41 +03: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