Merge branch 'master' into asmjit

This commit is contained in:
Christoph Oelckers 2018-11-27 19:53:22 +01:00
commit 5e4e9e2c2b
28 changed files with 51 additions and 36 deletions

View file

@ -46,6 +46,9 @@ xx(Shadow)
xx(Subtract)
xx(Subtractive)
xx(FillColor)
xx(ColorBlend)
xx(ColorAdd)
xx(Multiply)
// Healingradius types
xx(Mana)