dddushesss 2c2fae3b58 Merge remote-tracking branch 'origin/Alexei' into Alexei ...

# Conflicts:
#	Assets/Resources/1/Crystal/Prefab/Crystal.prefab
#	Assets/Resources/1/Crystal/Prefab/Crystal.prefab.meta
#	Assets/Resources/1/VFX/Bonus/Attack/Mana.prefab.meta
#	Assets/Resources/1/VFX/Bonus/Attack/Power.prefab.meta
#	Assets/Resources/1/VFX/Bonus/Attack/Replace.prefab.meta
#	Assets/Resources/1/VFX/Bonus/Protection/Magnet.prefab.meta
#	Assets/Resources/1/VFX/Bonus/Protection/Shield.prefab
#	Assets/Resources/1/VFX/Bonus/Protection/Shield.prefab.meta
#	Assets/Resources/Data/ItemData.asset
#	Assets/Scripts/Items/Bonus.cs.meta
#	Assets/Scripts/Items/Building.cs.meta

2022-01-13 22:59:27 +03:00

Assets

Merge remote-tracking branch 'origin/Alexei' into Alexei

2022-01-13 22:59:27 +03:00

Packages

weapon fixes

2022-01-05 21:33:46 +03:00

ProjectSettings

AI. Build does not work

2022-01-13 18:56:24 +03:00

.gitattributes

added git lfs

2021-12-16 16:17:58 +03:00

.gitignore

added resources

2021-12-15 16:29:44 +03:00

Description

No description provided

266 MiB

Languages

C# 43.5%

ShaderLab 40.9%

HLSL 13.3%

GLSL 2.3%