Glence
|
799cac0924
|
Merge branch 'SP3-2-Physics' into PlayerControllerWIthNewPhysics
|
2023-03-04 21:28:19 +08:00 |
|
Glence
|
7ad0ca6183
|
scene changes
|
2023-03-04 20:47:39 +08:00 |
|
Diren D Bharwani
|
02b21f2694
|
Fixed auto mass serialisation and colliders not recomputing mass on size change
|
2023-03-04 20:28:09 +08:00 |
|
Glence
|
90dc4ef750
|
Merge branch 'SP3-2-Physics' into PlayerControllerWIthNewPhysics
|
2023-03-04 17:33:57 +08:00 |
|
Diren D Bharwani
|
e293094b6d
|
Another attempt to fix invalid error bias
|
2023-03-04 17:31:50 +08:00 |
|
Glence
|
ab4a874bb1
|
Merge remote-tracking branch 'origin/PlayerControllerWIthNewPhysics' into PlayerControllerWIthNewPhysics
|
2023-03-04 17:30:14 +08:00 |
|
Brandon Mak
|
4530c96ffc
|
Merge remote-tracking branch 'origin/PlayerControllerWIthNewPhysics' into PlayerControllerWIthNewPhysics
|
2023-03-04 15:49:51 +08:00 |
|
Brandon Mak
|
c7c8e0046d
|
Updated shiny effect shader
|
2023-03-04 15:49:41 +08:00 |
|
Glence
|
59eb2d767f
|
Merge branch 'SP3-2-Physics' into PlayerControllerWIthNewPhysics
|
2023-03-04 15:20:20 +08:00 |
|
Diren D Bharwani
|
ea97dc3b50
|
Fixed Managed vector3 forward & back
|
2023-03-04 15:17:29 +08:00 |
|
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
|
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 |
|
Glence
|
c6f49e45e4
|
Merge branch 'main' into PlayerControllerWIthNewPhysics
|
2023-03-04 13:16:38 +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
|
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 |
|
mushgunAX
|
a5fe4bf0a0
|
New SFX and (supposedly) spatial SFX
|
2023-03-04 00:19:35 +08:00 |
|
Glence
|
daad6699f1
|
fix raycast for player
|
2023-03-04 00:05:26 +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 |
|
Glence
|
ebf2bb8d85
|
Merge branch 'main' into PlayerControllerWIthNewPhysics
|
2023-03-03 21:19:00 +08:00 |
|
Diren D Bharwani
|
74c32457a8
|
Merge branch 'main' into Revert-Revert-SHPhysics
|
2023-03-03 21:07:59 +08:00 |
|
Diren D Bharwani
|
5c803105b2
|
Merge branch 'SP3-2-Physics' into Revert-Revert-SHPhysics
|
2023-03-03 20:10:11 +08:00 |
|
Diren D Bharwani
|
4047699544
|
Auto stash before revert of "Revert "Implemented a custom physics engine""
|
2023-03-03 20:09:59 +08:00 |
|
XiaoQiDigipen
|
fc0d7ad052
|
Revert "Revert "Implemented a custom physics engine""
This reverts commit 3ff2e6bb92.
|
2023-03-03 20:09:46 +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
|
cae0061ac3
|
minor fix
|
2023-03-03 18:10:03 +08:00 |
|
Glence
|
eba64126f8
|
Merge branch 'SP3-2-Physics' into PlayerControllerWIthNewPhysics
|
2023-03-03 17:48:41 +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 |
|
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
|
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 |
|
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 |