Merge branch 'feature/import-assets' of dev.stilobique.com:Athena/game-source into feature/import-assets

Browse Source

# Conflicts:
#	assets/props/rock floor/rock floor.gltf
#	assets/props/rock floor/rock floor.material

...

This commit is contained in:

stilobique-surface

2021-05-08 16:44:26 +02:00

parent ec1fc57a81 b923f15898

commit b67960ea93

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

Diff Content Not Available