działaj kuirwo

Browse Source

# Conflicts:
#	Assets/AddressableAssetsData/AddressableAssetSettings.asset
#	Assets/TerrainData_082ed354-ddb7-4526-a5c9-d70df8d31f7c.asset
#	Assets/TerrainData_6d6bf880-a71c-4783-a3c9-876acbf47c4c.asset
#	Assets/TerrainData_7954a49e-a14a-4526-88e2-ba297716e67b.asset
#	Assets/TerrainData_9724b08a-9b38-4d5b-8470-8626fd9368aa.asset
#	Assets/TerrainSampleAssets/TerrainLayers/Heather_TerrainLayer.terrainlayer
#	Assets/TerrainSampleAssets/TerrainLayers/Muddy_TerrainLayer.terrainlayer
#	Assets/TerrainSampleAssets/TerrainLayers/Soil_Rocks_TerrainLayer.terrainlayer
#	Assets/Woda Jabłonia/Swamp.mat
#	Assets/jelycho/Code/Abilities/AbilityAsset.cs.meta
#	Assets/jelycho/Code/Enemies/ZombieActor.cs.meta
#	Assets/jelycho/Worlds/rr_astek/scn_map_astek.unity

...

This commit is contained in:

Bartek

2025-09-16 21:15:14 +02:00

parent 1085d6f12b 161133fdd0

commit aa216aa1b2

3 changed files with 1 additions and 1 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

0

Assets/jelycho/Code/ZombieActor.cs Executable file → Normal file

0

Assets/jelycho/Code/ZombieActor.cs.meta Executable file → Normal file