fix: remove merge confilct from PC_Renderer.asset

Merge pull request 'feat/add-throwable-items' (#9 ) from feat/add-throwable-items into Prototype
Reviewed-on: #9 Reviewed-by: BoxOfPandor <thibault.pouch@crowmate.fr>
2026-04-23 13:51:06 +02:00 · 2026-04-06 21:50:27 +02:00
2 changed files with 3 additions and 4 deletions
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -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 -->
--- a/Assets/Settings/PC_Renderer.asset
+++ b/Assets/Settings/PC_Renderer.asset
@@ -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}
Author	SHA1	Message	Date
timote koenig	9926d6c24f	fix: remove merge confilct from PC_Renderer.asset	2026-04-23 13:51:06 +02:00
Pierre1901	3a758bb245	Merge pull request 'feat/add-throwable-items' (#9 ) from feat/add-throwable-items into Prototype Reviewed-on: #9 Reviewed-by: BoxOfPandor <thibault.pouch@crowmate.fr>	2026-04-06 21:50:27 +02:00