79fe9ec43d
# Conflicts: # SHADE_Engine/src/Animation/SHAnimationClip.cpp # SHADE_Engine/src/Animation/SHAnimationClip.h # SHADE_Engine/src/Animation/SHAnimatorComponent.cpp # SHADE_Engine/src/Animation/SHAnimatorComponent.h # SHADE_Engine/src/Assets/Asset Types/Models/SHAnimationAsset.h # SHADE_Engine/src/Assets/SHAssetMacros.h # SHADE_Engine/src/Assets/SHAssetManager.cpp |
||
---|---|---|
.github/ISSUE_TEMPLATE | ||
Assets | ||
Premake | ||
SHADE_Application | ||
SHADE_CSharp | ||
SHADE_Engine | ||
SHADE_Managed | ||
.editorconfig | ||
.gitignore | ||
Dependencies.bat | ||
Dependencies.lua | ||
generate.bat | ||
premake5.lua |