mafiesto4 40c537d114 Merge branch 'master' into 1.2 ...

# Conflicts:
#	Source/Engine/Platform/Network.h

2021-03-22 11:26:36 +01:00

..

AudioTool

Bumping all copyright headers to 2021.

2021-01-02 14:28:49 +01:00

MaterialGenerator

Fix crash when material is generated at 2 threads at once

2021-03-21 20:25:25 +01:00

ModelTool

Fix importing models with Assimp

2021-03-11 22:58:00 +01:00

TextureTool

Merge remote-tracking branch 'origin/1.1' into 1.2

2021-03-15 09:38:58 +01:00