Wojtek Figat 312e4ad010 Merge branch 'master' into 1.1 ...

# Conflicts:
#	Source/Engine/Content/JsonAsset.h
#	Source/Engine/Core/Config/Settings.h

2021-02-15 10:40:59 +01:00

..

Flax.Build

Merge branch 'master' into 1.1

2021-02-15 10:40:59 +01:00

Flax.Build.Tests

Bumping all copyright headers to 2021.

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

Flax.Stats

Fixed additional typos

2021-01-05 02:14:21 +01:00

FlaxEngine.Tests

Add Add/Subtract methods to Transform

2021-01-27 15:07:02 +01:00