Merge branch 'main' of https://git.mindfire.games/jams/GGJ22

Assets/Decors/objects.yaml

@@ -181,3 +181,150 @@ decorations:
         frame_time: 100
     width: 34
     height: 42
+  - uuid: e63ccaa0-25b7-4be1-ab1f-52b55484df1b
+    title: flowersWhite
+    editor:
+      tags: []
+      folder: ""
+    frames:
+      - parts:
+          - palettes: ""
+            palette: ""
+            x: 0
+            y: 0
+            clipX: 2
+            clipY: 215
+            clipWidth: 15
+            clipHeight: 15
+            alpha: 1
+            rotation: 0
+            mirror: false
+        frame_time: 100
+    width: 15
+    height: 15
+  - uuid: 3c7ef72e-1a78-45ea-a653-2b13fd7e8b20
+    title: flowersBlue
+    editor:
+      tags: []
+      folder: ""
+    frames:
+      - parts:
+          - palettes: ""
+            palette: ""
+            x: 0
+            y: 0
+            clipX: 21
+            clipY: 214
+            clipWidth: 16
+            clipHeight: 16
+            alpha: 1
+            rotation: 0
+            mirror: false
+        frame_time: 100
+    width: 16
+    height: 16
+  - uuid: 7d08d620-0f9d-4d24-8f18-fe615cf08cf0
+    title: flowersYellow
+    editor:
+      tags: []
+      folder: ""
+    frames:
+      - parts:
+          - palettes: ""
+            palette: ""
+            x: 0
+            y: 0
+            clipX: 42
+            clipY: 218
+            clipWidth: 13
+            clipHeight: 12
+            alpha: 1
+            rotation: 0
+            mirror: false
+        frame_time: 100
+    width: 13
+    height: 12
+  - uuid: ab066a56-9cbf-4de9-8cff-b2f5c7e218f4
+    title: bushBig
+    editor:
+      tags: []
+      folder: ""
+    frames:
+      - parts:
+          - palettes: ""
+            palette: ""
+            x: 0
+            y: 0
+            clipX: 1
+            clipY: 179
+            clipWidth: 46
+            clipHeight: 29
+            alpha: 1
+            rotation: 0
+            mirror: false
+        frame_time: 100
+    width: 46
+    height: 29
+  - uuid: 659a1215-fe86-4c48-83e8-f34985d7d62d
+    title: bushMed
+    editor:
+      tags: []
+      folder: ""
+    frames:
+      - parts:
+          - palettes: ""
+            palette: ""
+            x: 0
+            y: 0
+            clipX: 66
+            clipY: 180
+            clipWidth: 35
+            clipHeight: 28
+            alpha: 1
+            rotation: 0
+            mirror: false
+        frame_time: 100
+    width: 35
+    height: 28
+  - uuid: 53ce2a56-a77a-4968-bf81-bdf03d32cfaa
+    title: bushTall
+    editor:
+      tags: []
+      folder: ""
+    frames:
+      - parts:
+          - palettes: ""
+            palette: ""
+            x: 0
+            y: 0
+            clipX: 110
+            clipY: 174
+            clipWidth: 18
+            clipHeight: 34
+            alpha: 1
+            rotation: 0
+            mirror: false
+        frame_time: 100
+    width: 18
+    height: 34
+  - uuid: f72f7dce-e688-4883-bf06-65c830d1136a
+    title: treeRoundsnow1
+    editor:
+      tags: []
+      folder: ""
+    frames:
+      - parts:
+          - palettes: ""
+            palette: ""
+            x: 0
+            y: 0
+            clipX: 89
+            clipY: 86
+            clipWidth: 34
+            clipHeight: 42
+            alpha: 1
+            rotation: 0
+            mirror: false
+        frame_time: 100
+    width: 34
+    height: 42