Merge pull request #1 from o3de/update-oct

Update project to latest

.gitignore

@@ -1,4 +1,5 @@
 [Bb]uild/
 [Cc]ache/
 [Uu]ser/
-[Uu]ser_test*/
+[Uu]ser_test*/
+_savebackup/

JOSHUAS-ASSETS/GameJam2021/badguy2_badguy1.material

@@ -11,9 +11,13 @@
                 0.800000011920929,
                 1.0
             ],
-            "textureBlendMode": "Overlay",
+            "textureBlendMode": "Lerp",
             "textureMap": "JOSHUAS-ASSETS/GameJam2021/textures/badguy_U1.png"
         },
+        "clearCoat": {
+            "enable": true,
+            "factor": 0.3700000047683716
+        },
         "emissive": {
             "color": [
                 0.0,

JOSHUAS-ASSETS/GameJam2021/badguy2_badguy2.material

@@ -8,13 +8,17 @@
             "textureBlendMode": "Lerp",
             "textureMap": "JOSHUAS-ASSETS/GameJam2021/textures/badguy_U2.png"
         },
+        "clearCoat": {
+            "factor": 0.75
+        },
         "emissive": {
             "color": [
-                0.0,
-                0.0,
-                0.0,
+                0.00553902518004179,
+                0.21661707758903503,
+                0.47861447930336,
                 1.0
-            ]
+            ],
+            "intensity": -0.05999999865889549
         },
         "opacity": {
             "factor": 1.0,

JOSHUAS-ASSETS/GameJam2021/mushroom2.material

@@ -8,7 +8,7 @@
             "color": [
                 1.0,
                 0.8758373260498047,
-                0.08336003869771958,
+                0.08336003869771957,
                 1.0
             ],
             "textureBlendMode": "LinearLight",
@@ -24,6 +24,9 @@
         },
         "opacity": {
             "factor": 1.0
+        },
+        "specularF0": {
+            "factor": 0.0
         }
     }
 }

JOSHUAS-ASSETS/GameJam2021/textures/badguy_U2.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:74c0f491b34a5ef3d3662899abc030c449b3a32d6f3c269eaa6738772d3bcdba
-size 2023165
+oid sha256:9e5bd7acfbaca09c869bd836dc1207fea2b7f39b05059473f7d708914bc39fbe
+size 2312078

Prefabs/tombstone.prefab

@@ -122,6 +122,36 @@
                         }
                     },
                     "materialSlots": [
+                        {
+                            "id": {
+                                "materialSlotStableId": 3100309799
+                            }
+                        },
+                        {
+                            "id": {
+                                "materialSlotStableId": 2081885851
+                            }
+                        },
+                        {
+                            "id": {
+                                "materialSlotStableId": 3100309799
+                            }
+                        },
+                        {
+                            "id": {
+                                "materialSlotStableId": 2081885851
+                            }
+                        },
+                        {
+                            "id": {
+                                "materialSlotStableId": 3100309799
+                            }
+                        },
+                        {
+                            "id": {
+                                "materialSlotStableId": 2081885851
+                            }
+                        },
                         {
                             "id": {
                                 "materialSlotStableId": 3100309799
@@ -134,6 +164,48 @@
                         }
                     ],
                     "materialSlotsByLod": [
+                        [
+                            {
+                                "id": {
+                                    "lodIndex": 0,
+                                    "materialSlotStableId": 3100309799
+                                }
+                            },
+                            {
+                                "id": {
+                                    "lodIndex": 0,
+                                    "materialSlotStableId": 2081885851
+                                }
+                            }
+                        ],
+                        [
+                            {
+                                "id": {
+                                    "lodIndex": 0,
+                                    "materialSlotStableId": 3100309799
+                                }
+                            },
+                            {
+                                "id": {
+                                    "lodIndex": 0,
+                                    "materialSlotStableId": 2081885851
+                                }
+                            }
+                        ],
+                        [
+                            {
+                                "id": {
+                                    "lodIndex": 0,
+                                    "materialSlotStableId": 3100309799
+                                }
+                            },
+                            {
+                                "id": {
+                                    "lodIndex": 0,
+                                    "materialSlotStableId": 2081885851
+                                }
+                            }
+                        ],
                         [
                             {
                                 "id": {

README.md

@@ -22,14 +22,15 @@ The UX workflow I was focusing on was around asset importing and assets manipula
 
 ![ResourceIMG0140](https://user-images.githubusercontent.com/82551958/138385372-40e0b855-0c3a-45e9-b71f-4d03f4f57dd6.jpg)
 
-![ResourceIMG0142](https://user-images.githubusercontent.com/82551958/138385154-5b6a0557-b84a-45af-80b2-2f8c314518ac.jpg)
+![sparky](https://user-images.githubusercontent.com/62353586/139504875-5322c9ec-eabd-4b3b-a83f-202c8bb1b741.jpg)
+
+![sparky2](https://user-images.githubusercontent.com/62353586/139504897-ce96f9f7-64e3-40c6-b1c8-39cef79ce319.jpg)
 
 ![ResourceIMG0145](https://user-images.githubusercontent.com/82551958/138385614-0feff6dc-f2ca-4014-bbda-f0fb17497d62.jpg)
 
 ![ResourceIMG0134](https://user-images.githubusercontent.com/82551958/138385250-18c199d3-660d-4bd2-b7f9-43095e58ea38.jpg)
 
-https://user-images.githubusercontent.com/82551958/138385979-7d0ace6d-ec90-4dcc-8378-e1e07bc8ea1b.mp4
-
+https://user-images.githubusercontent.com/62353586/139504735-660aff2c-ae77-4c72-a996-38f4043fba5a.mp4
 
 ## License