Kah Wei
|
53f599a238
|
Added RemoveScript(Script) for Scripts and GameObjects
|
2023-01-31 17:28:24 +08:00 |
Diren D Bharwani
|
3b6e0be364
|
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
|
2023-01-31 17:14:52 +08:00 |
Brandon Mak
|
e9452093f0
|
Fixed UI
|
2023-01-31 15:17:40 +08:00 |
Glence
|
0f8e1d6310
|
Merge branch 'main' into PlayerController
|
2023-01-31 13:47:55 +08:00 |
XiaoQiDigipen
|
24c15743a1
|
Merge pull request #324 from SHADE-DP/SP3-10-input-management
Set to force the use of dedicated GPU
|
2023-01-31 12:53:13 +08:00 |
mushgunAX
|
710bfe1dac
|
Merge branch 'main' into SP3-10-input-management
|
2023-01-31 12:51:50 +08:00 |
mushgunAX
|
38f2ba69db
|
Force use of Dedicated GPU
|
2023-01-31 12:43:02 +08:00 |
Kah Wei
|
b46d2135bc
|
Modified Renderable and TextRenderable to no longer use reference to Assets, and use the Asset directly instead
|
2023-01-31 10:53:58 +08:00 |
Glence
|
d1d7d430b1
|
added breakable food into the scene
#issues to fix
egg collision too small so weight is really small
throwing heavy objects doesnt give enuff force compared to rolling and hitting it
|
2023-01-31 00:43:25 +08:00 |
Glence
|
3e015d924e
|
Merge branch 'main' into PlayerController
|
2023-01-30 23:30:55 +08:00 |
Kah Wei
|
a5b7672102
|
Merge branch 'main' into SP3-6-c-scripting
|
2023-01-30 20:53:42 +08:00 |
Kah Wei
|
f93d5fcd63
|
Added scripting inteface for SHUIComponent
|
2023-01-30 20:52:39 +08:00 |
Xiao Qi
|
c13f06e4a6
|
Added warning line to check for existing path
|
2023-01-30 19:55:42 +08:00 |
XiaoQiDigipen
|
eedcd44b8e
|
Merge pull request #323 from SHADE-DP/delete-editorconfig
Delete Editor.SHConfig (Delete this branch)
|
2023-01-30 18:32:29 +08:00 |
XiaoQiDigipen
|
f1bf9cb865
|
Merge pull request #322 from SHADE-DP/SP3-4-Editor
Added hierarchy panel filter
|
2023-01-30 18:29:47 +08:00 |
Xiao Qi
|
f2b8e52608
|
Commented unused shader build lines
|
2023-01-30 18:28:49 +08:00 |
Sri Sham Haran
|
559cda92f1
|
Delete Editor.SHConfig
|
2023-01-30 18:27:29 +08:00 |
SHAM-DP
|
f2a0b38406
|
Merge branch 'main' into SP3-4-Editor
|
2023-01-30 17:56:38 +08:00 |
SHAM-DP
|
cf999b0d3b
|
Added entity filter
|
2023-01-30 17:44:06 +08:00 |
XiaoQiDigipen
|
213ac9d275
|
Merge pull request #321 from SHADE-DP/SP3-17-animation-system
Animation WIP merge
|
2023-01-30 17:35:56 +08:00 |
XiaoQiDigipen
|
4c5becff46
|
Merge pull request #320 from SHADE-DP/AudioScripting
Added Scripting interface for AudioClips
|
2023-01-30 17:08:38 +08:00 |
Kah Wei
|
c2aa067cc4
|
Fixed crash caused by loading incorrect renderpass for subpass replacement
|
2023-01-30 16:55:15 +08:00 |
SHAM-DP
|
59ef28baf1
|
Merge branch 'main' into AudioScripting
|
2023-01-30 16:47:46 +08:00 |
SHAM-DP
|
526c6dc883
|
Spatial scripting inteface changes (remove eid requirement)
|
2023-01-30 16:47:38 +08:00 |
SHAM-DP
|
74b8ee73c5
|
Spatial setup
|
2023-01-30 16:47:03 +08:00 |
Brandon Mak
|
a3ca04535f
|
More changes
|
2023-01-30 16:46:42 +08:00 |
Brandon Mak
|
89b101f3e5
|
passed string by value dum dum brandon
|
2023-01-30 16:46:14 +08:00 |
Brandon Mak
|
c45c469c8e
|
Change GetUsableSubpasses to GetUsableSubpass
|
2023-01-30 16:42:19 +08:00 |
Brandon Mak
|
f8bde9fc35
|
Added map to retrieve usable subpasses
|
2023-01-30 16:35:12 +08:00 |
Kah Wei
|
8a4a469abf
|
Added ability to change subpass for a material and fixed typo for vertex shader in the material editor
|
2023-01-30 15:52:42 +08:00 |
Brandon Mak
|
a67e65ff76
|
Made array for usable subpasses
|
2023-01-30 15:34:22 +08:00 |
Brandon Mak
|
23734fa42c
|
Merge branch 'main' into SP3-1-Rendering
|
2023-01-30 15:23:00 +08:00 |
Kah Wei
|
61fa2ae923
|
Merge branch 'main' into SP3-17-animation-system
|
2023-01-30 15:16:09 +08:00 |
Kah Wei
|
53ef202e46
|
Merge branch 'main' into SP3-17-animation-system
# Conflicts:
# SHADE_Engine/src/Editor/EditorWindow/Inspector/SHEditorComponentView.hpp
# SHADE_Engine/src/Serialization/SHYAMLConverters.h
|
2023-01-30 15:15:46 +08:00 |
XiaoQiDigipen
|
5240c837ec
|
Merge pull request #318 from SHADE-DP/SP3-10-input-management
Implemented Input Binding Panel via Editor
|
2023-01-30 15:00:58 +08:00 |
Kah Wei
|
b3f79e31db
|
Forgot to commit shader binary
|
2023-01-30 14:58:52 +08:00 |
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 |
XiaoQiDigipen
|
2fd8506fab
|
Merge pull request #319 from SHADE-DP/revert-316-SHPhysics
Revert "Implemented a custom physics engine"
|
2023-01-30 14:41:09 +08:00 |
XiaoQiDigipen
|
3ff2e6bb92
|
Revert "Implemented a custom physics engine"
|
2023-01-30 14:40:55 +08:00 |
Kah Wei
|
8c3703ce04
|
Fixed models using wrong animation bone matrices
|
2023-01-29 20:52:04 +08:00 |
Kah Wei
|
4a00312f57
|
Added serialization of AnimatorComponent
|
2023-01-29 20:35:18 +08:00 |
Kah Wei
|
2d1987e14b
|
Added handling for rendering objects using an animated shader but without an animator component or an attached rig
|
2023-01-29 19:27:58 +08:00 |
Kah Wei
|
741489b0ae
|
Merge branch 'SP3-17-animation-system' of https://github.com/SHADE-DP/SHADE_Y3 into SP3-17-animation-system
|
2023-01-29 18:51:36 +08:00 |
Kah Wei
|
6af4933b52
|
Fixed on-close crashes coming from SHResourceManager
|
2023-01-29 18:51:31 +08:00 |
Xiao Qi
|
83a33b3851
|
Bone count data member in mesh asset
|
2023-01-29 18:38:12 +08:00 |
Kah Wei
|
eab2f2d54a
|
Fixed bug where replacing an animator's rig causes the GPU to be lost
|
2023-01-29 16:03:08 +08:00 |
Kah Wei
|
3f1a25c95b
|
Fixed crash caused by loading more than one SHRig
|
2023-01-29 15:39:48 +08:00 |
Kah Wei
|
1472823dc0
|
Removed buggy animation debug draw
|
2023-01-29 14:45:46 +08:00 |
Brandon Mak
|
d5897387c5
|
Merge branch 'main' into SP3-1-Rendering
|
2023-01-29 13:25:40 +08:00 |
mushgunAX
|
ac10b95b01
|
Tooltips
|
2023-01-25 23:54:04 +08:00 |