Commit Graph

55 Commits

Author SHA1 Message Date
maverickdgg 3a60eee32f merged 2023-03-04 03:17:20 +08:00
maverickdgg 6d1e179baf UI doine 2023-03-04 02:46:56 +08:00
mushgunAX f7c33bc89a Various null checks 2023-03-03 14:26:36 +08:00
mushgunAX 7763a969b2 Merge branch 'main' into SP3-10-input-management 2023-03-02 22:55:29 +08:00
maverickdgg 0984eee6bb Gameplay UI WIP 2023-03-02 17:34:11 +08:00
Glence 8c74ec85d3 Done with level preview 2023-03-02 17:33:02 +08:00
mushgunAX 802924141a Scene Fade In and Out Fixes 2023-03-02 15:47:00 +08:00
mushgunAX 1e734b6006 Merge branch 'main' into SP3-10-input-management 2023-03-02 13:31:13 +08:00
Glence 2834414115 Merge branch 'main' into PlayerController 2023-03-02 13:05:28 +08:00
maverickdgg 381fe476be Game UI WIP 2023-03-02 11:33:21 +08:00
maverickdgg 30923389ae Merge branch 'main' into SP3-20-UI-System 2023-03-02 10:23:09 +08:00
SHAM-DP 4131c58c08 Modified calls to IsCursorVisible 2023-03-02 10:01:52 +08:00
maverickdgg e0ee2a8079 Gameplay UI progress 2023-03-02 09:55:41 +08:00
maverickdgg e4345d4937 Changed all button textures and update win and lose screen to use buttonFX 2023-03-02 02:30:59 +08:00
Glence 2af19baccd Added the transition back to the scene 2023-03-02 00:02:18 +08:00
Glence b2c702c780 Merge branch 'main' into PlayerController 2023-03-02 00:01:34 +08:00
mushgunAX a04eee0a2f mouse centering and visibility when appropriate 2023-03-01 23:56:40 +08:00
Glence 403df62a0b cleaning up scenes and WIP for previewlevel camera 2023-03-01 18:05:42 +08:00
mushgunAX 1f5cfd36f7 Scene transitions done 2023-03-01 17:36:02 +08:00
mushgunAX 17a7db8a91 Merge branch 'main' into scenetransitions 2023-03-01 12:51:43 +08:00
Glence ab92d56cf0 disable movement when pop out is in place 2023-03-01 00:51:57 +08:00
Glence bd9349eae7 FRC fix, stealfood popup almost done and reset dt when load 2023-02-28 21:42:05 +08:00
Glence 04c19fb586 Merge branch 'main' into PlayerController 2023-02-28 19:13:11 +08:00
Glence 2ab4981a43 renamed cutscene to cutsceneIntro and adjusted level 2 2023-02-28 15:06:19 +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
Glence 79cb0f12ae WIP for Alpha, added material name in editor WIP for cutscene 2023-02-27 18:09:05 +08:00
maverickdgg 4f1ecf1b50 multiplierTextFX WIP 2023-02-27 17:01:46 +08:00
maverickdgg cbb334d48e Slider Text Default Value fix 2023-02-27 16:39:31 +08:00
Glence 75295b5d6e Merge branch 'main' into PlayerController 2023-02-27 15:58:37 +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
mushgunAX f9c90ece7e Scene Transition Script 2023-02-27 15:28:05 +08:00
maverickdgg 08e4db134a Tweaked main menu UI 2023-02-27 15:16:48 +08:00
maverickdgg 984473bdab Slider text fixed 2023-02-27 10:28:20 +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
maverickdgg f23853c85c Main Menu Canvas Layout with button FX and scalebounce 2023-02-27 07:32:26 +08:00
Glence 86b662c7dc Merge branch 'main' into PlayerController 2023-02-23 19:45:38 +08:00
maverickdgg c4db16bb95 Merge branch 'main' into SP3-20-UI-System 2023-02-23 13:44:12 +08:00
maverickdgg 69f2e678df re-enabled scene change and disabled debug logs 2023-02-23 13:42:22 +08:00
maverickdgg 1b865b129b Added finalizeChanges call and debug logs for hover enter 2023-02-23 12:50:42 +08:00
Glence 8d10c48645 Bug fixes and WIP for alpha 2023-02-21 19:31:50 +08:00
Glence d7725f4e26 Pause is done 2023-02-21 00:47:20 +08:00
mushgunAX a7238c6eba Merge branch 'main' into AudioImplementation 2023-02-04 01:45:09 +08:00
mushgunAX 23f7812a70 Fix StopAllSounds 2023-02-04 01:44:00 +08:00
mushgunAX 49fadfed74 Dynamic BGM 2023-02-04 00:23:05 +08:00
Kah Wei 3cd1778d08 Fixed SHUIComponent serialization 2023-02-04 00:04:25 +08:00
maverickdgg fdacaf5036 Added reminaing buttons for win and lose screens 2023-02-03 23:28:08 +08:00