1
Merge remote-tracking branch 'origin/morlord'
123
123
Merge remote-tracking branch 'origin/morlord'
Merge remote-tracking branch 'origin/master' into Nerzull
мобы, границы
test
test 2
testmatser
testmaster2
Merge remote-tracking branch 'origin/Nerzull'

Conflicts:
	Unityproject/Assets/Scenes/lvl1.unity
	Unityproject/Assets/scripts/HeroBehavior.cs
	Unityproject/Assets/textures/hero/hero.prefab
	Unityproject/Library/CurrentLayout.dwlt
	Unityproject/Library/CurrentMaximizeLayout.dwlt
	Unityproject/Library/InspectorExpandedItems.asset
	Unityproject/Library/ScriptAssemblies/Assembly-CSharp.dll
	Unityproject/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Unityproject/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll
	Unityproject/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb
	Unityproject/Library/ScriptAssemblies/Assembly-UnityScript.dll
	Unityproject/Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	Unityproject/Library/assetDatabase3
	Unityproject/Library/expandedItems
	Unityproject/Library/guidmapper
	Unityproject/Library/metadata/40/4066b8b2585fa1e408d0fa40726bcc3d
	Unityproject/Library/metadata/6f/6ff712e8761e6384ab36f30898d64f89
	Unityproject/Unityproject.userprefs
1
исправленные скрипты
тесткоммит
исправления
	modified:   Unityproject/Assets/scripts/SpawnController.cs
	modified:   Unityproject/Library/CurrentLayout.dwlt
	modified:   Unityproject/Library/CurrentMaximizeLayout.dwlt
	modified:   Unityproject/Library/ScriptAssemblies/Assembly-CSharp.dll
	modified:   Unityproject/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	modified:   Unityproject/Library/assetDatabase3
	modified:   Unityproject/Library/metadata/40/4066b8b2585fa1e408d0fa40726bcc3d
	modified:   Unityproject/Unityproject-csharp.sln
	modified:   Unityproject/Unityproject.sln
	modified:   Unityproject/Assets/Scenes/lvl1.unity
	modified:   Unityproject/Assets/scripts/LeftTouchPad.prefab
	modified:   Unityproject/Assets/scripts/RightTouchPad.prefab
	modified:   Unityproject/Library/CurrentLayout.dwlt
	modified:   Unityproject/Library/CurrentMaximizeLayout.dwlt
	modified:   Unityproject/Library/assetDatabase3
	modified:   Unityproject/Unityproject-csharp.sln
	modified:   Unityproject/Unityproject.sln
Merge branch 'Nerzull'

Conflicts:
	Unityproject/Assets/Scenes/lvl1.unity
	Unityproject/Library/CurrentLayout.dwlt
	Unityproject/Library/CurrentMaximizeLayout.dwlt
	Unityproject/Library/InspectorExpandedItems.asset
	Unityproject/Library/ScriptAssemblies/Assembly-CSharp.dll
	Unityproject/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Unityproject/Library/assetDatabase3
	Unityproject/Library/expandedItems
	Unityproject/Library/metadata/40/4066b8b2585fa1e408d0fa40726bcc3d
	Unityproject/Library/metadata/6f/6ff712e8761e6384ab36f30898d64f89

	modified:   Unityproject/Assets/scripts/LeftTouchPad.prefab
	modified:   Unityproject/Assets/scripts/RightTouchPad.prefab
	modified:   Unityproject/Library/CurrentLayout.dwlt
	modified:   Unityproject/Library/CurrentMaximizeLayout.dwlt
	modified:   Unityproject/Library/assetDatabase3
	modified:   Unityproject/Library/guidmapper
	modified:   Unityproject/Unityproject-csharp.sln
	modified:   Unityproject/Unityproject.sln