xiaoqi
/
SHADE_Y3
1
0
Fork 0
Code Issues 12 Pull Requests Packages Projects Releases 9 Wiki Activity
2,111 Commits 81 Branches 9 Tags 86 MiB
Commit Graph

2111 Commits

Author SHA1 Message Date
Kah Wei ee03722153 Merge branch 'main' into SP3-6-c-scripting 2023-02-01 23:49:44 +08:00
Kah Wei 0b0590180d Fixed incorrect functor called in SHScriptEngine::onUIElementClicked() 2023-02-01 11:57:11 +08:00
XiaoQiDigipen ab48efce30
Merge pull request #326 from SHADE-DP/SP3-1-Rendering 
Fixed UI Rendering
 2023-01-31 22:53:03 +08:00
Brandon Mak d9833ca8b0 Merge remote-tracking branch 'origin/main' into SP3-1-Rendering 2023-01-31 19:07:28 +08:00
XiaoQiDigipen 71613143f6
Merge pull request #325 from SHADE-DP/SP3-4-Editor 
Added Asset Browser Filters, double click asset id in inspector to highlight asset in asset browser
 2023-01-31 19:05:21 +08:00
Brandon Mak 109f35f297 Merge remote-tracking branch 'origin/main' into SP3-1-Rendering 2023-01-31 19:02:11 +08:00
Brandon Mak ea74f5ebf6 Fixed some errors in SHUISystem 2023-01-31 19:01:21 +08:00
SHAM-DP d6fc83d3b7 Merge branch 'main' into SP3-4-Editor 2023-01-31 18:56:09 +08:00
SHAM-DP 4c4d39d4bb Added double click asset id in inspector to scroll to asset in asset browser 
Added asset browser filter by name and type
 2023-01-31 18:55:50 +08:00
Kah Wei 8f9a4e8c73 Fixed bug where onDestroy() is not called for scripts that are destroyed when leaving play mode in the editor 2023-01-31 18:09:07 +08:00
Xiao Qi 8c9673cafd Removed editor config from repo 2023-01-31 17:48:29 +08:00
Xiao Qi e0f363f1ec Changed line to only ignore editor config 2023-01-31 17:47:36 +08:00
Xiao Qi 164b4f7197 Changed gitignore line to ignore all items in Editor Folder 2023-01-31 17:38:48 +08:00
Kah Wei 53f599a238 Added RemoveScript(Script) for Scripts and GameObjects 2023-01-31 17:28:24 +08:00
Brandon Mak e9452093f0 Fixed UI 2023-01-31 15:17:40 +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
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