Merge remote-tracking branch 'origin/master' into ShootEvent

resources/Schema/Entities/Empty.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd" xmlns:c="components">
+  <Components>
+    <c:Transform/>
+  </Components>
+</Entity>

src/Engine/Editor/EditorSystem.cpp

@@ -615,8 +615,8 @@ bool EditorSystem::createEntityNode(World* world, EntityID entity)
 
         if (ImGui::BeginPopupContextItem("item context menu")) {
             if (ImGui::Button("Add")) {
-                EntityID entity = world->CreateEntity(entity);
-                world->AttachComponent(entity, "Transform");
+                EntityID newEntity = world->CreateEntity(entity);
+                world->AttachComponent(newEntity, "Transform");
             }
             ImGui::SameLine();
             if (ImGui::Button("Delete")) {