Merge branch 'fix/scenebootstrapper-unblocking-test-runner' into feature/test-utils

Author: fernando-cortez

.gitattributes

@@ -18,7 +18,6 @@
 *.skp filter=lfs diff=lfs merge=lfs -text
 *.stl filter=lfs diff=lfs merge=lfs -text
 *.ztl filter=lfs diff=lfs merge=lfs -text
-
 # Audio
 *.aif filter=lfs diff=lfs merge=lfs -text
 *.aiff filter=lfs diff=lfs merge=lfs -text
@@ -29,11 +28,9 @@
 *.s3m filter=lfs diff=lfs merge=lfs -text
 *.wav filter=lfs diff=lfs merge=lfs -text
 *.xm filter=lfs diff=lfs merge=lfs -text
-
 # Fonts
 *.otf filter=lfs diff=lfs merge=lfs -text
 *.ttf filter=lfs diff=lfs merge=lfs -text
-
 # Images
 *.bmp filter=lfs diff=lfs merge=lfs -text
 *.exr filter=lfs diff=lfs merge=lfs -text
@@ -48,9 +45,9 @@
 *.[tT][gG][aA] filter=lfs diff=lfs merge=lfs -text
 *.tif filter=lfs diff=lfs merge=lfs -text
 *.tiff filter=lfs diff=lfs merge=lfs -text
-
 # Unity
 *.unity filter=lfs diff=lfs merge=lfs text
 *.prefab binary
 *.asset filter=lfs diff=lfs merge=lfs -text
 *.anim filter=lfs diff=lfs merge=lfs -text
+*.tga filter=lfs diff=lfs merge=lfs -text

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,39 +1,18 @@
-<!---
-    Thank you for contributing to Unity.
-    To help us process this pull request we recommend that you add the following information:
-     - Summary and list of changes in the pull request,
-     - Issue(s) related to the changes made such as GitHub or Jira,
-     - Manual testing scenarios if available
-    Fields marked with (*) are required. Please don't remove the template.
--->
-### Description (*)
+### Description
 <!---
     Please provide a description of the changes proposed in the pull request.
-    Letting us know what has changed and why it needed changing will help us validate this pull request.
+    Make sure your commit messages have meaningful information.
+    To help us link commits and PRs to JIRA work items, please include the JIRA ticket ID in the PR title or at least of your commit messages.
 -->
-### Related Pull Requests
-<!-- related pull request placeholder -->
-### Issue Number(s) (*)
+
+### Issue Number(s)
 <!---
     Provide a list of fixed issues from Jira (GOMPS-ticketnumber) or GitHub (#issuenumber).
     This helps us understand the reasoning behind this change, what it fixes, feature being added, etc.
 -->
-Fixes issue(s):
-### Manual testing scenarios
-<!---
-    Please provide a set of unambiguous steps to test the proposed code change.
-    If an error is output to either the player or editor log file, please attach.
-    Giving us manual testing scenarios will help with the processing and validation process.
--->
-1. ...
-2. ...
-### Questions or comments
-<!---
-	If relevant, here you can ask questions or provide comments on your pull request for the reviewer
-	For example if you need assistance with writing tests or would like some feedback on one of your development ideas or for the reviewer to focus on a particular area of the code.
--->
+
 ### Contribution checklist
  - [ ] Pull request has a meaningful description of its purpose
  - [ ] All commits are accompanied by meaningful commit messages
- - [ ] All new or changed code is covered with unit/integration tests (if applicable)
- - [ ] All automated tests passed successfully (all builds are green)
+ - [ ] JIRA ticket ID is in the PR title or at least one commit message
+ - [ ] Include the ticket ID number within the body message of the PR to create a hyperlink

.github/workflows/leak_detect.yml

@@ -35,6 +35,6 @@ jobs:
             # See also: https://api.slack.com/methods/chat.postMessage#channels
             channel-id: 'G01H7JP4AP2' # private channel
             # For posting a simple plain text message
-            slack-message: "Project ID LEAK DETECTED: ${{ job.status }}\n${{ github.event.pull_request.html_url || github.event.head_commit.url }}"
+            slack-message: "@here Project ID LEAK DETECTED: ${{ job.status }}\n${{ github.event.pull_request.html_url || github.event.head_commit.url }}"
         env:
             SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }} # can be found in https://api.slack.com/apps/

Assets/BossRoom/Material/Dungeon/black_02.mat renamed to Assets/BossRoom/Material/Dungeon/DungeonBorder.mat

@@ -20,7 +20,7 @@ Material:
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: black_02
+  m_Name: DungeonBorder
   m_Shader: {fileID: 4800000, guid: 650dd9526735d5b46b79224bc6e94025, type: 3}
   m_ShaderKeywords: 
   m_LightmapFlags: 4

Assets/BossRoom/Material/Dungeon/black_02.mat.meta renamed to Assets/BossRoom/Material/Dungeon/DungeonBorder.mat.meta

@@ -8,14 +8,13 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: boss_arena
-  m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
+  m_Shader: {fileID: -6465566751694194690, guid: 58d945a80f1f06c4db5c1fa66a0afc55, type: 3}
   m_ShaderKeywords: _EMISSION _METALLICSPECGLOSSMAP _NORMALMAP
   m_LightmapFlags: 2
   m_EnableInstancingVariants: 1
-  m_DoubleSidedGI: 0
-  m_CustomRenderQueue: 2000
-  stringTagMap:
-    RenderType: Opaque
+  m_DoubleSidedGI: 1
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
   disabledShaderPasses: []
   m_SavedProperties:
     serializedVersion: 3
@@ -52,6 +51,10 @@ Material:
         m_Texture: {fileID: 2800000, guid: 62d7fb22c0ec4164f9c6ef1c5846ca8c, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _MetallicSmoothEmissiveMap:
+        m_Texture: {fileID: 2800000, guid: 62d7fb22c0ec4164f9c6ef1c5846ca8c, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _OcclusionMap:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
@@ -77,6 +80,7 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     m_Floats:
+    - Vector1_0d1a218b5dba4d9f9de7493283258ea8: 0
     - _AlphaClip: 0
     - _Blend: 0
     - _BumpScale: 1
@@ -108,7 +112,7 @@ Material:
     m_Colors:
     - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
     - _Color: {r: 0.6886792, g: 0.6886792, b: 0.6886792, a: 1}
-    - _EmissionColor: {r: 4.0000005, g: 4.0000005, b: 4.0000005, a: 1}
+    - _EmissionColor: {r: 1, g: 0, b: 0, a: 1}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
   m_BuildTextureStacks: []
 --- !u!114 &7826408804194725777

Assets/BossRoom/Material/Dungeon/black.mat

@@ -21,14 +21,13 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: env_deco
-  m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
+  m_Shader: {fileID: -6465566751694194690, guid: 58d945a80f1f06c4db5c1fa66a0afc55, type: 3}
   m_ShaderKeywords: _METALLICSPECGLOSSMAP _NORMALMAP
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 1
   m_DoubleSidedGI: 1
-  m_CustomRenderQueue: 2000
-  stringTagMap:
-    RenderType: Opaque
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
   disabledShaderPasses: []
   m_SavedProperties:
     serializedVersion: 3
@@ -65,6 +64,10 @@ Material:
         m_Texture: {fileID: 2800000, guid: 8dc9ba9843603b54db8b77d51c94a1b4, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _MetallicSmoothEmissiveMap:
+        m_Texture: {fileID: 2800000, guid: 8dc9ba9843603b54db8b77d51c94a1b4, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _OcclusionMap:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
@@ -90,6 +93,7 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     m_Floats:
+    - Vector1_0d1a218b5dba4d9f9de7493283258ea8: 0
     - _AlphaClip: 0
     - _Blend: 0
     - _BumpScale: 1
@@ -121,6 +125,6 @@ Material:
     m_Colors:
     - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
     - _Color: {r: 0.5754717, g: 0.5754717, b: 0.5754717, a: 1}
-    - _EmissionColor: {r: 0.00052513264, g: 0.00052513264, b: 0.00052513264, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
   m_BuildTextureStacks: []