мердж
blood scale 1.5, crit font size 36
цифры крита, сообщ "абилити нот реди"
разные радиусы коллайдеров для ходьбы и для стрельбы.
knockback base values
Сделал импорт новых данных
Merge branch 'master' of github.com:Fila61/shooter

Conflicts:
	shooter/Assembly-CSharp-firstpass.pidb
	shooter/Assembly-UnityScript-Editor.pidb
	shooter/Assembly-UnityScript-firstpass.pidb
	shooter/Assembly-UnityScript.pidb
	shooter/Library/EditorUserBuildSettings.asset
	shooter/Library/assetDatabase3
Merge branch 'master' into apple

Conflicts:
	shooter/Assembly-CSharp-firstpass.pidb
	shooter/Assembly-UnityScript-Editor.pidb
	shooter/Assembly-UnityScript-firstpass.pidb
	shooter/Library/EditorUserBuildSettings.asset
	shooter/Library/assetDatabase3