init
Merge branch 'master' of github.com:Fila61/shooter
cover negation
1st
Merge branch 'master' of github.com:Fila61/shooter

Conflicts:
	shooter/Assembly-UnityScript.pidb
	shooter/Assembly-UnityScript.unityproj
	shooter/Assets/Shooter/Main.unity
	shooter/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	shooter/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	shooter/Library/ScriptAssemblies/Assembly-CSharp.dll
	shooter/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	shooter/Library/ScriptAssemblies/Assembly-UnityScript-Editor.dll
	shooter/Library/ScriptAssemblies/Assembly-UnityScript-Editor.dll.mdb
	shooter/Library/ScriptAssemblies/Assembly-UnityScript.dll
	shooter/Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	shooter/Library/assetDatabase3
	shooter/Library/expandedItems
BOOMER
merge test -> master
add sounds
nothing
Merge branch 'master' of github.com:Fila61/shooter

Conflicts:
	shooter/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	shooter/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	shooter/Library/ScriptAssemblies/Assembly-CSharp.dll
	shooter/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	shooter/Library/ScriptAssemblies/Assembly-UnityScript-Editor.dll
	shooter/Library/ScriptAssemblies/Assembly-UnityScript-Editor.dll.mdb
	shooter/Library/ScriptAssemblies/Assembly-UnityScript.dll
	shooter/Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	shooter/Library/assetDatabase3
	shooter/Library/cache/09/0967f2d989d9f34469911cc2dee1e327
	shooter/Library/cache/22/22853c45971d19046a5cdc97373f9c84
	shooter/Library/cache/31/31d155982a110e741abc6c9d495193d9
	shooter/Library/cache/39/398031e4bc841f243a2f2f60e12112b1
	shooter/Library/cache/6d/6d758cd6853ef1c4b85668377e631503
	shooter/Library/cache/af/af62126a040656849a3fa180cd667d0c
	shooter/Library/cache/b7/b74b91133baeeff4f81819f74d9e3c20
	shooter/Library/cache/bb/bb7dbe1e2d0f5e245a31f9476235f5df
	shooter/Library/cache/cb/cbc2f92b7e19d8a419fd32ee80ac875a
	shooter/Library/cache/d5/d575accf98fdbfe4eb387fec4b099179
	shooter/Library/expandedItems
	shooter/Library/guidmapper
	shooter/shooter-csharp.sln
	shooter/shooter.sln
переместил звуки в звуки
просто запуск
поставил новую версию UNITY
добавил звуки
Убрал доворот игрока в сторону кнопки при ее нажатии.
новый автоприцел
новые настройки автоприцела
забацал звук набора
save
Merge branch 'master' of github.com:Fila61/shooter

Conflicts:
	shooter/Assembly-CSharp-Editor.pidb
	shooter/Assembly-UnityScript-Editor.pidb
	shooter/Assembly-UnityScript.pidb
	shooter/Assets/Shooter/Main.unity
	shooter/Assets/Shooter/Scripts/PlayerController.js
	shooter/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	shooter/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	shooter/Library/ScriptAssemblies/Assembly-CSharp.dll
	shooter/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	shooter/Library/ScriptAssemblies/Assembly-UnityScript-Editor.dll
	shooter/Library/ScriptAssemblies/Assembly-UnityScript-Editor.dll.mdb
	shooter/Library/ScriptAssemblies/Assembly-UnityScript.dll
	shooter/Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	shooter/Library/assetDatabase3
	shooter/Library/cache/09/0967f2d989d9f34469911cc2dee1e327
	shooter/Library/cache/6d/6d758cd6853ef1c4b85668377e631503
	shooter/Library/cache/9b/9b895c9826d585543a75125d93db22ad
	shooter/Library/cache/b7/b7460a00d2f78cc48a5f7acbafe163e8
	shooter/Library/cache/bf/bf39ff74c58464db5a43c827185b0f51
	shooter/Library/cache/cb/cbc2f92b7e19d8a419fd32ee80ac875a
	shooter/Library/expandedItems
	shooter/Library/guidmapper
	shooter/Library/previews/b7/b7460a00d2f78cc48a5f7acbafe163e8
	shooter/shooter-csharp.sln
	shooter/shooter.sln
	shooter/shooter.userprefs