Skip to content

Commit f1da69b

Browse files
shnokshnok
committed
Merge branch 'gawric-dev' into dev
2 parents 6a3a554 + 405c317 commit f1da69b

25 files changed

+1375
-110
lines changed

‎l2-unity/Assets/Resources/Data/Effects/skybox/L2Sky.mat.meta‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎l2-unity/Assets/Resources/Data/UI/Window/Inventory/demo_image_row/Adena.png‎

459 Bytes
Loading

‎l2-unity/Assets/Resources/Data/UI/Window/Inventory/demo_image_row/Adena.png.meta‎

Lines changed: 127 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎l2-unity/Assets/Resources/Data/UI/Window/Inventory/demo_image_row/NOIMAGE.png‎

1.16 KB
Loading

‎l2-unity/Assets/Resources/Data/UI/Window/Inventory/demo_image_row/NOIMAGE.png.meta‎

Lines changed: 127 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎l2-unity/Assets/Resources/Data/UI/Window/Inventory/demo_image_row/armor_leather_helmet_i00.png‎

1.45 KB
Loading

‎l2-unity/Assets/Resources/Data/UI/Window/Inventory/demo_image_row/armor_leather_helmet_i00.png.meta‎

Lines changed: 127 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎l2-unity/Assets/Resources/Data/UI/Window/Inventory/demo_image_row/etc_soulshot_none_for_rookie_i00.png‎

1.98 KB
Loading

0 commit comments

Comments
 (0)