RogueMaster
diff --git a/‎.utils/bulk-update-subtrees.sh
+2 b/‎.utils/bulk-update-subtrees.sh
+2
diff --git a/‎.utils/update-subtree.sh
+17-7 b/‎.utils/update-subtree.sh
+17-7
diff --git a/‎2048/.gitsubtree
+1-1 b/‎2048/.gitsubtree
+1-1
diff --git a/‎2048/application.fam
+1-1 b/‎2048/application.fam
+1-1
diff --git a/‎2048/game_2048.c
+6-6 b/‎2048/game_2048.c
+6-6
diff --git a/‎4inrow/.gitsubtree
+1-1 b/‎4inrow/.gitsubtree
+1-1
diff --git a/‎README.md
+18-11 b/‎README.md
+18-11
diff --git a/‎air_arkanoid/.catalog/CHANGELOG.md
+4 b/‎air_arkanoid/.catalog/CHANGELOG.md
+4
diff --git a/‎air_arkanoid/.catalog/README.md
+5 b/‎air_arkanoid/.catalog/README.md
+5
diff --git a/‎air_arkanoid/.catalog/screenshots/1.png
1.94 KB b/‎air_arkanoid/.catalog/screenshots/1.png
1.94 KB
diff --git a/‎air_arkanoid/.catalog/screenshots/2.png
1.19 KB b/‎air_arkanoid/.catalog/screenshots/2.png
1.19 KB
diff --git a/‎air_arkanoid/.catalog/screenshots/3.png
1.15 KB b/‎air_arkanoid/.catalog/screenshots/3.png
1.15 KB
diff --git a/‎air_arkanoid/.gitsubtree
+2 b/‎air_arkanoid/.gitsubtree
+2
diff --git a/‎air_arkanoid/application.fam
+18 b/‎air_arkanoid/application.fam
+18
diff --git a/‎air_arkanoid/assets/sprites/logo_air.fxbm
102 Bytes b/‎air_arkanoid/assets/sprites/logo_air.fxbm
102 Bytes
diff --git a/‎air_arkanoid/assets/sprites/logo_arkanoid.fxbm
327 Bytes b/‎air_arkanoid/assets/sprites/logo_arkanoid.fxbm
327 Bytes
diff --git a/‎air_arkanoid/engine/.gitsubtree
+1 b/‎air_arkanoid/engine/.gitsubtree
+1
@@ -11,3 +11,5 @@ for file in **/.gitsubtree; do
     echo -e "\n\nUpdating ${subtree}..."
     bash .utils/update-subtree.sh "${subtree}"
 done
+
+notify-send -a Git -i git "Subtree bulk update finished" "Double check merge commits" &> /dev/null | true
@@ -12,22 +12,32 @@ if [ "${1}" = "" ]; then
 fi
 path="${1}"
 
-while read repo branch subdir; do
+while read -u $remote repo branch subdir; do
     if [ "${repo:0:1}" = "#" ]; then
         continue
     fi
-    exec 69>&1
+    exec {capture}>&1
     if [ "${subdir}" = "/" ]; then
-        result="$(git subtree pull -P "${path}" "${repo}" "${branch}" -m "Merge ${path} from ${repo}" 2>&1 | tee /proc/self/fd/69)"
+        result="$(git subtree pull -P "${path}" "${repo}" "${branch}" -m "Merge ${path} from ${repo}" 2>&1 | tee /proc/self/fd/$capture)"
     else
-        result="$(bash .utils/subtree-subdir-helper.sh "${path}" "${repo}" "${branch}" "${subdir}" merge 2>&1 | tee /proc/self/fd/69)"
+        result="$(bash .utils/subtree-subdir-helper.sh "${path}" "${repo}" "${branch}" "${subdir}" merge 2>&1 | tee /proc/self/fd/$capture)"
     fi
     if grep "Automatic merge failed; fix conflicts and then commit the result." <<< "$result" > /dev/null; then
         echo "MERGE_MSG: Merge ${path} from ${repo}"
-        echo "Waiting for current index to be resolved..."
         notify-send -a Git -i git "Subtree merge failed" "Resolve current index to continue" &> /dev/null | true
-        while ! git diff --quiet || ! git diff --cached --quiet || ! git merge HEAD &> /dev/null; do
+        while true; do
+            echo "Resolve current index then press Enter..."
+            read
+            if git diff --quiet && git diff --cached --quiet && git merge HEAD &> /dev/null; then
+                break
+            fi
             sleep 1
         done
     fi
-done < "${path}/.gitsubtree"
+    if grep "Please commit your changes or stash them before you switch branches." <<< "$result" > /dev/null; then
+        exit 1
+    fi
+    if grep "fatal: working tree has modifications." <<< "$result" > /dev/null; then
+        exit 1
+    fi
+done {remote}< "${path}/.gitsubtree"
@@ -1,2 +1,2 @@
-https://github.com/eugene-kirzhanov/flipper-zero-2048-game main /
 https://github.com/xMasterX/all-the-plugins dev base_pack/game_2048
+https://github.com/eugene-kirzhanov/flipper-zero-2048-game main /
@@ -11,6 +11,6 @@ App(
     fap_icon="game_2048.png",
     fap_category="Games",
     fap_author="@eugene-kirzhanov",
-    fap_version="1.2",
+    fap_version="1.3",
     fap_description="Play the port of the 2048 game on Flipper Zero.",
 )
@@ -79,7 +79,7 @@ static void draw_digit(Canvas* canvas, uint8_t row, uint8_t column, uint8_t valu
     uint8_t top = FRAME_TOP + 1 + (row * (CELL_INNER_SIZE + 1));
 
     for(uint8_t r = 0; r < CELL_INNER_SIZE; r++) {
-        for(u_int8_t c = 0; c < CELL_INNER_SIZE; c++) {
+        for(uint8_t c = 0; c < CELL_INNER_SIZE; c++) {
             if(digits[value - 1][r][c] == 1) {
                 canvas_draw_dot(canvas, left + c, top + r);
             }
@@ -268,8 +268,8 @@ void move_down(uint8_t table[CELLS_COUNT][CELLS_COUNT], MoveResult* const move_r
 void add_new_digit(GameState* const game_state) {
     uint8_t empty_cell_indexes[CELLS_COUNT * CELLS_COUNT];
     uint8_t empty_cells_count = 0;
-    for(u_int8_t i = 0; i < CELLS_COUNT; i++) {
-        for(u_int8_t j = 0; j < CELLS_COUNT; j++) {
+    for(uint8_t i = 0; i < CELLS_COUNT; i++) {
+        for(uint8_t j = 0; j < CELLS_COUNT; j++) {
             if(game_state->table[i][j] == 0) {
                 empty_cell_indexes[empty_cells_count++] = i * CELLS_COUNT + j;
             }
@@ -278,8 +278,8 @@ void add_new_digit(GameState* const game_state) {
     if(empty_cells_count == 0) return;
 
     int random_empty_cell_index = empty_cell_indexes[random() % empty_cells_count];
-    u_int8_t row = random_empty_cell_index / CELLS_COUNT;
-    u_int8_t col = random_empty_cell_index % CELLS_COUNT;
+    uint8_t row = random_empty_cell_index / CELLS_COUNT;
+    uint8_t col = random_empty_cell_index % CELLS_COUNT;
 
     int random_value_percent = random() % 100;
     game_state->table[row][col] = random_value_percent < 90 ? 1 : 2; // 90% for 2, 25% for 4
@@ -334,7 +334,7 @@ bool is_game_over(GameState* const game_state) {
 
     // check if table contains at least one empty cell
     for(uint8_t i = 0; i < CELLS_COUNT; i++) {
-        for(u_int8_t j = 0; j < CELLS_COUNT; j++) {
+        for(uint8_t j = 0; j < CELLS_COUNT; j++) {
             if(game_state->table[i][j] == 0) {
                 FURI_LOG_I("is_game_over", "has empty cells");
                 return false;
 
@@ -1,2 +1,2 @@
-https://github.com/leo-need-more-coffee/flipperzero-4inrow main /
 https://github.com/xMasterX/all-the-plugins dev apps_source_code/4inrow_game
+https://github.com/leo-need-more-coffee/flipperzero-4inrow main /
@@ -1,25 +1,32 @@
-# Xtreme-Apps
-Bundle of external apps tweaked for Xtreme
+# Momentum-Apps
+Bundle of external apps tweaked for [Momentum Firmware](https://github.com/Next-Flip/Momentum-Firmware).
+
+> [!IMPORTANT]
+> These apps are already included with all Momentum Firmware releases.
+> This repository serves only as a way to keep them updated and maintained easier.
 
 ### Why?
-Apps we use for Xtreme are all modified (some lots more than others). This includes:
-- Removing duplicate icons that are part of firmware to **support our Asset Packs system**
+Many apps included in Momentum are modified (some lots more than others). This includes:
+- Removing/tweaking icons and/or their usages to **support our Asset Packs system**
 - Removing duplicate keyboard implementations to **use our extended system keyboard**
 - With our system keyboard also **support our CLI command `input keyboard`** to type with PC keyboard
-- **Moving location of save files** or changing how they are saved
-- **Changing application display names** to fit our scheme
+- **Moving location of save files** to a more appropriate location or changing how they are saved
+- **Changing application display names** to fit our naming scheme
 - **Changing how some menus work/look** or adding **new exclusive menus and features**
-- **Improving or extending functionality** and better integrating with Xtreme firmware
+- **Improving or extending functionality** and better integrating with the firmware
 - **Updating and fixing apps** that were abandoned by the original developers
 
 ### How?
-**Apps made by the Xtreme team are kept as plain code here. For all others we use git subtrees to pull updates from elsewhere but also keep our own tweaks.**
+**Apps made by the our team are developed right here, the latest versions will always originate from this repository.**
+
+**For all other apps we use git subtrees to pull updates from the creator's repository / other sources such as [@xMasterX's pack](https://github.com/xMasterX/all-the-plugins), while also keeping our own tweaks and additions.**
+
 We didn't want to have fork repos for each single app since it would get out of hand very quick. Instead, we opted for subtrees.
 
-Subtrees work in a very peculiar way, where they pull and compare commit history from a remote repo and apply it to a subdirectory of this repo.
-That's why the commit history for our repo is so huge, it contains all the commits for all the apps, plus our edits.
+Subtrees work in a very peculiar way: they pull and compare commit history from a remote repo and apply it to a subdirectory of this repo.
+That's why the commit history for this repo is so huge, it contains all the commits for all the apps, plus our edits.
 
-To make updating more manageable, we have added another layer on top of subtrees:
+To make updating more manageable, we have added some scripts on top of subtrees:
 - add a new app with `.utils/add-subtree.sh <path> <repo url> <branch> [subdir]`, this will pull the history and create `path/.gitsubtree` to remember the url, branch and subdir
 - run `.utils/update-subtree.sh <path>` to pull updates for a subtree
 - or run `.utils/bulk-update-subtrees.sh` to do it for all subtrees
@@ -0,0 +1,4 @@
+## 1.1
+ - Description update
+## 1.0
+ - Initial release
@@ -0,0 +1,5 @@
+# Air Arkanoid
+
+This is our simple version of the Arkanoid game that can use the motion-tracking sensor of the Video Game Module or Flipper Zero buttons to control the paddle. To play the game with buttons, disconnect the Video Game Module before running the game.
+
+The Air Arkanoid game also demonstrates how to integrate the motion-tracking sensor of the Video Game Module into your game using the [Flipper Zero Game Engine](https://github.com/flipperdevices/flipperzero-game-engine).
@@ -0,0 +1,2 @@
+https://github.com/xMasterX/all-the-plugins dev non_catalog_apps/air_arkanoid
+https://github.com/flipperdevices/flipperzero-good-faps dev air_arkanoid
@@ -0,0 +1,18 @@
+App(
+    appid="air_arkanoid",
+    name="Air Arkanoid",
+    apptype=FlipperAppType.EXTERNAL,
+    entry_point="game_app",
+    stack_size=4 * 1024,
+    fap_icon="icon.png",
+    fap_category="Games",
+    fap_file_assets="assets",
+    fap_description="Arkanoid game that supports the Video Game Module motion sensor",
+    fap_version="1.1",
+    fap_extbuild=(
+        ExtFile(
+            path="${FAP_SRC_DIR}/assets",
+            command="python3 ${FAP_SRC_DIR}/engine/scripts/sprite_builder.py ${FAP_SRC_DIR.abspath}/sprites ${TARGET.abspath}/sprites",
+        ),
+    ),
+)
@@ -0,0 +1 @@
+https://github.com/flipperdevices/flipperzero-game-engine dev /
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-https://github.com/eugene-kirzhanov/flipper-zero-2048-game main /`
`2`	`1`	`https://github.com/xMasterX/all-the-plugins dev base_pack/game_2048`
	`2`	`+https://github.com/eugene-kirzhanov/flipper-zero-2048-game main /`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,6 @@ App(`
`11`	`11`	`fap_icon="game_2048.png",`
`12`	`12`	`fap_category="Games",`
`13`	`13`	`fap_author="@eugene-kirzhanov",`
`14`		`- fap_version="1.2",`
	`14`	`+ fap_version="1.3",`
`15`	`15`	`fap_description="Play the port of the 2048 game on Flipper Zero.",`
`16`	`16`	`)`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-https://github.com/leo-need-more-coffee/flipperzero-4inrow main /`
`2`	`1`	`https://github.com/xMasterX/all-the-plugins dev apps_source_code/4inrow_game`
	`2`	`+https://github.com/leo-need-more-coffee/flipperzero-4inrow main /`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+https://github.com/xMasterX/all-the-plugins dev non_catalog_apps/air_arkanoid`
	`2`	`+https://github.com/flipperdevices/flipperzero-good-faps dev air_arkanoid`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+https://github.com/flipperdevices/flipperzero-game-engine dev /`