4 Commits

Author SHA1 Message Date
Pierre Ryssen
4a3f0ec740 feat (.gitignore): add the DevRoom/Perso/ in the .gitignore 2026-04-26 16:20:34 +02:00
Marouette
2a5d8a0944 Merge pull request #3 from CrowMate/Prototype
Prototype
2026-04-26 15:35:35 +02:00
cceee1df1b Merge pull request 'fix: remove merge confilct from PC_Renderer.asset' (#10) from fix-compilation-issue into Prototype
Reviewed-on: #10
Reviewed-by: Pierre1901 <pierre.ryssen@crowmate.fr>
Reviewed-by: BoxOfPandor <thibault.pouch@crowmate.fr>
2026-04-23 16:45:51 +02:00
timote koenig
9926d6c24f fix: remove merge confilct from PC_Renderer.asset 2026-04-23 13:51:06 +02:00
3 changed files with 6 additions and 5 deletions

2
.gitignore vendored
View File

@@ -62,3 +62,5 @@ Thumbs.db.meta
# VS Code # VS Code
*.vscode *.vscode
.vsconfig .vsconfig
Assets/Scenes/DevRoom/Perso/

View File

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

View File

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