Commit Graph

501 Commits

Author SHA1 Message Date
maverickdgg f52e5a1394 Changed pause menu to use onRelease instead of onClick 2023-03-05 14:01:30 +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
maverickdgg f10293e2d2 Fixed button sounds 2023-03-05 10:47:16 +08:00
Brandon Mak 13f28d6bdb Fixed shiny highlight shaders 2023-03-04 15:55:04 +08:00
Brandon Mak 7eb4921b33 Merge remote-tracking branch 'origin/main' into SP3-1-Rendering 2023-03-04 15:50:10 +08:00
maverickdgg e7ce3263b8 Level 2 Pause menu update 2023-03-04 13:12:02 +08:00
maverickdgg f3908d3afb Merge branch 'main' into SP3-20-UI-System 2023-03-04 13:09:06 +08:00
maverickdgg c3a452a1c4 Pause Canvas Updated with correct button scales and button FX 2023-03-04 12:51:19 +08:00
XiaoQiDigipen 6cf8f03ff1
Merge branch 'main' into AIFixes 2023-03-04 12:50:13 +08:00
XiaoQiDigipen 90c9a0a959
Merge branch 'main' into AudioImplementation 2023-03-04 12:46:59 +08:00
maverickdgg 0a8f90ae80 Added Gameplay Canvas for Level 1 2023-03-04 12:44:58 +08:00
mushgunAX 28949b29ff Level 1 AI start waypoint 2023-03-04 05:07:39 +08:00
mushgunAX dc54ae92a2 AI gets sent to a waypoint of choice when caught 2023-03-04 04:57:59 +08:00
maverickdgg 3a60eee32f merged 2023-03-04 03:17:20 +08:00
maverickdgg 6d1e179baf UI doine 2023-03-04 02:46:56 +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
mushgunAX a5fe4bf0a0 New SFX and (supposedly) spatial SFX 2023-03-04 00:19:35 +08:00
Brandon Mak 166e13a339 Shadows WIP
- Light direction in 2nd level changed
2023-03-03 22:01:34 +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
mushgunAX 0a224726b3 revert? 2023-03-03 17:25:09 +08:00
mushgunAX d65af97166 Revert of a previous commit for scene files 2023-03-03 17:24:27 +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 97db3b1021 Merge branch 'main' into PlayerController 2023-03-02 17:33:42 +08:00
Glence 8c74ec85d3 Done with level preview 2023-03-02 17:33:02 +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
mushgunAX 802924141a Scene Fade In and Out Fixes 2023-03-02 15:47:00 +08:00
Brandon Mak e2ef32f130 Fixed Trajectory Rendering 2023-03-02 15:29:24 +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
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
Brandon Mak 1e59b6436c Merge branch 'main' into SP3-1-Rendering 2023-03-02 11:36:35 +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 9dd01f5fa1 Replaced How to play screen and credits placeholder 2023-03-02 03:01:24 +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 a65735e0b3 progress 2023-03-01 16:37:33 +08:00
mushgunAX 17a7db8a91 Merge branch 'main' into scenetransitions 2023-03-01 12:51:43 +08:00
Brandon Mak 2e7bfd8b28 Merge branch 'main' into SP3-1-Rendering 2023-03-01 08:56:45 +08:00