Commit Graph

1626 Commits

Author SHA1 Message Date
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
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
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
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
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