Commit Graph

2490 Commits

Author SHA1 Message Date
Diren D Bharwani 8506298fd3 Merge remote-tracking branch 'origin/main' into SP3-2-Physics 2023-03-06 17:56:52 +08:00
Xiao Qi 99f7c3c799 Removed resource manager test lines 2023-03-06 17:47:21 +08:00
Diren D Bharwani 78a3bf4575 Added function to test an AABB against the physics world
Update React Dependency
2023-03-06 17:44:58 +08:00
Diren D Bharwani 550b99b3d7 Added a generic AABB class 2023-03-06 17:44:40 +08:00
Xiao Qi becff4824f Camera without editor compile fix 2023-03-06 15:38:42 +08:00
Diren D Bharwani 0b803d0bd1 Merge branch 'main' into SP3-2-Physics 2023-03-06 13:31:48 +08:00
Glence 52f61363c0 Build shiny highlight shader 2023-03-05 23:50:44 +08:00
Glence 8d6ef16625 Hot fix
Pause menu fix
Offing gameplay UI on preview level
clipping of mouse
change some keydown to keyup
2023-03-05 23:48:25 +08:00
Diren D Bharwani d59f4e88c2 Added gravity scale
Update react dependency
2023-03-05 23:39:33 +08:00
Glence e40346513c Pause sfx fix 2023-03-05 22:27:35 +08:00
Glence 794f59ac48 Adjusted stair collision 2023-03-05 21:37:29 +08:00
Glence 5191eb529a Update level 3 scene 2023-03-05 21:34:05 +08:00
Sri Sham Haran 9866c6e307 Handle mouse center/visible when editor play/pause/stop 2023-03-05 21:33:05 +08:00
Sri Sham Haran f4f544ff53 Merge remote-tracking branch 'origin/main' into main 2023-03-05 21:24:19 +08:00
Sri Sham Haran 77e3fe376b Handle mouse center/visible when editor play/pause/stop 2023-03-05 21:24:16 +08:00
Glence c118ec136f Call centering of mouse at the correct place and default DT on awake 2023-03-05 21:23:41 +08:00
Glence 9f57ed1ef1 small scene changes and reenable mouse centering and hiding 2023-03-05 21:11:24 +08:00
Glence e27b143819 shift pic to avoid black alpha 2023-03-05 20:53:16 +08:00
Sri Sham Haran 0e2b767263 Fix for button w wrong textures (remove reflection of currentTexture) 2023-03-05 20:23:52 +08:00
Glence 808adaa5dd level 2 go to the correct next scene now 2023-03-05 18:06:08 +08:00
XiaoQiDigipen 6472119648
Merge pull request #399 from SHADE-DP/PlayerController
Updates for presentation build
2023-03-05 15:41:21 +08:00
Glence bf5472e2c6 stuff dont ask me 2023-03-05 15:35:57 +08:00
Glence 3778ded1be Merge branch 'main' into PlayerController 2023-03-05 14:49:46 +08:00
XiaoQiDigipen 272d7afa3e
Merge pull request #398 from SHADE-DP/SP3-20-UI-System
Fixed button click state not resetting bug
2023-03-05 14:46:17 +08:00
Glence 7a577ecd6b Merge branch 'main' into PlayerController 2023-03-05 14:42:31 +08:00
Sri Sham Haran e417ebdfcc added missing colliders for level3 2023-03-05 14:22:24 +08:00
maverickdgg f52e5a1394 Changed pause menu to use onRelease instead of onClick 2023-03-05 14:01:30 +08:00
maverickdgg 8b24d7e32b re-added the button texture check before setting texture 2023-03-05 13:58:07 +08:00
maverickdgg 76e794a543 Merge branch 'main' into SP3-20-UI-System 2023-03-05 13:56:29 +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
XiaoQiDigipen 29d33d45ad
Merge pull request #396 from SHADE-DP/SP3-6-c-scripting
Fixed issue with ImGui corrupting strings passed to managed data
2023-03-05 12:20:28 +08:00
Kah Wei cedd10c188 Merge branch 'main' into SP3-6-c-scripting 2023-03-05 12:17:31 +08:00
Kah Wei 24f09ab537 Fixed issue with ImGui corrupting strings passed to managed data. 2023-03-05 12:17:19 +08:00
XiaoQiDigipen 367c1fc77e
Merge pull request #395 from SHADE-DP/SP3-141-Camera-System
Camera arm target offset rotation fix
2023-03-05 11:46:02 +08:00
XiaoQiDigipen dfedaa9b4a
Merge pull request #394 from SHADE-DP/SP3-20-UI-System
Fixed button sounds
2023-03-05 11:45:24 +08:00
maverickdgg ef0ff801e4 Camera arm target offset rotation fix 2023-03-05 10:55:39 +08:00
maverickdgg f10293e2d2 Fixed button sounds 2023-03-05 10:47:16 +08:00
Glence 3f960509f1 scene changes 2023-03-05 02:51:11 +08:00
Glence cc81eed630 Merge branch 'main' into PlayerController 2023-03-04 23:42:20 +08:00
XiaoQiDigipen e75b20f36b
Merge pull request #393 from SHADE-DP/SP3-1-Rendering
Fixed publish rendering errors and improved shiny highlight shaders
2023-03-04 16:01:17 +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
XiaoQiDigipen 9ccde9fa07
Merge pull request #392 from SHADE-DP/SP3-20-UI-System
Updated Level 1 UI
2023-03-04 13:13:11 +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 ba78f6f7a0
Merge pull request #391 from SHADE-DP/AIFixes
Implemented such that AI gets sent to a waypoint of choice (in editor) after capture
2023-03-04 12:50:19 +08:00
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