Crowmate/HeadlessHazard
7
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

fix: remove merge confilct from PC_Renderer.asset

Browse Source
This commit is contained in:
timote koenig
2026-04-23 13:51:06 +02:00
parent 3a758bb245
commit 9926d6c24f
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
AGENTS.md
View File

@@ -2,7 +2,7 @@
- Project name: HeadlessHazard
- Unity version: Unity 6000.3.10f1
- Active game object:
- Name: Button_3
- Tag: Untagged
- Name: Player
- Tag: Player
- Layer: Default
<!-- UNITY CODE ASSIST INSTRUCTIONS END -->

3
Assets/Settings/PC_Renderer.asset
View File

@@ -51,8 +51,7 @@ MonoBehaviour:
probeVolumeBlendStatesCS: {fileID: 7200000, guid: b9a23f869c4fd45f19c5ada54dd82176, type: 3}
m_RendererFeatures:
- {fileID: 7833122117494664109}
- {fileID: -4377071725885749089}
m_RendererFeatureMap: ad6b866f10d7b46c9f882cbe748441c3
m_RendererFeatureMap: ad6b866f10d7b46c
m_UseNativeRenderPass: 1
xrSystemData: {fileID: 0}
postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2}