szczuras4 ed9d1eefbb Merge remote-tracking branch 'origin/NewStory' into NewStory ...

# Conflicts:
#	Assets/MEDIEVAL_ANIMATIONS_MEGA_PACK_new/Bow/Materials/Adam_body_Metal.mat
#	Assets/MEDIEVAL_ANIMATIONS_MEGA_PACK_new/Bow/Materials/Adam_head_metal.mat
#	Assets/MEDIEVAL_ANIMATIONS_MEGA_PACK_new/Bow/Materials/Bow.mat
#	Assets/MEDIEVAL_ANIMATIONS_MEGA_PACK_new/Bow/Materials/Eva_Body_Metal.mat
#	Assets/MEDIEVAL_ANIMATIONS_MEGA_PACK_new/Bow/Materials/Eva_Head_Metal.mat

2025-09-13 19:10:55 +02:00

..

2H_Weapon

…

2Weapons

…

Bow

Merge remote-tracking branch 'origin/NewStory' into NewStory

2025-09-13 19:10:55 +02:00

General_Animations

…

Halberd

…

Horseman

…

Textures

…

Weapon_and_Shield

…

Wisard's

…

2H_Weapon.meta

…

2Weapons.meta

…

Bow.meta

…

General_Animations.meta

…

Halberd.meta

…

Horseman.meta

…

MEDIEVAL_megaPack_NOTES.rtf

…

MEDIEVAL_megaPack_NOTES.rtf.meta

…

Textures.meta

…

Weapon_and_Shield.meta

…

Wisard's.meta

…