Brajanowski b56f980dc1 Merge remote-tracking branch 'origin/Jab' into dev2 ...

# 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

2025-09-17 00:13:37 +02:00

..

InfectedAreaManager.cs

working on enemies

2025-08-20 05:06:00 +02:00

InfectedAreaManager.cs.meta

working on enemies

2025-08-20 05:06:00 +02:00

InfectedAreaRendererFeature.cs

working on enemies

2025-08-20 05:06:00 +02:00

InfectedAreaRendererFeature.cs.meta

working on enemies

2025-08-20 05:06:00 +02:00

m_infected_area_composite.mat

working on enemies

2025-08-20 05:06:00 +02:00

m_infected_area_composite.mat.meta

working on enemies

2025-08-20 05:06:00 +02:00

m_infected_area_particle_trail.mat

working on enemies

2025-08-20 05:06:00 +02:00

m_infected_area_particle_trail.mat.meta

working on enemies

2025-08-20 05:06:00 +02:00

m_infected_area_particle.mat

working on enemies

2025-08-20 05:06:00 +02:00

m_infected_area_particle.mat.meta

working on enemies

2025-08-20 05:06:00 +02:00

m_infected_area.mat

Merge remote-tracking branch 'origin/Jab' into dev2

2025-09-17 00:13:37 +02:00

m_infected_area.mat.meta

working on enemies

2025-08-20 05:06:00 +02:00

sg_infected_area_composite.shadergraph

working on enemies

2025-08-20 05:06:00 +02:00

sg_infected_area_composite.shadergraph.meta

working on enemies

2025-08-20 05:06:00 +02:00

sg_infected_area.shadergraph

added 'ts' command to change timescale in debug builds; triplanar mapping for infected area textures

2025-09-15 01:11:41 +02:00

sg_infected_area.shadergraph.meta

working on enemies

2025-08-20 05:06:00 +02:00