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

..

Gizmos

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

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

Plugins

meta

2022-02-14 22:07:36 +03:00

Prefab

Merge branch 'Zakhar' into Alexei

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

Resources

Merge branch 'Zakhar' into Alexei

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

Scenes

Merge branch 'Zakhar' into Alexei

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

Scripts

invetory fix

2022-02-14 22:03:08 +03:00

TextMesh Pro

Merge branch 'Alexei' into Zakhar

2022-01-19 13:20:07 +03:00

Thirdparty assets

added odin, Added LevelSettings.cs for adding new LevelS

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

Gizmos.meta

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

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

Plugins.meta

cleaned branch

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

Prefab.meta

reimported project

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

Resources.meta

cleaned branch

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

Scenes.meta

final fix for build bug. optimized

2022-01-16 05:38:22 +03:00

Scripts.meta

cleaned branch

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

TextMesh Pro.meta

resources optimized

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

Thirdparty assets.meta

folder logic and fixes

2022-02-02 19:08:18 +03:00