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 |
|
Brandon Mak
|
4a06032bea
|
Shadows WIP
|
2023-01-11 08:25:38 +08:00 |
|
Brandon Mak
|
99e7dbfa01
|
WIP
|
2022-12-28 20:47:20 +08:00 |
|
Kah Wei
|
eea35600d3
|
Switched shaders to use multiply colour instead of additive
|
2022-11-04 14:04:59 +08:00 |
|
Glence
|
5fe10ce8d1
|
Changes to main for presentation
Change TestCube_FS.glsl
Change debugdraw Key input to F10
TestScene changes
AI waypoint changed
playercontroller camera axis change
|
2022-11-03 01:50:02 +08:00 |
|
Sri Sham Haran
|
e609b5634a
|
Material Inspector
Can set material
|
2022-11-02 21:31:27 +08:00 |
|
Brandon Mak
|
b46b6b0b85
|
CompileAll uncommented and asset manager metadata writes commented
SHmeta files should now be identical to what's on main
Shaders themselves have some changes (binaries also updated)
|
2022-10-30 00:25:49 +08:00 |
|
Brandon Mak
|
5db9299699
|
Reverted back to old asset IDs
|
2022-10-30 00:07:02 +08:00 |
|
Brandon Mak
|
7c5a24b8e1
|
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
|
2022-10-30 00:00:17 +08:00 |
|
Xiao Qi
|
b5a1d5ea88
|
SP3-282 Restructured loaders and compilers
Completed shader compiling and loading
|
2022-10-27 12:54:58 +08:00 |