12a46c4266
# Conflicts: # SHADE_Engine/src/Graphics/MiddleEnd/Batching/SHBatch.cpp # SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHDebugDrawSystem.cpp # SHADE_Engine/src/Graphics/MiddleEnd/Meshes/SHPrimitiveGenerator.cpp # SHADE_Engine/src/Graphics/MiddleEnd/Meshes/SHPrimitiveGenerator.h |
||
---|---|---|
.github/ISSUE_TEMPLATE | ||
Assets | ||
Premake | ||
SHADE_Application | ||
SHADE_CSharp | ||
SHADE_Engine | ||
SHADE_Managed | ||
.editorconfig | ||
.gitignore | ||
Dependencies.bat | ||
Dependencies.lua | ||
generate.bat | ||
premake5.lua |