Merge remote-tracking branch 'origin/master'

2025-12-11 13:07:42 +00:00 · 2020-05-22 03:37:08 -04:00
parent de2996a941 1158a171e7
commit 23870c53aa
16 changed files with 116 additions and 99 deletions
--- a/Runtime/World/CPatterned.cpp
+++ b/Runtime/World/CPatterned.cpp
@@ -25,7 +25,6 @@

 namespace urde {

-constexpr zeus::CColor CPatterned::skDamageColor(0.5f, 0.f, 0.f);
 constexpr CMaterialList skPatternedGroundMaterialList(EMaterialTypes::Character, EMaterialTypes::Solid,
                                                      EMaterialTypes::Orbit, EMaterialTypes::GroundCollider,
                                                      EMaterialTypes::Target);