Merge branch 'krazerleo/core/1' into enikeev/dev/2 # Conflicts: # Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/Idle_Ducking_AR.anim # Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/Idle_Ducking_AR.anim.meta # Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/Idle_Guard_AR.anim # Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/Idle_Guard_AR.anim.meta # Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/Idle_gunMiddle_AR.anim # Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/Idle_gunMiddle_AR.anim.meta # Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/Run_guard_AR.anim # Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/Run_guard_AR.anim.meta # Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/WalkFront_Shoot_AR.anim # Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/WalkFront_Shoot_AR.anim.meta # Assets/Arts/SciFiWarriorPBRHPPolyart/Materials/promotion.mat # Assets/Arts/SciFiWarriorPBRHPPolyart/Materials/promotion.mat.meta # Assets/Arts/SciFiWarriorPBRHPPolyart/Prefabs/Character without weapon.meta # Assets/Arts/SciFiWarriorPBRHPPolyart/Prefabs/Character without weapon/PBRCharacter.prefab # Assets/Arts/SciFiWarriorPBRHPPolyart/Prefabs/Character without weapon/PBRCharacter.prefab.meta # Assets/Arts/SciFiWarriorPBRHPPolyart/Prefabs/PBRCharacter.prefab # Assets/Arts/SciFiWarriorPBRHPPolyart/Prefabs/PBRCharacter.prefab.meta # Assets/Arts/SciFiWarriorPBRHPPolyart/Prefabs/PolyartCharacter.prefab # Assets/Resources.meta # Assets/Resources/BillingMode.json.meta # Assets/Scenes/dont touch me plz.unity # Assets/SciFiWarriorPBRHPPolyart/Prefabs/PBRCharacter.prefab # Assets/SciFiWarriorPBRHPPolyart/Prefabs/PBRCharacter.prefab.meta # Assets/Scripts/Animators/Kirill Animator/CustomCharacterController.cs # Assets/Scripts/Character/scr_Models.cs # Assets/Scripts/Weapons/WeaponController.cs # # It looks like you may be committing a merge. # If this is not correct, please run # git update-ref -d MERGE_HEAD # and try again. # Please enter the commit message for your changes. Lines starting # with '#' will be ignored, and an empty message aborts the commit. # # On branch enikeev/dev/2 # Your branch is ahead of 'origin/enikeev/dev/2' by 37 commits. # (use "git push" to publish your local commits) # # All conflicts fixed but you are still merging. # # Changes to be committed: # renamed: Assets/Defaults.meta -> Assets/Arts.meta # renamed: Assets/Materials.meta -> Assets/Arts/Materials.meta # renamed: Assets/Materials/New Material.mat -> Assets/Arts/Materials/New Material.mat # renamed: Assets/Materials/New Material.mat.meta -> Assets/Arts/Materials/New Material.mat.meta # renamed: Assets/Models.meta -> Assets/Arts/Models.meta # renamed: Assets/Models/Flag model.fbx -> Assets/Arts/Models/Flag model.fbx # renamed: Assets/Models/Flag model.fbx.meta -> Assets/Arts/Models/Flag model.fbx.meta # renamed: Assets/Models/Textures.meta -> Assets/Arts/Models/Textures.meta # renamed: Assets/Models/Textures/Flag.jpg -> Assets/Arts/Models/Textures/Flag.jpg # renamed: Assets/Models/Textures/Flag.jpg.meta -> Assets/Arts/Models/Textures/Flag.jpg.meta # renamed: Assets/SciFiWarriorPBRHPPolyart.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart.meta # renamed: Assets/SciFiWarriorPBRHPPolyart/Animations.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Animations.meta # renamed: Assets/SciFiWarriorPBRHPPolyart/Animations/AvatarMask.mask -> Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/AvatarMask.mask # renamed: Assets/SciFiWarriorPBRHPPolyart/Animations/AvatarMask.mask.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/AvatarMask.mask.meta # renamed: Assets/SciFiWarriorPBRHPPolyart/Animations/Die.fbx -> Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/Die.fbx # renamed: Assets/SciFiWarriorPBRHPPolyart/Animations/Die.fbx.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/Die.fbx.meta # renamed: Assets/SciFiWarriorPBRHPPolyart/Animations/Idle_Ducking_AR.anim -> Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/Idle_Ducking_AR.anim # renamed: Assets/SciFiWarriorPBRHPPolyart/Animations/Idle_Ducking_AR.anim.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/Idle_Ducking_AR.anim.meta # renamed: Assets/SciFiWarriorPBRHPPolyart/Animations/Idle_Ducking_ar.fbx -> Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/Idle_Ducking_ar.fbx # renamed: Assets/SciFiWarriorPBRHPPolyart/Animations/Idle_Ducking_ar.fbx.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/Idle_Ducking_ar.fbx.meta # renamed: Assets/SciFiWarriorPBRHPPolyart/Animations/Idle_Guard_AR.anim -> Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/Idle_Guard_AR.anim # renamed: Assets/SciFiWarriorPBRHPPolyart/Animations/Idle_Guard_AR.anim.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/Idle_Guard_AR.anim.meta # renamed: Assets/SciFiWarriorPBRHPPolyart/Animations/Idle_Shoot_ar.fbx -> Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/Idle_Shoot_ar.fbx # renamed: Assets/SciFiWarriorPBRHPPolyart/Animations/Idle_Shoot_ar.fbx.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/Idle_Shoot_ar.fbx.meta # renamed: Assets/SciFiWarriorPBRHPPolyart/Animations/Idle_guard_ar.fbx -> Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/Idle_guard_ar.fbx # renamed: Assets/SciFiWarriorPBRHPPolyart/Animations/Idle_guard_ar.fbx.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/Idle_guard_ar.fbx.meta # renamed: Assets/SciFiWarriorPBRHPPolyart/Animations/Idle_gunMiddle_AR.anim -> Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/Idle_gunMiddle_AR.anim # renamed: Assets/SciFiWarriorPBRHPPolyart/Animations/Idle_gunMiddle_AR.anim.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/Idle_gunMiddle_AR.anim.meta # renamed: Assets/SciFiWarriorPBRHPPolyart/Animations/Idle_gunMiddle_ar.fbx -> Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/Idle_gunMiddle_ar.fbx # renamed: Assets/SciFiWarriorPBRHPPolyart/Animations/Idle_gunMiddle_ar.fbx.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/Idle_gunMiddle_ar.fbx.meta # renamed: Assets/SciFiWarriorPBRHPPolyart/Animations/Jump.fbx -> Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/Jump.fbx # renamed: Assets/SciFiWarriorPBRHPPolyart/Animations/Jump.fbx.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/Jump.fbx.meta # renamed: Assets/SciFiWarriorPBRHPPolyart/Animations/Reload.fbx -> Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/Reload.fbx # renamed: Assets/SciFiWarriorPBRHPPolyart/Animations/Reload.fbx.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/Reload.fbx.meta # renamed: Assets/SciFiWarriorPBRHPPolyart/Animations/Run_guard_AR.anim -> Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/Run_guard_AR.anim # renamed: Assets/SciFiWarriorPBRHPPolyart/Animations/Run_guard_AR.anim.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/Run_guard_AR.anim.meta # renamed: Assets/SciFiWarriorPBRHPPolyart/Animations/Run_guard_AR.fbx -> Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/Run_guard_AR.fbx # renamed: Assets/SciFiWarriorPBRHPPolyart/Animations/Run_guard_AR.fbx.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/Run_guard_AR.fbx.meta # renamed: Assets/SciFiWarriorPBRHPPolyart/Animations/Run_gunMiddle_AR.fbx -> Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/Run_gunMiddle_AR.fbx # renamed: Assets/SciFiWarriorPBRHPPolyart/Animations/Run_gunMiddle_AR.fbx.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/Run_gunMiddle_AR.fbx.meta # renamed: Assets/SciFiWarriorPBRHPPolyart/Animations/Shoot_AutoShot_AR.fbx -> Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/Shoot_AutoShot_AR.fbx # renamed: Assets/SciFiWarriorPBRHPPolyart/Animations/Shoot_AutoShot_AR.fbx.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/Shoot_AutoShot_AR.fbx.meta # renamed: Assets/SciFiWarriorPBRHPPolyart/Animations/Shoot_BurstShot_AR.fbx -> Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/Shoot_BurstShot_AR.fbx # renamed: Assets/SciFiWarriorPBRHPPolyart/Animations/Shoot_BurstShot_AR.fbx.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/Shoot_BurstShot_AR.fbx.meta # renamed: Assets/SciFiWarriorPBRHPPolyart/Animations/Shoot_SingleShot_AR.fbx -> Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/Shoot_SingleShot_AR.fbx # renamed: Assets/SciFiWarriorPBRHPPolyart/Animations/Shoot_SingleShot_AR.fbx.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/Shoot_SingleShot_AR.fbx.meta # renamed: Assets/SciFiWarriorPBRHPPolyart/Animations/WalkBack_Shoot_ar.fbx -> Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/WalkBack_Shoot_ar.fbx # renamed: Assets/SciFiWarriorPBRHPPolyart/Animations/WalkBack_Shoot_ar.fbx.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/WalkBack_Shoot_ar.fbx.meta # renamed: Assets/SciFiWarriorPBRHPPolyart/Animations/WalkFront_Shoot_AR.anim -> Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/WalkFront_Shoot_AR.anim # renamed: Assets/SciFiWarriorPBRHPPolyart/Animations/WalkFront_Shoot_AR.anim.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/WalkFront_Shoot_AR.anim.meta # renamed: Assets/SciFiWarriorPBRHPPolyart/Animations/WalkFront_Shoot_ar.fbx -> Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/WalkFront_Shoot_ar.fbx # renamed: Assets/SciFiWarriorPBRHPPolyart/Animations/WalkFront_Shoot_ar.fbx.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/WalkFront_Shoot_ar.fbx.meta # renamed: Assets/SciFiWarriorPBRHPPolyart/Animations/WalkLeft_Shoot_ar.fbx -> Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/WalkLeft_Shoot_ar.fbx # renamed: Assets/SciFiWarriorPBRHPPolyart/Animations/WalkLeft_Shoot_ar.fbx.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/WalkLeft_Shoot_ar.fbx.meta # renamed: Assets/SciFiWarriorPBRHPPolyart/Animations/WalkRight_Shoot_ar.fbx -> Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/WalkRight_Shoot_ar.fbx # renamed: Assets/SciFiWarriorPBRHPPolyart/Animations/WalkRight_Shoot_ar.fbx.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/WalkRight_Shoot_ar.fbx.meta # renamed: Assets/SciFiWarriorPBRHPPolyart/Animators.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Animators.meta # new file: Assets/Arts/SciFiWarriorPBRHPPolyart/Animators/SciFiWarrior.controller # renamed: Assets/SciFiWarriorPBRHPPolyart/Animators/SciFiWarrior.controller.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Animators/SciFiWarrior.controller.meta # renamed: Assets/SciFiWarriorPBRHPPolyart/Animators/SciFiWarriorOur.controller -> Assets/Arts/SciFiWarriorPBRHPPolyart/Animators/SciFiWarriorOur.controller # renamed: Assets/SciFiWarriorPBRHPPolyart/Animators/SciFiWarriorOur.controller.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Animators/SciFiWarriorOur.controller.meta # renamed: Assets/SciFiWarriorPBRHPPolyart/Materials.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Materials.meta # renamed: Assets/SciFiWarriorPBRHPPolyart/Materials/HP.mat -> Assets/Arts/SciFiWarriorPBRHPPolyart/Materials/HP.mat # renamed: Assets/SciFiWarriorPBRHPPolyart/Materials/HP.mat.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Materials/HP.mat.meta # renamed: Assets/SciFiWarriorPBRHPPolyart/Materials/PBR.mat -> Assets/Arts/SciFiWarriorPBRHPPolyart/Materials/PBR.mat # renamed: Assets/SciFiWarriorPBRHPPolyart/Materials/PBR.mat.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Materials/PBR.mat.meta # renamed: Assets/SciFiWarriorPBRHPPolyart/Materials/Polyart.mat -> Assets/Arts/SciFiWarriorPBRHPPolyart/Materials/Polyart.mat # renamed: Assets/SciFiWarriorPBRHPPolyart/Materials/Polyart.mat.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Materials/Polyart.mat.meta # renamed: Assets/SciFiWarriorPBRHPPolyart/Materials/Skybox_Mat.mat -> Assets/Arts/SciFiWarriorPBRHPPolyart/Materials/Skybox_Mat.mat # renamed: Assets/SciFiWarriorPBRHPPolyart/Materials/Skybox_Mat.mat.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Materials/Skybox_Mat.mat.meta # renamed: Assets/SciFiWarriorPBRHPPolyart/Materials/Stage.mat -> Assets/Arts/SciFiWarriorPBRHPPolyart/Materials/Stage.mat # renamed: Assets/SciFiWarriorPBRHPPolyart/Materials/Stage.mat.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Materials/Stage.mat.meta # renamed: Assets/SciFiWarriorPBRHPPolyart/Materials/promotion.mat -> Assets/Arts/SciFiWarriorPBRHPPolyart/Materials/promotion.mat # renamed: Assets/SciFiWarriorPBRHPPolyart/Materials/promotion.mat.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Materials/promotion.mat.meta # renamed: Assets/SciFiWarriorPBRHPPolyart/Mesh.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Mesh.meta # renamed: Assets/SciFiWarriorPBRHPPolyart/Mesh/PBR_HP_Mesh.fbx -> Assets/Arts/SciFiWarriorPBRHPPolyart/Mesh/PBR_HP_Mesh.fbx # renamed: Assets/SciFiWarriorPBRHPPolyart/Mesh/PBR_HP_Mesh.fbx.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Mesh/PBR_HP_Mesh.fbx.meta # renamed: Assets/SciFiWarriorPBRHPPolyart/Mesh/Polyart_Mesh.fbx -> Assets/Arts/SciFiWarriorPBRHPPolyart/Mesh/Polyart_Mesh.fbx # renamed: Assets/SciFiWarriorPBRHPPolyart/Mesh/Polyart_Mesh.fbx.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Mesh/Polyart_Mesh.fbx.meta # renamed: Assets/SciFiWarriorPBRHPPolyart/Mesh/Stage.fbx -> Assets/Arts/SciFiWarriorPBRHPPolyart/Mesh/Stage.fbx # renamed: Assets/SciFiWarriorPBRHPPolyart/Mesh/Stage.fbx.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Mesh/Stage.fbx.meta # renamed: Assets/SciFiWarriorPBRHPPolyart/Prefabs.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Prefabs.meta # renamed: Assets/SciFiWarriorPBRHPPolyart/Prefabs/Character without weapon.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Prefabs/Character without weapon.meta # renamed: Assets/SciFiWarriorPBRHPPolyart/Prefabs/Character without weapon/PBRCharacter.prefab -> Assets/Arts/SciFiWarriorPBRHPPolyart/Prefabs/Character without weapon/PBRCharacter.prefab # renamed: Assets/SciFiWarriorPBRHPPolyart/Prefabs/Character without weapon/PBRCharacter.prefab.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Prefabs/Character without weapon/PBRCharacter.prefab.meta # renamed: Assets/SciFiWarriorPBRHPPolyart/Prefabs/HPCharacter.prefab -> Assets/Arts/SciFiWarriorPBRHPPolyart/Prefabs/HPCharacter.prefab # renamed: Assets/SciFiWarriorPBRHPPolyart/Prefabs/HPCharacter.prefab.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Prefabs/HPCharacter.prefab.meta # new file: Assets/Arts/SciFiWarriorPBRHPPolyart/Prefabs/PBRCharacter.prefab # new file: Assets/Arts/SciFiWarriorPBRHPPolyart/Prefabs/PBRCharacter.prefab.meta # renamed: Assets/SciFiWarriorPBRHPPolyart/Prefabs/PolyartCharacter.prefab -> Assets/Arts/SciFiWarriorPBRHPPolyart/Prefabs/PolyartCharacter.prefab # renamed: Assets/SciFiWarriorPBRHPPolyart/Prefabs/PolyartCharacter.prefab.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Prefabs/PolyartCharacter.prefab.meta # renamed: Assets/SciFiWarriorPBRHPPolyart/Scene.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Scene.meta # renamed: Assets/SciFiWarriorPBRHPPolyart/Scene/DemoScene01.unity -> Assets/Arts/SciFiWarriorPBRHPPolyart/Scene/DemoScene01.unity # renamed: Assets/SciFiWarriorPBRHPPolyart/Scene/DemoScene01.unity.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Scene/DemoScene01.unity.meta # renamed: Assets/SciFiWarriorPBRHPPolyart/Textures.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Textures.meta # renamed: Assets/SciFiWarriorPBRHPPolyart/Textures/HP_Albedo.png -> Assets/Arts/SciFiWarriorPBRHPPolyart/Textures/HP_Albedo.png # renamed: Assets/SciFiWarriorPBRHPPolyart/Textures/HP_Albedo.png.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Textures/HP_Albedo.png.meta # renamed: Assets/SciFiWarriorPBRHPPolyart/Textures/PBR_Albedo.png -> Assets/Arts/SciFiWarriorPBRHPPolyart/Textures/PBR_Albedo.png # renamed: Assets/SciFiWarriorPBRHPPolyart/Textures/PBR_Albedo.png.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Textures/PBR_Albedo.png.meta # renamed: Assets/SciFiWarriorPBRHPPolyart/Textures/PBR_Free_AO.png -> Assets/Arts/SciFiWarriorPBRHPPolyart/Textures/PBR_Free_AO.png # renamed: Assets/SciFiWarriorPBRHPPolyart/Textures/PBR_Free_AO.png.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Textures/PBR_Free_AO.png.meta # renamed: Assets/SciFiWarriorPBRHPPolyart/Textures/PBR_Free_EM.png -> Assets/Arts/SciFiWarriorPBRHPPolyart/Textures/PBR_Free_EM.png # renamed: Assets/SciFiWarriorPBRHPPolyart/Textures/PBR_Free_EM.png.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Textures/PBR_Free_EM.png.meta # renamed: Assets/SciFiWarriorPBRHPPolyart/Textures/PBR_Free_MS.png -> Assets/Arts/SciFiWarriorPBRHPPolyart/Textures/PBR_Free_MS.png # renamed: Assets/SciFiWarriorPBRHPPolyart/Textures/PBR_Free_MS.png.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Textures/PBR_Free_MS.png.meta # renamed: Assets/SciFiWarriorPBRHPPolyart/Textures/PBR_Free_NM.png -> Assets/Arts/SciFiWarriorPBRHPPolyart/Textures/PBR_Free_NM.png # renamed: Assets/SciFiWarriorPBRHPPolyart/Textures/PBR_Free_NM.png.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Textures/PBR_Free_NM.png.meta # renamed: Assets/SciFiWarriorPBRHPPolyart/Textures/Polyart.png -> Assets/Arts/SciFiWarriorPBRHPPolyart/Textures/Polyart.png # renamed: Assets/SciFiWarriorPBRHPPolyart/Textures/Polyart.png.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Textures/Polyart.png.meta # renamed: Assets/SciFiWarriorPBRHPPolyart/Textures/PolyartEmission.png -> Assets/Arts/SciFiWarriorPBRHPPolyart/Textures/PolyartEmission.png # renamed: Assets/SciFiWarriorPBRHPPolyart/Textures/PolyartEmission.png.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Textures/PolyartEmission.png.meta # renamed: Assets/SciFiWarriorPBRHPPolyart/promotion.jpg -> Assets/Arts/SciFiWarriorPBRHPPolyart/promotion.jpg # renamed: Assets/SciFiWarriorPBRHPPolyart/promotion.jpg.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/promotion.jpg.meta # deleted: Assets/Defaults/mat_proBuilder.mat # new file: Assets/Inputs/InputSystem.inputsettings.asset # new file: Assets/Inputs/InputSystem.inputsettings.asset.meta # new file: Assets/Inputs/ThirdPersonViewInput.cs # new file: Assets/Inputs/ThirdPersonViewInput.cs.meta # new file: Assets/Inputs/ThirdPersonViewInput.inputactions # new file: Assets/Inputs/ThirdPersonViewInput.inputactions.meta # new file: Assets/Prefabs/CharacterPrefabs.meta # renamed: Assets/Prefabs/Bot.prefab -> Assets/Prefabs/CharacterPrefabs/Bot.prefab # renamed: Assets/Prefabs/Bot.prefab.meta -> Assets/Prefabs/CharacterPrefabs/Bot.prefab.meta # new file: Assets/Prefabs/CharacterPrefabs/Character.prefab # new file: Assets/Prefabs/CharacterPrefabs/Character.prefab.meta # renamed: Assets/Prefabs/Player.prefab -> Assets/Prefabs/CharacterPrefabs/Player.prefab # renamed: Assets/Prefabs/Player.prefab.meta -> Assets/Prefabs/CharacterPrefabs/Player.prefab.meta # new file: Assets/Prefabs/EntityPrefabs.meta # renamed: Assets/Prefabs/Flag zone.prefab -> Assets/Prefabs/EntityPrefabs/Flag zone.prefab # renamed: Assets/Prefabs/Flag zone.prefab.meta -> Assets/Prefabs/EntityPrefabs/Flag zone.prefab.meta # new file: Assets/Prefabs/EntityPrefabs/navPointPrefab.prefab # new file: Assets/Prefabs/EntityPrefabs/navPointPrefab.prefab.meta # new file: Assets/Prefabs/PickupPrefabs.meta # renamed: Assets/Prefabs/ammo.prefab -> Assets/Prefabs/PickupPrefabs/ammo.prefab # renamed: Assets/Prefabs/ammo.prefab.meta -> Assets/Prefabs/PickupPrefabs/ammo.prefab.meta # renamed: Assets/Prefabs/armour.prefab -> Assets/Prefabs/PickupPrefabs/armour.prefab # renamed: Assets/Prefabs/armour.prefab.meta -> Assets/Prefabs/PickupPrefabs/armour.prefab.meta # renamed: Assets/Prefabs/health.prefab -> Assets/Prefabs/PickupPrefabs/health.prefab # renamed: Assets/Prefabs/health.prefab.meta -> Assets/Prefabs/PickupPrefabs/health.prefab.meta # modified: Assets/Resources.meta # modified: Assets/Resources/BillingMode.json.meta # new file: Assets/Scenes/AnimationTestScene.unity # renamed: Assets/Scenes/dont touch me plz.unity.meta -> Assets/Scenes/AnimationTestScene.unity.meta # modified: Assets/Scenes/Greatest_map_ever/Greatest_map_ever.unity # renamed: Assets/Scenes/First try.unity -> Assets/Scenes/Map#1.unity # renamed: Assets/Scenes/First try.unity.meta -> Assets/Scenes/Map#1.unity.meta # deleted: Assets/Scenes/dont touch me plz.unity # new file: Assets/Scripts/Animators.meta # new file: Assets/Scripts/Animators/Kirill Animator.meta # renamed: Assets/Scripts/Character/scr_CharacterController.cs -> Assets/Scripts/Animators/Kirill Animator/CustomCharacterController.cs # renamed: Assets/Scripts/Character/scr_CharacterController.cs.meta -> Assets/Scripts/Animators/Kirill Animator/CustomCharacterController.cs.meta # new file: Assets/Scripts/Animators/Kirill Animator/Models.cs # renamed: Assets/Scripts/Character/scr_Models.cs.meta -> Assets/Scripts/Animators/Kirill Animator/Models.cs.meta # new file: Assets/Scripts/Animators/Leonid Animator.meta # new file: Assets/Scripts/Animators/Leonid Animator/AnimatorHandler.cs # new file: Assets/Scripts/Animators/Leonid Animator/AnimatorHandler.cs.meta # renamed: Assets/SciFiWarriorPBRHPPolyart/Animators/SciFiWarrior.controller -> Assets/Scripts/Animators/Leonid Animator/CharacterAnimator.controller # renamed: Assets/Defaults/mat_proBuilder.mat.meta -> Assets/Scripts/Animators/Leonid Animator/CharacterAnimator.controller.meta # new file: Assets/Scripts/Animators/Leonid Animator/CharacterLocomotion.cs # new file: Assets/Scripts/Animators/Leonid Animator/CharacterLocomotion.cs.meta # new file: Assets/Scripts/Animators/Leonid Animator/InputHandler.cs # new file: Assets/Scripts/Animators/Leonid Animator/InputHandler.cs.meta # new file: Assets/Scripts/Animators/Leonid Animator/LowerBody.mask # new file: Assets/Scripts/Animators/Leonid Animator/LowerBody.mask.meta # new file: Assets/Scripts/Animators/Leonid Animator/UpperBody.mask # new file: Assets/Scripts/Animators/Leonid Animator/UpperBody.mask.meta # new file: Assets/Scripts/CameraScripts.meta # new file: Assets/Scripts/CameraScripts/CameraHandler.cs # new file: Assets/Scripts/CameraScripts/CameraHandler.cs.meta # modified: Assets/Scripts/Character/NPC.cs # deleted: Assets/Scripts/Character/scr_Models.cs # modified: Assets/Scripts/Misc/NavPoint.cs # renamed: Assets/Scripts/Weapons/scr_WeaponController.cs -> Assets/Scripts/Weapons/WeaponController.cs # renamed: Assets/Scripts/Weapons/scr_WeaponController.cs.meta -> Assets/Scripts/Weapons/WeaponController.cs.meta # modified: ProjectSettings/EditorBuildSettings.asset # modified: ProjectSettings/TagManager.asset #