dddushesss 6533271dc8 Merge branch 'Zakhar' into Alexei ...

# Conflicts:
#	Assets/Plugins/Sirenix.meta
#	Assets/Plugins/Sirenix/Assemblies.meta
#	Assets/Plugins/Sirenix/Assemblies/NoEditor.meta
#	Assets/Plugins/Sirenix/Assemblies/NoEmitAndNoEditor.meta
#	Assets/Plugins/Sirenix/Odin Inspector.meta
#	Assets/Plugins/Sirenix/Odin Inspector/Config/Editor/GeneralDrawerConfig.asset
#	Assets/Plugins/Sirenix/Odin Inspector/Config/Resources/Sirenix/GlobalSerializationConfig.asset
#	Assets/Prefab/HexCell.prefab

2022-02-14 22:10:56 +03:00

..

1

Merge branch 'Zakhar' into Alexei

2022-02-14 22:10:56 +03:00

Data

fixed CaptureAbility.cs

2022-02-14 05:01:53 +03:00

Maps

added rocket, level editor, level settings, made round async

2022-02-12 19:07:57 +03:00

1.meta

cleaned branch

2022-01-15 22:31:25 +03:00

BillingMode.json

resources optimized

2022-01-16 05:40:49 +03:00

BillingMode.json.meta

resources optimized

2022-01-16 05:40:49 +03:00

Data.meta

cleaned branch

2022-01-15 22:31:25 +03:00

DOTweenSettings.asset

resources optimized

2022-01-16 05:40:49 +03:00

DOTweenSettings.asset.meta

cleaned branch

2022-01-15 22:31:25 +03:00

Maps.meta

added odin, Added LevelSettings.cs for adding new LevelS

2022-02-07 19:57:50 +03:00