fix: solve merge conflict
Showing
- Assets/Free Pack/Ghost Manifestation 2.wav.meta 1 addition, 1 deletionAssets/Free Pack/Ghost Manifestation 2.wav.meta
- Assets/Hovl Studio/Procedural fire/Demo scene/Concrete slab.png.meta 1 addition, 1 deletion... Studio/Procedural fire/Demo scene/Concrete slab.png.meta
- Assets/Hovl Studio/Procedural fire/Demo scene/Concrete slab_Height.png.meta 1 addition, 1 deletion.../Procedural fire/Demo scene/Concrete slab_Height.png.meta
- Assets/Hovl Studio/Procedural fire/Demo scene/Concrete slab_MetallicSmoothness.png.meta 1 addition, 1 deletion...fire/Demo scene/Concrete slab_MetallicSmoothness.png.meta
- Assets/Hovl Studio/Procedural fire/Demo scene/Concrete slab_Normal.png.meta 1 addition, 1 deletion.../Procedural fire/Demo scene/Concrete slab_Normal.png.meta
- Assets/Hovl Studio/Procedural fire/Demo scene/Floor3.mat.meta 1 addition, 1 deletion...ts/Hovl Studio/Procedural fire/Demo scene/Floor3.mat.meta
- Assets/Hovl Studio/Procedural fire/Demo scene/LightingData.asset.meta 1 addition, 1 deletion...Studio/Procedural fire/Demo scene/LightingData.asset.meta
- Assets/Hovl Studio/Procedural fire/Demo scene/Lightmap-0_comp_dir.png.meta 1 addition, 1 deletion...o/Procedural fire/Demo scene/Lightmap-0_comp_dir.png.meta
- Assets/Hovl Studio/Procedural fire/Demo scene/Lightmap-0_comp_light.exr.meta 1 addition, 1 deletion...Procedural fire/Demo scene/Lightmap-0_comp_light.exr.meta
- Assets/Hovl Studio/Procedural fire/Demo scene/Readme.txt.meta 1 addition, 1 deletion...ts/Hovl Studio/Procedural fire/Demo scene/Readme.txt.meta
- Assets/Hovl Studio/Procedural fire/Demo scene/ReflectionProbe-0.exr.meta 1 addition, 1 deletion...dio/Procedural fire/Demo scene/ReflectionProbe-0.exr.meta
- Assets/Hovl Studio/Procedural fire/Demo scene/ReflectionProbe-1.exr.meta 1 addition, 1 deletion...dio/Procedural fire/Demo scene/ReflectionProbe-1.exr.meta
- Assets/Hovl Studio/Procedural fire/Textures/Smoke26.png.meta 1 addition, 1 deletionAssets/Hovl Studio/Procedural fire/Textures/Smoke26.png.meta
- Assets/Hovl Studio/Procedural fire/Textures/Trail67.png.meta 1 addition, 1 deletionAssets/Hovl Studio/Procedural fire/Textures/Trail67.png.meta
Please register or sign in to comment