[FIXED] merge
This commit is contained in:
@@ -21,7 +21,6 @@
|
||||
<ItemGroup>
|
||||
<ClCompile Include="src\collision\collision_handler.cpp" />
|
||||
<ClCompile Include="src\scenes\in_Game_Scene.cpp" />
|
||||
<ClCompile Include="src\scenes\scene.cpp" />
|
||||
<ClCompile Include="src\entities\camera.cpp" />
|
||||
<ClCompile Include="src\entities\collision_entity.cpp" />
|
||||
<ClCompile Include="src\entities\entity.cpp" />
|
||||
@@ -45,7 +44,6 @@
|
||||
<ClInclude Include="src\entities\collision_entity.h" />
|
||||
<ClInclude Include="src\entities\entity.h" />
|
||||
<ClInclude Include="src\entities\light.h" />
|
||||
<ClInclude Include="src\entities\player.h" />
|
||||
<ClInclude Include="src\gui\gui_element.h" />
|
||||
<ClInclude Include="src\gui\gui_interactable.h" />
|
||||
<ClInclude Include="src\models\model.h" />
|
||||
|
||||
Reference in New Issue
Block a user