Commit Graph

3374 Commits

Author SHA1 Message Date
RogueMaster e631285ff3 Update ReadMe.md 2022-10-14 16:25:24 -04:00
RogueMaster 205f8e11af Merge branch 'UNLEASHED' into 420 2022-10-14 16:24:27 -04:00
MX f96f2e2411 Merge branch 'fz-dev' into dev 2022-10-14 22:25:48 +03:00
MX 6442caa3e4 Revert "fbt - fix flash usb without resources "
This reverts commit ce173fd44c.
2022-10-14 22:25:11 +03:00
あく f06930e4ae Desktop: fix fap in settings (#1877) 2022-10-14 21:23:06 +03:00
RogueMaster d0d94a9b82 Update ReadMe.md 2022-10-14 14:11:40 -04:00
RogueMaster 59181c9fe1 Merge branch 'UNLEASHED' into 420 2022-10-14 14:10:52 -04:00
Kevin Kwok 865baed0bb Fix FileNotFoundError in ./fbt flash_usb (#1876)
* Fix FileNotFoundError in ./fbt flash_usb
* scripts: update.py: proper fix for file naming

Co-authored-by: あく <alleteam@gmail.com>
Co-authored-by: hedger <hedger@nanode.su>
2022-10-15 03:07:23 +09:00
Nikolay Minaylov f81999ea4a Fix number of dolphin_apps (#1874)
Co-authored-by: あく <alleteam@gmail.com>
2022-10-15 02:35:53 +09:00
MX 89a4b77e73 Merge branch 'fz-dev' into dev 2022-10-14 20:23:11 +03:00
gornekich ead9f134f4 [FL-2623] Add BLE disconnect request #1686
Co-authored-by: LionZXY <nikita@kulikof.ru>
Co-authored-by: あく <alleteam@gmail.com>
2022-10-15 02:21:23 +09:00
Johannes Mittendorfer 9ff29d12b2 Fix typo in fap loader logging (#1875) 2022-10-15 01:54:52 +09:00
RogueMaster 99ea4372b3 Update ReadMe.md 2022-10-14 12:53:01 -04:00
RogueMaster b302323a12 Merge branch 'UNLEASHED' into 420 2022-10-14 12:50:47 -04:00
MX 5f3637ca44 update discord link with qr code 2022-10-14 19:48:05 +03:00
RogueMaster e6013ea488 Update ReadMe.md 2022-10-14 12:44:56 -04:00
RogueMaster a1fe411f6c Merge branch '420' of https://github.com/RogueMaster/flipperzero-firmware-wPlugins into 420 2022-10-14 12:43:50 -04:00
RogueMaster 78b88feed0 Update ReadMe.md 2022-10-14 12:43:37 -04:00
RogueMaster dd176ba6f5 Merge pull request #363 from skizzophrenic/420
Fix a mis-upload of gui.c SORRY!
2022-10-14 12:39:31 -04:00
MX effcb445ce update minesweeper
https://github.com/panki27/minesweeper
2022-10-14 19:19:44 +03:00
MX 55bad280ee update changelog 2022-10-14 17:59:53 +03:00
nminaylov b003ede76c Fix number of dolphin_apps 2022-10-14 17:59:09 +03:00
TalkingSasquach 47f8a50f64 Update gui.c 2022-10-14 09:46:52 -04:00
RogueMaster 75192d1c5b Update ReadMe.md 2022-10-13 23:37:06 -04:00
RogueMaster e8b5d185a8 Update ReadMe.md 2022-10-13 23:29:27 -04:00
RogueMaster 5f1b1fc326 Update ReadMe.md 2022-10-13 23:11:24 -04:00
RogueMaster ad9d765de4 Update ReadMe.md 2022-10-13 23:08:48 -04:00
RogueMaster 6a457d92c4 Merge branch '420' of https://github.com/RogueMaster/flipperzero-firmware-wPlugins into 420 2022-10-13 23:08:39 -04:00
RogueMaster 124faecabd Update desktop_scene_main.c 2022-10-13 23:05:51 -04:00
RogueMaster 64ee6eb1b8 Merge pull request #360 from skizzophrenic/420
Thank you!
2022-10-13 23:04:43 -04:00
RogueMaster 700ac598a9 Update application.fam 2022-10-13 23:04:17 -04:00
RogueMaster 35f3992246 Merge branch '420' into pr/360 2022-10-13 23:02:11 -04:00
RogueMaster 81a0bd8db7 Update ReadMe.md 2022-10-13 23:01:14 -04:00
RogueMaster a323a665a3 Merge branch 'UNLEASHED' into 420 2022-10-13 23:01:00 -04:00
RogueMaster e7668b16d1 Merge branch '420' of https://github.com/RogueMaster/flipperzero-firmware-wPlugins into 420 2022-10-13 21:46:26 -04:00
RogueMaster 18baf63665 Update ReadMe.md 2022-10-13 21:46:18 -04:00
RogueMaster 25653f17c5 Merge pull request #362 from Haseosama/420
Fixed Tanks Game
2022-10-13 21:26:01 -04:00
MX 57362b3eab update changelog 2022-10-14 01:53:09 +03:00
MX cb0d9ec591 add sec+ 1.0/2.0 433mhz in add manually, and run fbt fmt 2022-10-14 01:49:32 +03:00
MX dad4772bec update minesweeper
https://github.com/panki27/minesweeper
2022-10-14 01:43:57 +03:00
MX a16542cda6 update readme 2022-10-14 01:36:37 +03:00
MX a5d22154a9 update changelog 2022-10-14 01:34:12 +03:00
MX ce173fd44c fbt - fix flash usb without resources
this is not "stolen" from official, bug are present in ofw at current moment
2022-10-14 01:31:44 +03:00
MX d547307357 Fix DTM Neo encoder 2022-10-14 01:30:20 +03:00
MX c198a51b1c Merge branch 'fz-dev' into dev 2022-10-14 01:11:00 +03:00
Haseo 0bb29f9c5a Fixed compile and game start 2022-10-13 23:31:50 +02:00
Haseo 9fb71bd00e Update hal.c 2022-10-13 22:59:05 +02:00
Haseo cf71e3270d Delete Chip8 2022-10-13 22:45:20 +02:00
TalkingSasquach 9102a19106 Adding Tuning Fork, Removed Broken Chip8 2022-10-13 16:45:01 -04:00
RogueMaster ec49915e1c Merge branch 'ofwdev' into 420 2022-10-13 15:36:56 -04:00