Commit Graph

1648 Commits

Author SHA1 Message Date
Glence 9a7ad8ee17 Merge branch 'SP3-2-Physics' into PlayerControllerWIthNewPhysics 2023-03-04 15:17:20 +08:00
Diren D Bharwani b9c9f30ce0 Fixed heap corruption caused by out-of-sync collider active states 2023-03-04 14:31:07 +08:00
Diren D Bharwani a691d2ff28 Fixed imgui error caused by merge 2023-03-04 13:50:10 +08:00
Diren D Bharwani 15bbf6892f Merge branch 'main' into SP3-2-Physics 2023-03-04 13:44:53 +08:00
Diren D Bharwani e2d96569b5 Collision shapes will only be added to broadphase if the collider is active 2023-03-04 13:30:29 +08:00
Sri Sham Haran 51d4b26e3d off mouse centering on pause/stop 2023-03-04 10:37:01 +08:00
Sri Sham Haran fff2c73994 editor set mouse visibility 2023-03-04 10:27:51 +08:00
Brandon Mak 90dd589430 No editor rendering fix 2023-03-04 01:20:27 +08:00
Glence ac99eb9ba0 Merge branch 'SP3-2-Physics' into PlayerControllerWIthNewPhysics 2023-03-04 00:27:38 +08:00
Glence 0c4f154c24 Merge remote-tracking branch 'origin/PlayerControllerWIthNewPhysics' into PlayerControllerWIthNewPhysics 2023-03-04 00:05:34 +08:00
Glence daad6699f1 fix raycast for player 2023-03-04 00:05:26 +08:00
Xiao Qi c4d2091b99 Camera system update for line without editor 2023-03-03 23:54:16 +08:00
Diren D Bharwani 6200e3f533 Fixed bug where collision & trigger state were called more than once 2023-03-03 23:47:39 +08:00
SHAM-DP 98d0021b32 sheditor ifdef checks 2023-03-03 21:57:20 +08:00
Diren D Bharwani 446db133d2 Fixed errors with publish build in physics debug draw 2023-03-03 21:39:59 +08:00
Diren D Bharwani 8743ae52fa Fixed errors with publish build in physics debug draw 2023-03-03 21:38:57 +08:00
Diren D Bharwani 337ec82dbf Removed random commented code 2023-03-03 21:19:49 +08:00
Glence ebf2bb8d85 Merge branch 'main' into PlayerControllerWIthNewPhysics 2023-03-03 21:19:00 +08:00
Diren D Bharwani 5cb4c54757 I didn't commit the change oop 2023-03-03 21:16:44 +08:00
Diren D Bharwani 5c38244ce4 Changed casts 2023-03-03 21:16:18 +08:00
Diren D Bharwani 74c32457a8 Merge branch 'main' into Revert-Revert-SHPhysics 2023-03-03 21:07:59 +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
SHAM-DP dfc2a68dde Add Set audio param with label functionality 2023-03-03 18:13:35 +08:00
Glence eba64126f8 Merge branch 'SP3-2-Physics' into PlayerControllerWIthNewPhysics 2023-03-03 17:48:41 +08:00
SHAM-DP 9eb40d5928 Fix showcursor 2023-03-03 16:52:43 +08:00
Diren D Bharwani c9ebe73a7a Merge branch 'main' into SHPhysics 2023-03-03 16:46:54 +08:00
Diren D Bharwani a80089c893 pointless changes 2023-03-03 15:55:43 +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
Diren D Bharwani 87d2afbd9a Merge branch 'main' into SHPhysics 2023-03-02 16:26:49 +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
Brandon Mak e2ef32f130 Fixed Trajectory Rendering 2023-03-02 15:29:24 +08:00
Diren D Bharwani e43089e6ff Fixed bug where box colliders weren't being deleted on scene destroy 2023-03-02 13:52:54 +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
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 30923389ae Merge branch 'main' into SP3-20-UI-System 2023-03-02 10:23:09 +08:00
Brandon Mak 87c04436b3 Added scripting interface and serialization for Trajectory comp 2023-03-02 09:08:20 +08:00
Diren D Bharwani 991912f7b4 Fixed bug where reduced manifold would attempt to grab an invalid contact 2023-03-02 07:09:14 +08:00
Diren D Bharwani 199a9aa025 Fixed infinite positional error bias 2023-03-02 07:08:45 +08:00
Diren D Bharwani f4b7618fc2 Fixed incorrect edge preference for convex vs convex 2023-03-02 05:23:08 +08:00
Diren D Bharwani aebf1fc6ec Reverted some changes 2023-03-02 04:27:07 +08:00
Diren D Bharwani f7ea42f58e Reverted computing point offsets in local space
Force is applied in world space, so contact points should also be in world space
2023-03-02 04:15:40 +08:00
maverickdgg 9dd01f5fa1 Replaced How to play screen and credits placeholder 2023-03-02 03:01:24 +08:00
maverickdgg 5cc2e26de6 Rotates target offset based on camera arm's rotation 2023-03-02 02:06:25 +08:00
Diren D Bharwani 2d2c8a1b20 Fixed clipping of contacts against reference planes 2023-03-01 21:30:00 +08:00