Merge branch 'main' into item-models

This commit is contained in:
MihailRis
2024-10-29 23:05:14 +03:00
11 changed files with 45 additions and 19 deletions
+3 -2
View File
@@ -1,4 +1,6 @@
#include "EntityDef.hpp"
void EntityDef::cloneTo(EntityDef& dst) {
dst.components = components;
dst.bodyType = bodyType;
@@ -8,5 +10,4 @@ void EntityDef::cloneTo(EntityDef& dst) {
dst.skeletonName = skeletonName;
dst.blocking = blocking;
dst.save = save;
}
}
+1 -1
View File
@@ -45,7 +45,7 @@ struct EntityDef {
} skeleton;
struct {
bool velocity = true;
bool settings = false;
bool settings = true;
} body;
} save {};