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

349 Commits

Author SHA1 Message Date
mushgunAX c7b99df2f6 Merge branch 'main' into AudioImplementation 2023-02-04 00:31:23 +08:00
mushgunAX 49fadfed74 Dynamic BGM 2023-02-04 00:23:05 +08:00
Xiao Qi 0281446538 Merge remote-tracking branch 'origin/main' into main 2023-02-03 23:50:40 +08:00
Xiao Qi 1bae1c97d6 Added demo animation objects 2023-02-03 23:50:35 +08:00
Diren D Bharwani 7a79cda729 Reworked Collision Tag Interface and Logic 2023-02-03 23:22:21 +08:00
mushgunAX 136d86dce3 Fix Item Score SFX 2023-02-03 23:19:12 +08:00
mushgunAX d71790022f Merge branch 'main' into AudioImplementation 2023-02-03 23:16:47 +08:00
Diren D Bharwani c61be35da0 Merge remote-tracking branch 'origin/main' into SP3-2-Physics 2023-02-03 22:44:58 +08:00
Glence e00b891bf7 added lights to level 2 2023-02-03 22:03:55 +08:00
Glence 5284066cee Merge branch 'main' into PlayerController 2023-02-03 21:29:02 +08:00
Glence 2ee46f33df update collision tag to have a save button and clamp raycast draw 2023-02-03 21:28:50 +08:00
Brandon Mak 6cde511b36 Shadows update 
Made it less dark
 2023-02-03 20:16:42 +08:00
mushgunAX a6bc9ed2b4 Updates on audio 2023-02-03 19:37:18 +08:00
Diren D Bharwani 36de32447d Fixed some bugs with serialisation 2023-02-03 18:40:45 +08:00
mushgunAX 60fa4335a0 Merge branch 'main' into AudioImplementation 2023-02-03 17:01:11 +08:00
Glence 6b5bd43110 Merge branch 'main' into PlayerController 2023-02-03 16:48:51 +08:00
Diren D Bharwani c73275f2d3 Added temporary use of collision layers to C# and fixed raycast drawing 2023-02-03 16:11:30 +08:00
Diren D Bharwani b81e71ed08 Merge remote-tracking branch 'origin/main' into SP3-2-Physics 2023-02-03 02:03:12 +08:00
Diren D Bharwani b6d91d5492 Fixed bug with collision tags not behaving as intended 
Why the damn hell must react's system be so confusing??
 2023-02-03 01:37:45 +08:00
mushgunAX d1a3214d41 Change banks 2023-02-03 00:40:22 +08:00
Glence 5bf3af2ed2 corrected transition to diff scenes 2023-02-03 00:03:05 +08:00
Glence 4af3440db7 added gameplay for level1 and multiplier combo is done 2023-02-02 22:44:48 +08:00
Diren D Bharwani 931f6fe5e2 Fixed almost everything. Ray debug drawing has a small bug 2023-02-02 20:56:55 +08:00
Diren D Bharwani d5c731dd20 Fixed collision shape debug drawing and more serialisation bugs 2023-02-02 20:48:32 +08:00
mushgunAX e28c6ce1a7 new banks 2023-02-02 20:16:12 +08:00
Diren D Bharwani 3593df3ada Fixed collider shape serialisation 2023-02-02 20:15:59 +08:00
Diren D Bharwani 71f4cdd29e Fixed rigidbody serialisation 2023-02-02 19:23:42 +08:00
Diren D Bharwani 6a57be2e60 Refactored old physics to match new interface 
Compiles but still buggy, need a bit of time to clear up all the bugs
 2023-02-02 19:06:56 +08:00
mushgunAX 1d0522e334 Audio Implementation for AI 2023-02-02 16:58:40 +08:00
Glence 5b628baedf changes breakable to only minus count on items 2023-02-02 11:16:56 +08:00
Glence ec11f8cb8f Merge branch 'main' into PlayerController 2023-02-02 10:45:21 +08:00
Brandon Mak 109f35f297 Merge remote-tracking branch 'origin/main' into SP3-1-Rendering 2023-01-31 19:02:11 +08:00
Glence 8d43fca1cc added models for level 1 and made gamemanager a singleton 2023-01-31 18:13:34 +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
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
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
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
Sri Sham Haran 559cda92f1
Delete Editor.SHConfig 2023-01-30 18:27:29 +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
SHAM-DP 59ef28baf1 Merge branch 'main' into AudioScripting 2023-01-30 16:47:46 +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 3ff2e6bb92
Revert "Implemented a custom physics engine" 2023-01-30 14:40:55 +08:00