mafiesto4 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

..

CPU

Add safety checks for particles data to prevent division by 0

2021-02-06 15:58:12 +01:00

GPU

Merge branch 'master' into 1.1

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

ParticleEmitterGraph.h

Fixed a ton of typos

2021-01-05 02:13:15 +01:00