Initial Commit
Merge branch 'master' of https://github.com/vgrachev2/FruitKiller into andrewKozakStaging
test
Merge pull request #1 from vgrachev2/v_grachov.staging

test
Добавление UnityDI
Merge pull request #2 from vgrachev2/v_grachov.staging

Добавление UnityDI
Начало разработки плейсера для объектов
Разработка позиционатора entity
Merge branch 'staging' of https://github.com/vgrachev2/FruitKiller into andrewKozakStaging

Conflicts:
	Assembly-CSharp.csproj
	Assets/Scripts/Fruit.cs
Добавлена генерация в виде сетки
Merge pull request #3 from vgrachev2/andrewKozakStaging

Добавлена генерация в виде сетки
DI
Незначительные изменения (вынесены настройки плейсера в публичные сеттеры)
Merge branch 'andrewKozakStaging' of https://github.com/vgrachev2/FruitKiller into andrewKozakStaging

Conflicts:
	Assets/Resources/Prefabs/Entities/Peach.prefab
	Assets/Scenes/1.unity
	Assets/Scripts/EntityPlacer.cs
	FruitKiller-csharp.sln
	FruitKiller.sln
	FruitKiller.userprefs
	FruitKiller.v11.suo
	Library/CurrentLayout.dwlt
	Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/guidmapper
Merge pull request #4 from vgrachev2/andrewKozakStaging

Andrew kozak staging
Контроллеры и генератор кнопки
main menu
Merge pull request #5 from vgrachev2/staging.v_grachev2

Контроллеры и генератор кнопки
Незначительные изменения
Merge branch 'staging' of https://github.com/vgrachev2/FruitKiller into andrewKozakStaging

Conflicts:
	Assembly-CSharp-firstpass-vs.csproj
	Assembly-CSharp-firstpass.csproj
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj
	FruitKiller.sln
	FruitKiller.v11.suo
	Library/CurrentLayout.dwlt
	Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
	Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3