Brajanowski
b56f980dc1
# Conflicts: # Assets/AddressableAssetsData/AddressableAssetSettings.asset # Assets/AddressableAssetsData/AssetGroups/Jelycho Core.asset # Assets/AddressableAssetsData/Windows/addressables_content_state.bin # Assets/HighlightPlus/Runtime/Resources/HighlightPlus/HighlightPlusDepthWrite.mat # Assets/Scenes/scn_main.unity # Assets/Settings/PC_Renderer.asset # Assets/Settings/SampleSceneProfile.asset # Assets/Settings/UniversalRenderPipelineGlobalSettings.asset # Assets/jelycho/Code/Enemies/ZombieActor.cs.meta # Assets/jelycho/Code/Main/JelychoGame.cs # Assets/jelycho/Code/Player/FPPCamera.cs # Assets/jelycho/Code/Player/PlayerActor.cs # Assets/jelycho/Code/Player/PlayerController.cs # Assets/jelycho/Worlds/dev/scn_map_dev.unity # Assets/jelycho/actors/player/Player Controller.asset # Assets/jelycho/core/enemies/Zombie/animator_zombie.controller # Assets/jelycho/core/enemies/Zombie/dev_materials/m_human_boots_1.mat # Assets/jelycho/core/enemies/Zombie/dev_materials/m_human_eyes.mat # Assets/jelycho/core/player/a_player.prefab # Assets/jelycho/core/player/animator_player.controller # ProjectSettings/Packages/com.unity.multiplayer.tools/CustomColorSettings.asset # ProjectSettings/Packages/com.unity.probuilder/Settings.json # ProjectSettings/ProjectSettings.asset