52c0cc2f84
# Conflicts: # Assets/Shaders/TestCube_VS.shshaderb # SHADE_Engine/src/Editor/EditorWindow/Inspector/SHEditorComponentView.hpp # SHADE_Engine/src/Graphics/MiddleEnd/Batching/SHBatch.h # SHADE_Engine/src/Graphics/MiddleEnd/GlobalData/SHGraphicsPredefinedData.cpp # SHADE_Engine/src/Graphics/MiddleEnd/GlobalData/SHGraphicsPredefinedData.h # SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsConstants.h # SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsSystem.cpp # SHADE_Engine/src/Graphics/MiddleEnd/Meshes/SHPrimitiveGenerator.cpp # SHADE_Engine/src/Graphics/MiddleEnd/Meshes/SHPrimitiveGenerator.h # SHADE_Engine/src/Graphics/MiddleEnd/Pipeline/SHPipelineLibrary.cpp # SHADE_Engine/src/Graphics/MiddleEnd/Pipeline/SHPipelineLibrary.h # SHADE_Engine/src/Serialization/SHYAMLConverters.h |
||
---|---|---|
.. | ||
Audio | ||
Editor | ||
Fonts | ||
Materials | ||
Models | ||
Scenes | ||
Scripts | ||
Shaders | ||
Texture | ||
Application.SHConfig | ||
Bindings.SHConfig | ||
CollisionTags.SHConfig |