MaximilienBlanchardBizien1 2dcaa796ec Merge branch 'origin/feature/berriesInteractions' ...

# Conflicts:
#	Assets/Prefabs/UI/ResourceGUI.prefab
#	Assets/Scripts/Resource/ResourceMaker.cs
#	Assets/Scripts/Resource/ResourceManager.cs
#	Assets/Scripts/Resource/ResourceText.cs

2024-01-09 10:15:25 -05:00

Assets

Merge branch 'origin/feature/berriesInteractions'

2024-01-09 10:15:25 -05:00

Packages

First push

2023-05-07 18:28:47 -04:00

ProjectSettings

make transition fool proof

2023-10-09 22:21:06 -04:00

.gitignore

First push

2023-05-07 18:28:47 -04:00

.gitmessage

ajout d'un fichier gitmessage

2023-05-09 08:50:19 -04:00

.vsconfig

First push

2023-05-07 18:28:47 -04:00

Description

No description provided

24 MiB

Languages

C# 67.7%

ShaderLab 16.2%

GLSL 11.3%

HLSL 4.8%