Добавил сам гитигнор
Merge branch 'master' of github.com:Fila61/shooter

Conflicts:
	.gitignore
	gitignore.cmd
	shooter/Assembly-CSharp-firstpass.pidb
	shooter/Assembly-CSharp.pidb
	shooter/Assembly-UnityScript-Editor.pidb
	shooter/Assembly-UnityScript-firstpass.pidb
	shooter/Assembly-UnityScript.pidb
	shooter/Assets/Resources/prefabs/weapons.meta
	shooter/Library/assetDatabase3
	shooter/Library/guidmapper
Добавил BattleModel.js и BattleWaveModel.js
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/Assets/Resources/prefabs/weapons.meta
	shooter/Assets/Shooter/Scripts/bestiary/Player.js
	shooter/Library/assetDatabase3
	shooter/Library/guidmapper
Добавил маскинг и выбор архетипов
промежуточный
Merge branch 'master' of github.com:Fila61/shooter

Conflicts:
	shooter/Library/assetDatabase3
Коммит перед раскидыванием патронов
Промежуточный
Продолжение работы
Вроде бы как конструктор битв работает
Merge branch 'master' of github.com:Fila61/shooter

Conflicts:
	shooter/Assembly-UnityScript-Editor.pidb
	shooter/Assembly-UnityScript.pidb
	shooter/Assets/Shooter/Scripts/BattleModel.js
	shooter/Assets/Shooter/Scripts/BattleWaveModel.js
	shooter/Assets/Shooter/Scripts/BattleWaveMonsterModel.js
	shooter/Assets/Shooter/Scripts/SceneBuilder.js
	shooter/Library/assetDatabase3
	shooter/Library/guidmapper