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

..

1

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

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

Data

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

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

1.meta

added resources

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

Data.meta

Grid generation, painting hex on click, MVC Arcitecture, OnPaintHex listener, added readme

2021-12-14 16:06:37 +03:00

DOTweenSettings.asset

added git lfs

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

DOTweenSettings.asset.meta

added git lfs

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