7 Commits

Author SHA1 Message Date
Antoine2507
22da6f75e1 feat: adding personel devroom 2026-05-04 20:40:11 +02:00
Antoine Papillon
79dad388a1 refactor: resize scale player from 4 to 1 2026-05-01 22:12:29 +02:00
Pierre Ryssen
7a4f79ac6b feat (architecture): create an 'Enemies' directory and 'LivingRoot' directory in Script 2026-04-26 18:34:11 +02:00
Pierre Ryssen
14310f742f feat: add the personnal devroom directory 2026-04-26 18:22:56 +02:00
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
13 changed files with 144511 additions and 128 deletions

2
.gitignore vendored
View File

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

View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: d82ed499bde37d2bca7590ba5952894f
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 91ac6bdb3a3fc30fa9e96966372092e3
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -0,0 +1,16 @@
using UnityEngine;
public class SlowdownArea : MonoBehaviour
{
// Start is called once before the first execution of Update after the MonoBehaviour is created
void Start()
{
}
// Update is called once per frame
void Update()
{
}
}

View File

@@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: dbfa6ebdeb68bf2f6a5c4d25311b5811

View File

@@ -631,15 +631,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 82a2914d8f86c62488456950c8330e38, type: 3}
propertyPath: m_LocalScale.x
value: 4
value: 1
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 82a2914d8f86c62488456950c8330e38, type: 3}
propertyPath: m_LocalScale.y
value: 4
value: 1
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 82a2914d8f86c62488456950c8330e38, type: 3}
propertyPath: m_LocalScale.z
value: 4
value: 1
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 82a2914d8f86c62488456950c8330e38, type: 3}
propertyPath: m_LocalPosition.x
@@ -1060,6 +1060,9 @@ MonoBehaviour:
ThrowForce: 20
PickupDistance: 10
isHoldingHead: 0
HandTransform: {fileID: 0}
ItemThrowForce: 10
ItemPickupDistance: 5
--- !u!114 &2936940972087595065
MonoBehaviour:
m_ObjectHideFlags: 0

View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: a969c937a6e399209adc938b2591a18e
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -36814,67 +36814,6 @@ Transform:
m_Children: []
m_Father: {fileID: 1994839082}
m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
--- !u!1001 &616194330
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 1945301683602458784, guid: c786dcd5f720bb47dbf843bd97137452, type: 3}
propertyPath: m_LocalPosition.x
value: 7.143099
objectReference: {fileID: 0}
- target: {fileID: 1945301683602458784, guid: c786dcd5f720bb47dbf843bd97137452, type: 3}
propertyPath: m_LocalPosition.y
value: 0.5499998
objectReference: {fileID: 0}
- target: {fileID: 1945301683602458784, guid: c786dcd5f720bb47dbf843bd97137452, type: 3}
propertyPath: m_LocalPosition.z
value: -11.581879
objectReference: {fileID: 0}
- target: {fileID: 1945301683602458784, guid: c786dcd5f720bb47dbf843bd97137452, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1945301683602458784, guid: c786dcd5f720bb47dbf843bd97137452, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1945301683602458784, guid: c786dcd5f720bb47dbf843bd97137452, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1945301683602458784, guid: c786dcd5f720bb47dbf843bd97137452, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1945301683602458784, guid: c786dcd5f720bb47dbf843bd97137452, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1945301683602458784, guid: c786dcd5f720bb47dbf843bd97137452, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1945301683602458784, guid: c786dcd5f720bb47dbf843bd97137452, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8295937476714018201, guid: c786dcd5f720bb47dbf843bd97137452, type: 3}
propertyPath: m_Name
value: ThrowableCube
objectReference: {fileID: 0}
- target: {fileID: 8295937476714018201, guid: c786dcd5f720bb47dbf843bd97137452, type: 3}
propertyPath: m_Layer
value: 6
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: c786dcd5f720bb47dbf843bd97137452, type: 3}
--- !u!43 &696562523
Mesh:
m_ObjectHideFlags: 0
@@ -108275,67 +108214,6 @@ Transform:
m_Children: []
m_Father: {fileID: 1021798998}
m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
--- !u!1001 &1679253409
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 1945301683602458784, guid: c786dcd5f720bb47dbf843bd97137452, type: 3}
propertyPath: m_LocalPosition.x
value: 6.8145223
objectReference: {fileID: 0}
- target: {fileID: 1945301683602458784, guid: c786dcd5f720bb47dbf843bd97137452, type: 3}
propertyPath: m_LocalPosition.y
value: 1.5500001
objectReference: {fileID: 0}
- target: {fileID: 1945301683602458784, guid: c786dcd5f720bb47dbf843bd97137452, type: 3}
propertyPath: m_LocalPosition.z
value: -11.941306
objectReference: {fileID: 0}
- target: {fileID: 1945301683602458784, guid: c786dcd5f720bb47dbf843bd97137452, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1945301683602458784, guid: c786dcd5f720bb47dbf843bd97137452, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1945301683602458784, guid: c786dcd5f720bb47dbf843bd97137452, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1945301683602458784, guid: c786dcd5f720bb47dbf843bd97137452, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1945301683602458784, guid: c786dcd5f720bb47dbf843bd97137452, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1945301683602458784, guid: c786dcd5f720bb47dbf843bd97137452, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1945301683602458784, guid: c786dcd5f720bb47dbf843bd97137452, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8295937476714018201, guid: c786dcd5f720bb47dbf843bd97137452, type: 3}
propertyPath: m_Name
value: ThrowableCube (1)
objectReference: {fileID: 0}
- target: {fileID: 8295937476714018201, guid: c786dcd5f720bb47dbf843bd97137452, type: 3}
propertyPath: m_Layer
value: 6
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: c786dcd5f720bb47dbf843bd97137452, type: 3}
--- !u!43 &1713424934
Mesh:
m_ObjectHideFlags: 0
@@ -144558,7 +144436,5 @@ SceneRoots:
- {fileID: 2145812611}
- {fileID: 153565765}
- {fileID: 581107447}
- {fileID: 616194330}
- {fileID: 1679253409}
- {fileID: 525042218}
- {fileID: 1004343558}

View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 0ade185cbfcac340bb27b3e5084f5c32
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because one or more lines are too long

View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 0d6592df1d7b185488bf479effca6aad
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -9,5 +9,6 @@ EditorBuildSettings:
path: Assets/Level/Scenes/Level/01/Level01.unity
guid: 002c7c1365eb84470a077e39ac50a31c
m_configObjects:
com.unity.input.settings: {fileID: 11400000, guid: 23cbff887a25b3802a937fef9deab3ec, type: 2}
com.unity.input.settings.actions: {fileID: -944628639613478452, guid: 052faaac586de48259a63d0c4782560b, type: 3}
m_UseUCBPForAssetBundles: 0