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 |
|
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 |
|
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 |
|
Glence
|
46c99f31f9
|
Merge branch 'main' into PlayerController
|
2023-03-03 16:45:26 +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 |
|
XiaoQiDigipen
|
46ffeada67
|
Merge pull request #383 from SHADE-DP/PlayerController
New features added
|
2023-03-02 18:31:38 +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 |
|
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 |
|
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 |
|
Diren D Bharwani
|
e43089e6ff
|
Fixed bug where box colliders weren't being deleted on scene destroy
|
2023-03-02 13:52:54 +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 |