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

1718 Commits

Author SHA1 Message Date
Kah Wei d16f807a8a Added links properties panel 2023-03-06 16:17:05 +08:00
Xiao Qi becff4824f Camera without editor compile fix 2023-03-06 15:38:42 +08:00
Diren D Bharwani 0b803d0bd1 Merge branch 'main' into SP3-2-Physics 2023-03-06 13:31:48 +08:00
Kah Wei f8cc1fe2dc Size of animation controller editor is now adjustable 2023-03-06 11:47:30 +08:00
Brandon Mak 826df94c96 Shadows WIP 2023-03-06 00:02:06 +08:00
Glence 8d6ef16625 Hot fix 
Pause menu fix
Offing gameplay UI on preview level
clipping of mouse
change some keydown to keyup
 2023-03-05 23:48:25 +08:00
Diren D Bharwani d59f4e88c2 Added gravity scale 
Update react dependency
 2023-03-05 23:39:33 +08:00
Sri Sham Haran 9866c6e307 Handle mouse center/visible when editor play/pause/stop 2023-03-05 21:33:05 +08:00
Sri Sham Haran 77e3fe376b Handle mouse center/visible when editor play/pause/stop 2023-03-05 21:24:16 +08:00
Sri Sham Haran 0e2b767263 Fix for button w wrong textures (remove reflection of currentTexture) 2023-03-05 20:23:52 +08:00
Glence bf5472e2c6 stuff dont ask me 2023-03-05 15:35:57 +08:00
maverickdgg 8b24d7e32b re-added the button texture check before setting texture 2023-03-05 13:58:07 +08:00
maverickdgg 76e794a543 Merge branch 'main' into SP3-20-UI-System 2023-03-05 13:56:29 +08:00
maverickdgg 4bc568899d Fix Button click state not resetting if the release event happen when button is inactive 2023-03-05 13:55:51 +08:00
Kah Wei cedd10c188 Merge branch 'main' into SP3-6-c-scripting 2023-03-05 12:17:31 +08:00
Kah Wei 24f09ab537 Fixed issue with ImGui corrupting strings passed to managed data. 2023-03-05 12:17:19 +08:00
maverickdgg ef0ff801e4 Camera arm target offset rotation fix 2023-03-05 10:55:39 +08:00
Xiao Qi 816c16324c WIP Commit, Node and Joint indexing 2023-03-05 04:25:30 +08:00
Kah Wei 066d060b29 Split main animation controller panel into 3 segments 2023-03-05 01:45:26 +08:00
Kah Wei 32adb0c540 Reworked how AnimationControllerEditor works 2023-03-05 01:08:39 +08:00
Brandon Mak 13f28d6bdb Fixed shiny highlight shaders 2023-03-04 15:55:04 +08:00
Xiao Qi d4081a7e09 Tranpose Inverse Bind Matrix 
WIP, building transform matrix not working
 2023-03-04 03:20:01 +08:00
Brandon Mak 17bb7a08eb Fixed render to swapchain errors 2023-03-04 01:01:26 +08:00
Brandon Mak ce41e975d0 Merge branch 'main' into SP3-1-Rendering 2023-03-04 00:52:05 +08:00
Kah Wei b93a08fa90 Fixed ImGui crash with SHRawAnimationInspector 2023-03-04 00:48:10 +08:00
Xiao Qi 56693565f4 WIP Load and test animations 2023-03-04 00:43:31 +08:00
Brandon Mak 166e13a339 Shadows WIP 
- Light direction in 2nd level changed
 2023-03-03 22:01:34 +08:00
Kah Wei 97605cc8fe Added preliminary implementation of animation controller connection attributes 2023-03-03 22:00:56 +08:00
Kah Wei 41784d4c04 Fixed animation clips list for Raw Animation Inspector 2023-03-03 21:28:28 +08:00
SHAM-DP 96d73ca626 added ifdef check for editor 2023-03-03 20:06:58 +08:00
Kah Wei beeeae99ca SHRawAnimInspector can now generate incomplete animation clips 2023-03-03 18:53:59 +08:00
XiaoQiDigipen 421016f4fc
Merge pull request #385 from SHADE-DP/SP3-129-AudioSystem 
Add Set audio param with label functionality
 2023-03-03 18:30:17 +08:00
SHAM-DP dfc2a68dde Add Set audio param with label functionality 2023-03-03 18:13:35 +08:00
Xiao Qi 0741163774 Merge remote-tracking branch 'origin/SP3-22-AnimationController' into SP3-22-AnimationController 2023-03-03 17:23:18 +08:00
Xiao Qi 184fd4f459 [NOT TESTED] Animation Clip asset reading/writing as asset file into binary implemented 2023-03-03 17:16:23 +08:00
Kah Wei f9ae0c10ce Modified SHAnimator and SHRig to use new model formats 2023-03-03 17:11:33 +08:00
SHAM-DP 9eb40d5928 Fix showcursor 2023-03-03 16:52:43 +08:00
Kah Wei c736967d1c Merge branch 'main' into SP3-22-AnimationController 2023-03-02 19:08:20 +08:00
Kah Wei 69fa0d4da0 Fixed SHRawAnimInspector warnings 2023-03-02 17:44:28 +08:00
Glence 97db3b1021 Merge branch 'main' into PlayerController 2023-03-02 17:33:42 +08:00
Kah Wei 6779f48b5a Fixed typo 2023-03-02 17:33:02 +08:00
Glence 8c74ec85d3 Done with level preview 2023-03-02 17:33:02 +08:00
Kah Wei 65d57e96b3 Merge branch 'main' into SP3-22-AnimationController 
# Conflicts:
#	SHADE_Engine/src/Editor/EditorWindow/Inspector/SHEditorComponentView.hpp
 2023-03-02 16:55:13 +08:00
Kah Wei 3a14f0a887 Added SHRawAnimInspector 2023-03-02 16:54:34 +08:00
Xiao Qi f083147806 WIP Retrofit new data into existing structure 2023-03-02 16:35:30 +08:00
Brandon Mak 61a877cee1 Fixed bug texture loading 
- During mipmap transfer to GPU, height would sometimes be 0. Fixed it using std::max
 2023-03-02 16:04:22 +08:00
Brandon Mak 6b42d78f16 Merge remote-tracking branch 'origin/main' into SP3-1-Rendering 2023-03-02 15:49:36 +08:00
Brandon Mak e05e21ec5a Added text size for text renderable component 2023-03-02 15:49:28 +08:00
Brandon Mak e2ef32f130 Fixed Trajectory Rendering 2023-03-02 15:29:24 +08:00
Kah Wei 62fa2ba41a Merge branch 'main' into SP3-22-AnimationController 2023-03-02 13:03:33 +08:00
XiaoQiDigipen 4124c74306
Merge pull request #381 from SHADE-DP/SP3-1-Rendering 
Implemented serialization for text color and trajectory rendering
 2023-03-02 12:47:35 +08:00
XiaoQiDigipen 38afe39447
Merge pull request #380 from SHADE-DP/SP3-20-UI-System 
Added TweenThreadVec3. Updated UI elements to use new textures and fonts. Gameplay UI WIP
 2023-03-02 12:46:11 +08:00
Brandon Mak 848123c138 Bug fix 2023-03-02 11:53:52 +08:00
Brandon Mak 1e59b6436c Merge branch 'main' into SP3-1-Rendering 2023-03-02 11:36:35 +08:00
maverickdgg 30923389ae Merge branch 'main' into SP3-20-UI-System 2023-03-02 10:23:09 +08:00
Brandon Mak 87c04436b3 Added scripting interface and serialization for Trajectory comp 2023-03-02 09:08:20 +08:00
maverickdgg 9dd01f5fa1 Replaced How to play screen and credits placeholder 2023-03-02 03:01:24 +08:00
maverickdgg 5cc2e26de6 Rotates target offset based on camera arm's rotation 2023-03-02 02:06:25 +08:00
Kah Wei dfb53bf290 Added WIP AnimationControllerEditor 2023-03-01 23:49:30 +08:00
Xiao Qi af944b3083 UNTESTED: Loading of new format for animations and rigs 2023-03-01 23:13:02 +08:00
Kah Wei d21f9d6c4b Added functions for adding transitions and parameters to an AnimationController 2023-03-01 22:10:09 +08:00
Kah Wei e878b7b65a Added implementation of SHAnimationController Transition logic 2023-03-01 21:55:26 +08:00
Xiao Qi f118c1c2ca WIP Load new model asset structure 2023-03-01 17:56:37 +08:00
SHAM-DP 98140aa797 Added scripting interface for cursor visible. 
Fixed collider offset undo/redo
Double click object to look at object
Display editor cam pitch/yaw/roll
 2023-03-01 17:06:53 +08:00
Xiao Qi bc17479284 Merge branch 'main' into SP3-13-Assets-Manager 2023-03-01 16:33:30 +08:00
Brandon Mak 4b37be6075 Made text color serialized 2023-03-01 16:02:44 +08:00
Kah Wei 2679d12afb Merge branch 'main' into SP3-22-AnimationController 2023-03-01 14:02:28 +08:00
Brandon Mak e44e961e14 Particles WIP 2023-03-01 10:06:09 +08:00
Brandon Mak 77722aa560 renamed some files 2023-03-01 08:58:16 +08:00
Brandon Mak 2e7bfd8b28 Merge branch 'main' into SP3-1-Rendering 2023-03-01 08:56:45 +08:00
Kah Wei e97f5747cb Modified SHAnimatorComponent to support manual and animation controller modes. Fleshed out SHAnimationController. Added SHAnimControllerAsset stub. 2023-03-01 01:30:34 +08:00
Glence bd9349eae7 FRC fix, stealfood popup almost done and reset dt when load 2023-02-28 21:42:05 +08:00
Brandon Mak 0da61aa842 Fixed text rendering rendering last 2023-02-28 21:30:09 +08:00
Brandon Mak 7f13462db7 GetGraphicsPipeline now takes in a subpass (thanks KW) 
- Fixed blending issues in pipeline
 2023-02-28 19:47:52 +08:00
Kah Wei 36af939c67 Added reworked AnimationClip and SHAnimClipAsset 2023-02-28 19:19:06 +08:00
Glence 04c19fb586 Merge branch 'main' into PlayerController 2023-02-28 19:13:11 +08:00
SHAM-DP ef268bc9e5 Drag drop prefab onto entity (NON UNDO/REDO ACTION for now) 2023-02-28 16:01:52 +08:00
Glence 52ba54a82a Fix ShinyHighlight issue and updated level 3 2023-02-28 15:42:28 +08:00
SHAM-DP 7e34edecdd safety check for scroll to after paste entity 2023-02-28 15:36:45 +08:00
SHAM-DP 5b5a9342c3 Merge branch 'main' into SP3-4-Editor 2023-02-28 15:12:31 +08:00
SHAM-DP e75826436f Fix editor config working scene, fix entities being copy/pasted when using copy paste in a field. Fix filtered display for asset browser 2023-02-28 15:12:17 +08:00
Glence 2ab4981a43 renamed cutscene to cutsceneIntro and adjusted level 2 2023-02-28 15:06:19 +08:00
SHAM-DP 3141902e3d Merge branch 'main' into SP3-129-AudioSystem 2023-02-28 13:11:36 +08:00
SHAM-DP a6659f7cbc Remove some redundant lines 2023-02-28 13:11:21 +08:00
SHAM-DP 417f086dfa Clean up and verified VCA Volume editing is working fine 2023-02-28 09:36:28 +08:00
SHAM-DP 50d7ad80a2 Added Spatial Audio 2023-02-27 22:02:48 +08:00
Glence 79cb0f12ae WIP for Alpha, added material name in editor WIP for cutscene 2023-02-27 18:09:05 +08:00
Kah Wei 33b5b84fd4 add anim clip 2023-02-27 17:04:16 +08:00
Kah Wei f061e8ed43 Updated comments to use SHRawAnimation instead of SHAnimationData 2023-02-27 16:52:41 +08:00
Kah Wei 7839bd21f2 Renamed SHAnimationData to SHRawAnimation 2023-02-27 16:51:02 +08:00
maverickdgg cbb334d48e Slider Text Default Value fix 2023-02-27 16:39:31 +08:00
Kah Wei ba22638520 Renamed SHAnimationClip to SHAnimationData 2023-02-27 16:17:36 +08:00
Glence 75295b5d6e Merge branch 'main' into PlayerController 2023-02-27 15:58:37 +08:00
Kah Wei 9486762693 Merge branch 'main' into SP3-22-AnimationController 2023-02-27 15:54:48 +08:00
maverickdgg 4c7d06452e viewport changed 2023-02-27 15:25:01 +08:00
Brandon Mak f6db65ddf4 Particles WIP 2023-02-27 15:14:32 +08:00
XiaoQiDigipen 0eae325b5f
Merge pull request #369 from SHADE-DP/SP3-20-UI-System 
Added Sliders. Added Level Select, How To Play,. Credits Options Canvases layout for in main menu. Added Tweening Manager(Script)
 2023-02-27 12:00:24 +08:00
XiaoQiDigipen 29f1edb9e8
Merge pull request #368 from SHADE-DP/SP3-4-Editor 
Added display of editor camera position
 2023-02-27 11:59:58 +08:00
maverickdgg 90763ded71 Change Canvas Button Script 2023-02-27 08:08:04 +08:00
maverickdgg eb3d8b6b8b Slider done, Slider Shader bugged 2023-02-27 05:42:54 +08:00