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 |
|
Glence
|
c6f49e45e4
|
Merge branch 'main' into PlayerControllerWIthNewPhysics
|
2023-03-04 13:16:38 +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 |
|
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 |
|
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 |
|
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
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |