промежуточный
Merge branch 'master' of github.com:saotele2/shooter

Conflicts:
	shooter/Assembly-UnityScript.pidb
	shooter/Library/assetDatabase3
	shooter/Library/guidmapper
промежуточный
shotgun max number of targets affected by blast damage
Model.LAUNCHER_MAX_NUMBER_OF_TARGETS вместо переменной класса mGun
Merge branch 'master' of github.com:Fila61/shooter

Conflicts:
	shooter/Assembly-UnityScript.pidb
	shooter/Library/assetDatabase3
	shooter/Library/guidmapper
Merge branch 'master' of github.com:Fila61/shooter

Conflicts:
	shooter/Assembly-UnityScript.pidb
	shooter/Library/assetDatabase3
Проходит MTL-2