Commit Graph

2628 Commits

Author SHA1 Message Date
Glence 04c19fb586 Merge branch 'main' into PlayerController 2023-02-28 19:13:11 +08:00
Glence 0bdab3b079 WIP for steal food pop up 2023-02-28 18:35:43 +08:00
mushgunAX d9f064994e Merge branch 'main' into scenetransitions 2023-02-28 18:34:07 +08:00
XiaoQiDigipen b9b9f86bad
Merge pull request #375 from SHADE-DP/SP3-4-Editor
Fixed editor bugs - Copy/Paste values caused entities to get pasted, filtered asset browser could not expand compilable assets, EditorConfig workingscene does not get saved sometimes
2023-02-28 16:22:17 +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
XiaoQiDigipen 911ecf15ed
Merge pull request #374 from SHADE-DP/SP3-129-AudioSystem
Added spatial audio
2023-02-28 13:17: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
mushgunAX d563247ec2 Merge branch 'main' into scenetransitions 2023-02-28 06:49:55 +08:00
mushgunAX b3ec2fb4df implementing in progress 2023-02-28 06:49:40 +08:00
Glence 380de28358 cutscene for intro done 2023-02-28 01:57:00 +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
XiaoQiDigipen f57e9e9a91
Merge pull request #373 from SHADE-DP/SP3-6-c-scripting
Script list is now sorted in alphabetical order
2023-02-27 17:24:29 +08:00
Kah Wei d8756cfcf7 Script list is now sorted in alphabetical order 2023-02-27 17:21:02 +08:00
Kah Wei 33b5b84fd4 add anim clip 2023-02-27 17:04:16 +08:00
maverickdgg 4f1ecf1b50 multiplierTextFX WIP 2023-02-27 17:01:46 +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
XiaoQiDigipen 0f0542f46f
Merge pull request #372 from SHADE-DP/SP3-20-UI-System
Fixed Slider Text. Changed Fonts
2023-02-27 16:41:37 +08:00
maverickdgg f4114b7844 Merge branch 'main' into SP3-20-UI-System 2023-02-27 16:39:39 +08:00
maverickdgg cbb334d48e Slider Text Default Value fix 2023-02-27 16:39:31 +08:00
mushgunAX c328672286 black shader 2023-02-27 16:22:54 +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
Glence c912dd2e4b WIP for cutscene and added test for KW 2023-02-27 15:33:58 +08:00
mushgunAX ba89dcea14 Merge branch 'main' into scenetransitions 2023-02-27 15:30:04 +08:00
XiaoQiDigipen b3ed59d98a
Merge pull request #371 from SHADE-DP/SP3-20-UI-System
Button FX now uses the easing functions. Viewport can now be fixed at an AR.
2023-02-27 15:28:55 +08:00
mushgunAX f9c90ece7e Scene Transition Script 2023-02-27 15:28:05 +08:00
maverickdgg 4c7d06452e viewport changed 2023-02-27 15:25:01 +08:00
maverickdgg 0e7ecd382f Merge branch 'main' into SP3-20-UI-System 2023-02-27 15:17:03 +08:00
maverickdgg 08e4db134a Tweaked main menu UI 2023-02-27 15:16:48 +08:00
Brandon Mak f6db65ddf4 Particles WIP 2023-02-27 15:14:32 +08:00
XiaoQiDigipen 725da6254d
Merge pull request #370 from SHADE-DP/SP3-6-c-scripting
Fixed behaviour of script Awake() and Start() not getting called as intended (first frame that object is active)
2023-02-27 13:10:35 +08:00
Kah Wei 99c1eebe70 Fixed behaviour of script Awake() and Start() not getting called as intended (first frame that object is active) 2023-02-27 12:57:37 +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
XiaoQiDigipen 2fb5ec3fd9
Merge pull request #367 from SHADE-DP/SP3-8-serialization
Added rudimentary prefabs (no resolution)
2023-02-27 11:53:46 +08:00
maverickdgg 984473bdab Slider text fixed 2023-02-27 10:28:20 +08:00
maverickdgg db8ed27cb7 main Menu layout complete for now 2023-02-27 10:05:30 +08:00
maverickdgg eb7c0e749e Added a slider_textured fs 2023-02-27 09:59:58 +08:00
maverickdgg 949ade5775 Options Layout done 2023-02-27 09:55:54 +08:00
maverickdgg 90763ded71 Change Canvas Button Script 2023-02-27 08:08:04 +08:00