Commit Graph

2493 Commits

Author SHA1 Message Date
XiaoQiDigipen 6cf8f03ff1
Merge branch 'main' into AIFixes 2023-03-04 12:50:13 +08:00
XiaoQiDigipen 6d13c5f218
Merge pull request #389 from SHADE-DP/AudioImplementation
Implemented New SFX and (supposedly) spatial SFX
2023-03-04 12:47:08 +08:00
XiaoQiDigipen 90c9a0a959
Merge branch 'main' into AudioImplementation 2023-03-04 12:46:59 +08:00
maverickdgg 3c8b729b4d Merge branch 'main' into SP3-20-UI-System 2023-03-04 12:45:36 +08:00
maverickdgg 0a8f90ae80 Added Gameplay Canvas for Level 1 2023-03-04 12:44:58 +08:00
XiaoQiDigipen e197097d7c
Merge pull request #390 from SHADE-DP/SP3-20-UI-System
Gameplay UI on Level 2.
2023-03-04 12:42:42 +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 d7d4e21005
Merge pull request #386 from SHADE-DP/SP3-4-Editor
added ifdef check for editor
2023-03-03 20:12:21 +08:00
SHAM-DP 96d73ca626 added ifdef check for editor 2023-03-03 20:06:58 +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
XiaoQiDigipen 0e01332213
Merge pull request #384 from SHADE-DP/SP3-10-input-management
Implemented mouse centering and hiding in game
2023-03-03 18:29:54 +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
SHAM-DP 9eb40d5928 Fix showcursor 2023-03-03 16:52:43 +08:00
Glence 46c99f31f9 Merge branch 'main' into PlayerController 2023-03-03 16:45:26 +08:00
Glence 27b00a6c4a end cutscene done 2023-03-03 14:28:10 +08:00
mushgunAX f7c33bc89a Various null checks 2023-03-03 14:26:36 +08:00
Glence 81da3e501d fix minor preview level bug 2023-03-03 00:40:16 +08:00
mushgunAX 7763a969b2 Merge branch 'main' into SP3-10-input-management 2023-03-02 22:55:29 +08:00
XiaoQiDigipen 46ffeada67
Merge pull request #383 from SHADE-DP/PlayerController
New features added
2023-03-02 18:31:38 +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
XiaoQiDigipen 173529501c
Merge pull request #382 from SHADE-DP/SP3-1-Rendering
Fixed trajectory rendering, added text size and solved vulkan errors
2023-03-02 16:32:37 +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
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
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
XiaoQiDigipen dfd1f59b02
Merge pull request #379 from SHADE-DP/SP3-141-Camera-System
Rotates target offset based on camera arm's rotation
2023-03-02 12:45:38 +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 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
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