T

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

# 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

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

assets

Solve conflict #2

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

developers

Solve conflict #2

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

locales

Use translation for dialog quit

2021-05-12 14:55:59 +02:00

releases

Add folder for exporting project