xiaoqi
/
SHADE_Y3
1
0
Fork 0
Code Issues 12 Pull Requests Packages Projects Releases 9 Wiki Activity
2,051 Commits 81 Branches 9 Tags 86 MiB
C++ 84.2%
C# 7.5%
C 6.2%
GLSL 1.7%
Lua 0.3%
Other 0.1%
Go to file
Kah Wei 52c0cc2f84 Merge branch 'main' into SP3-17-animation-system 
# 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
 		2023-01-30 14:57:46 +08:00
.github/ISSUE_TEMPLATE Alter template 2022-11-14 18:26:31 +08:00
Assets Merge branch 'main' into SP3-17-animation-system 2023-01-30 14:57:46 +08:00
Premake Replaced premake exe with custom compiled one 2022-09-15 09:31:37 +08:00
SHADE_Application Merge branch 'main' into SP3-17-animation-system 2023-01-30 14:57:46 +08:00
SHADE_CSharp Disabled xmldoc build, admin mode no longer required to build the engine 2022-11-22 20:59:17 +08:00
SHADE_Engine Merge branch 'main' into SP3-17-animation-system 2023-01-30 14:57:46 +08:00
SHADE_Managed Merge remote-tracking branch 'origin/main' into SHPhysics 2023-01-16 16:22:59 +08:00
.editorconfig Added .editorconfig to enforce 2-spacing indentation 2022-10-25 15:39:18 +08:00
.gitignore Added Copy/Paste of Component Values 2022-12-28 21:23:34 +08:00
Dependencies.bat Added additional file utilities, PowerShell based execution of commands and tools for working with visual studio 2022-12-30 17:02:09 +08:00
Dependencies.lua Added additional file utilities, PowerShell based execution of commands and tools for working with visual studio 2022-12-30 17:02:09 +08:00
generate.bat Modified generate.bat to delete all generated files before generating files 2022-09-20 16:37:29 +08:00
premake5.lua Text Rendering WIP 2022-11-14 18:36:26 +08:00