modified:   Unityproject/Assembly-CSharp-vs.csproj
	modified:   Unityproject/Assembly-CSharp.csproj
	modified:   Unityproject/Assembly-UnityScript-firstpass-vs.unityproj
	modified:   Unityproject/Assembly-UnityScript-firstpass.unityproj
	modified:   Unityproject/Assembly-UnityScript-vs.unityproj
	modified:   Unityproject/Assembly-UnityScript.unityproj
	modified:   Unityproject/Assets/Scenes/lvl1.unity
	modified:   Unityproject/Assets/Scenes/lvl2.unity
	modified:   Unityproject/Assets/Textures/bullet/bulletshotgun.prefab
	modified:   Unityproject/Assets/textures/bullet/bullet.prefab
	modified:   Unityproject/Unityproject-csharp.sln
	modified:   Unityproject/Unityproject.sln
Merge remote-tracking branch 'origin/master' into Nerzull
Merge remote-tracking branch 'origin/master' into Nerzull
пушки, гуи со звуками, улучшение графики

добавлены плазмоган, пулемет, выровнены изображения пушек в гуи,
добавлены звуки выстрелов при смене на определенное оружие, пофиксено
изображение первого уровня, исправление мобов - ортоса, жокей номер 2,
крыса - но не до конца
	modified:   Unityproject/Assembly-CSharp-vs.csproj
	modified:   Unityproject/Assembly-CSharp.csproj
	modified:   Unityproject/Assembly-UnityScript-firstpass-vs.unityproj
	modified:   Unityproject/Assembly-UnityScript-firstpass.unityproj
	modified:   Unityproject/Assembly-UnityScript-vs.unityproj
	modified:   Unityproject/Assembly-UnityScript.unityproj
	modified:   Unityproject/Assets/Scenes/lvl1.unity
	modified:   Unityproject/Assets/Scenes/lvl2.unity
	modified:   Unityproject/Assets/Textures/bullet/bulletshotgun.prefab
	modified:   Unityproject/Assets/textures/bullet/bullet.prefab
	modified:   Unityproject/Unityproject-csharp.sln
	modified:   Unityproject/Unityproject.sln
пушки, гуи со звуками, улучшение графики

добавлены плазмоган, пулемет, выровнены изображения пушек в гуи,
добавлены звуки выстрелов при смене на определенное оружие, пофиксено
изображение первого уровня, исправление мобов - ортоса, жокей номер 2,
крыса - но не до конца
мобы для первого уровня и некоторые для други�
Merge remote-tracking branch 'origin/Nerzull'

Conflicts:
	Unityproject/Assets/Scenes/lvl1.unity
	Unityproject/Assets/Textures/bee/beemove 2.prefab
	Unityproject/Unityproject.userprefs
Merge remote-tracking branch 'origin/Nerzull'

Conflicts:
	Unityproject/Assets/Scenes/lvl1.unity
	Unityproject/Assets/Textures/bee/beemove 2.prefab
	Unityproject/Unityproject.userprefs
123
Merge remote-tracking branch 'origin/Nerzull'
первый лвл
Снежная карта, второй уровень мобы
Merge remote-tracking branch 'origin/master' into morlord

Conflicts:
	Unityproject/Assets/Scenes/lvl1.unity
	Unityproject/Assets/Textures/bee/beemove 2.prefab
	Unityproject/Assets/Textures/skvi/skvi.prefab
	Unityproject/Assets/textures/hero/hero.prefab
	Unityproject/Unityproject.userprefs

	modified:   Unityproject/Assets/Scenes/lvl1.unity
	modified:   Unityproject/Assets/Scenes/lvl2.unity
	new file:   Unityproject/Assets/Scenes/lvl4.unity
	new file:   Unityproject/Assets/Scenes/lvl4.unity.meta
	new file:   Unityproject/Assets/Textures/background/background animation/lvl2/center/center1.png
	new file:   Unityproject/Assets/Textures/background/background animation/lvl2/center/center1.png.meta
	new file:   Unityproject/Assets/Textures/background/background animation/lvl2/left/leftbuilding1.png
	new file:   Unityproject/Assets/Textures/background/background animation/lvl2/left/leftbuilding1.png.meta
	new file:   Unityproject/Assets/Textures/background/background animation/lvl2/main/main1.png
	new file:   Unityproject/Assets/Textures/background/background animation/lvl2/main/main1.png.meta
	new file:   Unityproject/Assets/Textures/background/background animation/lvl2/main/maindestruction1.png
	new file:   Unityproject/Assets/Textures/background/background animation/lvl2/main/maindestruction1.png.meta
	new file:   Unityproject/Assets/Textures/background/background animation/lvl2/right/rightbuilding1.png
	new file:   Unityproject/Assets/Textures/background/background animation/lvl2/right/rightbuilding1.png.meta
	new file:   Unityproject/Assets/Textures/background/lvl4.meta
	new file:   Unityproject/Assets/Textures/background/lvl4/fallingsnow.anim
	renamed:    Unityproject/Assets/Textures/jockey/jockeyController 2.controller.meta -> Unityproject/Assets/Textures/background/lvl4/fallingsnow.anim.meta
	new file:   Unityproject/Assets/Textures/background/lvl4/lvl4.png
	new file:   Unityproject/Assets/Textures/background/lvl4/lvl4.png.meta
	new file:   Unityproject/Assets/Textures/background/lvl4/lvl401.png
	new file:   Unityproject/Assets/Textures/background/lvl4/lvl401.png.meta
	new file:   Unityproject/Assets/Textures/background/lvl4/lvl41.png
	new file:   Unityproject/Assets/Textures/background/lvl4/lvl41.png.meta
	new file:   Unityproject/Assets/Textures/background/lvl4/lvl4controller.controller
	renamed:    Unityproject/Assets/Textures/jockey/jockeyController.controller.meta -> Unityproject/Assets/Textures/background/lvl4/lvl4controller.controller.meta
	modified:   Unityproject/Assets/Textures/bee/beemove 2.prefab
	new file:   Unityproject/Assets/Textures/bee/beemove 2.prefab.bak.meta
	deleted:    Unityproject/Assets/Textures/jockey/jockey 2.prefab
	deleted:    Unityproject/Assets/Textures/jockey/jockey 2.prefab.meta
	deleted:    Unityproject/Assets/Textures/jockey/jockey.prefab
	deleted:    Unityproject/Assets/Textures/jockey/jockey.prefab.meta
	deleted:    Unityproject/Assets/Textures/jockey/jockeyController 2.controller
	deleted:    Unityproject/Assets/Textures/jockey/jockeyController.controller
	modified:   Unityproject/Assets/Textures/ortos/ortos.prefab
	modified:   Unityproject/Assets/Textures/rat/ratdeath1.png
	modified:   Unityproject/Assets/Textures/rat/ratmove1.png
	modified:   Unityproject/Assets/Textures/skvi/skvi.prefab
	modified:   Unityproject/Assets/Textures/sputnik/sputnik.prefab
	modified:   Unityproject/Assets/scripts/HeroBehavior.cs
	modified:   Unityproject/Assets/textures/hero/hero.prefab
	modified:   Unityproject/Unityproject-csharp.sln
	modified:   Unityproject/Unityproject.sln
	modified:   Unityproject/Unityproject.userprefs