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

Browse Source

# Conflicts:
#	assets/props/book/materials/MAT_book.material
#	assets/props/candle/sm_candle_a.mesh
#	assets/props/godet/materials/godet.material
#	assets/props/godet/sm_godet.mesh
#	assets/props/parchment/materials/PaperParchment.material
#	assets/props/parchment/sm_paper_parcment.mesh
#	assets/props/parchment/sm_wood_parchment.mesh
#	assets/props/rock floor/sm_floor.mesh
#	assets/props/stool b/sm_stool_b.mesh
#	assets/props/table/sm_table.mesh
#	scenes/levels/warcraft/WarCraft.gd
#	scenes/levels/warcraft/WarCraft.tscn

...

This commit is contained in:

stilobique-surface

2021-05-13 20:32:47 +02:00

parent 92f1fc6f4f a9de0551c3

commit 71d6a87fb0

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