version control - meta files
тени и asset-pro
новые спелл еффекты, баг с физикой, люстра
Merge branch 'master' of github.com:Fila61/shooter

Conflicts:
	shooter/Assets/PlaneSmall.fbx.meta
	shooter/Assets/Resources/fonts/droidsans_bullets_num.ttf.meta
	shooter/Assets/Resources/fonts/droidsans_crit.ttf.meta
	shooter/Assets/Resources/textures/buttons/Implode_blue.png.meta
	shooter/Assets/Resources/textures/buttons/Implode_grey_old.png.meta
	shooter/Assets/Resources/textures/buttons/Implode_red.png.meta
	shooter/Assets/Resources/textures/buttons/Implode_red_BLINK.png.meta
	shooter/Assets/Resources/textures/buttons/Shockwave_blue.png.meta
	shooter/Assets/Resources/textures/buttons/Shockwave_grey_old.png.meta
	shooter/Assets/Resources/textures/buttons/Shockwave_red.png.meta
	shooter/Assets/Resources/textures/buttons/Shockwave_red_BLINK.png.meta
	shooter/Assets/Resources/textures/buttons/Slam_blue.png.meta
	shooter/Assets/Resources/textures/buttons/Slam_grey.png.meta
	shooter/Assets/Resources/textures/buttons/Slam_red.png.meta
	shooter/Assets/Resources/textures/buttons/Slam_red_BLINK.png.meta
	shooter/Assets/Resources/textures/buttons/Swipe_blue.png.meta
	shooter/Assets/Resources/textures/buttons/Swipe_grey_old.png.meta
	shooter/Assets/Resources/textures/buttons/Swipe_red.png.meta
	shooter/Assets/Resources/textures/buttons/Swipe_red_BLINK.png.meta
	shooter/Assets/Resources/textures/buttons/implode_FRAME.png.meta
	shooter/Assets/Resources/textures/buttons/implode_FRAME_BLINK.png.meta
	shooter/Assets/Resources/textures/buttons/implode_color.png.meta
	shooter/Assets/Resources/textures/buttons/launcher_active.png.meta
	shooter/Assets/Resources/textures/buttons/launcher_active_RED.png.meta
	shooter/Assets/Resources/textures/buttons/launcher_disabled.png.meta
	shooter/Assets/Resources/textures/buttons/launcher_disabled_RED.png.meta
	shooter/Assets/Resources/textures/buttons/railgun_active.png.meta
	shooter/Assets/Resources/textures/buttons/railgun_active_RED.png.meta
	shooter/Assets/Resources/textures/buttons/railgun_disabled.png.meta
	shooter/Assets/Resources/textures/buttons/railgun_disabled_RED.png.meta
	shooter/Assets/Resources/textures/buttons/rifle_active.png.meta
	shooter/Assets/Resources/textures/buttons/rifle_active_RED.png.meta
	shooter/Assets/Resources/textures/buttons/rifle_disabled.png.meta
	shooter/Assets/Resources/textures/buttons/rifle_disabled_RED.png.meta
	shooter/Assets/Resources/textures/buttons/shockwave_FRAME.png.meta
	shooter/Assets/Resources/textures/buttons/shockwave_FRAME_BLINK.png.meta
	shooter/Assets/Resources/textures/buttons/shockwave_color.png.meta
	shooter/Assets/Resources/textures/buttons/shotgun_active.png.meta
	shooter/Assets/Resources/textures/buttons/shotgun_active_RED.png.meta
	shooter/Assets/Resources/textures/buttons/shotgun_disabled.png.meta
	shooter/Assets/Resources/textures/buttons/shotgun_disabled_RED.png.meta
	shooter/Assets/Resources/textures/buttons/slame_FRAME.png.meta
	shooter/Assets/Resources/textures/buttons/slame_FRAME_BLINK.png.meta
	shooter/Assets/Resources/textures/buttons/slame_color.png.meta
	shooter/Assets/Resources/textures/buttons/slame_grey.png.meta
	shooter/Assets/Resources/textures/buttons/swipe_FRAME.png.meta
	shooter/Assets/Resources/textures/buttons/swipe_FRAME_BLINK.png.meta
	shooter/Assets/Resources/textures/buttons/swipe_color.png.meta
	shooter/Assets/Resources/textures/colors/Pink.tif.meta
	shooter/Assets/Resources/textures/radarpoint.png.meta
	shooter/Assets/Resources/textures/radarpoint_blink.png.meta
	shooter/Library/AssetServerCacheV3
	shooter/Library/ProjectSettings.asset
	shooter/Library/ScriptMapper
	shooter/Library/assetDatabase3
	shooter/Library/guidmapper
	shooter/ProjectSettings/EditorSettings.asset
	shooter/ProjectSettings/ProjectSettings.asset
	shooter/ProjectSettings/QualitySettings.asset