Glence
|
46c99f31f9
|
Merge branch 'main' into PlayerController
|
2023-03-03 16:45:26 +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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Brandon Mak
|
1e59b6436c
|
Merge branch 'main' into SP3-1-Rendering
|
2023-03-02 11:36:35 +08:00 |
|
maverickdgg
|
381fe476be
|
Game UI WIP
|
2023-03-02 11:33:21 +08:00 |
|
maverickdgg
|
30923389ae
|
Merge branch 'main' into SP3-20-UI-System
|
2023-03-02 10:23:09 +08:00 |
|
SHAM-DP
|
4131c58c08
|
Modified calls to IsCursorVisible
|
2023-03-02 10:01:52 +08:00 |
|
maverickdgg
|
e0ee2a8079
|
Gameplay UI progress
|
2023-03-02 09:55:41 +08:00 |
|
Brandon Mak
|
87c04436b3
|
Added scripting interface and serialization for Trajectory comp
|
2023-03-02 09:08:20 +08:00 |
|
maverickdgg
|
9dd01f5fa1
|
Replaced How to play screen and credits placeholder
|
2023-03-02 03:01:24 +08:00 |
|
maverickdgg
|
e4345d4937
|
Changed all button textures and update win and lose screen to use buttonFX
|
2023-03-02 02:30:59 +08:00 |
|
maverickdgg
|
5cc2e26de6
|
Rotates target offset based on camera arm's rotation
|
2023-03-02 02:06:25 +08:00 |
|
Glence
|
2af19baccd
|
Added the transition back to the scene
|
2023-03-02 00:02:18 +08:00 |
|
Glence
|
b2c702c780
|
Merge branch 'main' into PlayerController
|
2023-03-02 00:01:34 +08:00 |
|
mushgunAX
|
a04eee0a2f
|
mouse centering and visibility when appropriate
|
2023-03-01 23:56:40 +08:00 |
|
Glence
|
403df62a0b
|
cleaning up scenes and WIP for previewlevel camera
|
2023-03-01 18:05:42 +08:00 |
|
XiaoQiDigipen
|
b63db13c41
|
Merge pull request #378 from SHADE-DP/scenetransitions
Implemented Fade In To and Fade Out From Black Scene Transitions
|
2023-03-01 17:55:27 +08:00 |
|
mushgunAX
|
0754eaa51a
|
Merge branch 'main' into scenetransitions
|
2023-03-01 17:36:14 +08:00 |
|
mushgunAX
|
1f5cfd36f7
|
Scene transitions done
|
2023-03-01 17:36:02 +08:00 |
|
XiaoQiDigipen
|
5c78b7ec1b
|
Merge pull request #377 from SHADE-DP/SP3-4-Editor
Added scripting interface for cursor visible.
|
2023-03-01 17:08:45 +08:00 |
|
SHAM-DP
|
98140aa797
|
Added scripting interface for cursor visible.
Fixed collider offset undo/redo
Double click object to look at object
Display editor cam pitch/yaw/roll
|
2023-03-01 17:06:53 +08:00 |
|
mushgunAX
|
a65735e0b3
|
progress
|
2023-03-01 16:37:33 +08:00 |
|
Brandon Mak
|
4b37be6075
|
Made text color serialized
|
2023-03-01 16:02:44 +08:00 |
|
mushgunAX
|
17a7db8a91
|
Merge branch 'main' into scenetransitions
|
2023-03-01 12:51:43 +08:00 |
|
Brandon Mak
|
e44e961e14
|
Particles WIP
|
2023-03-01 10:06:09 +08:00 |
|
Brandon Mak
|
77722aa560
|
renamed some files
|
2023-03-01 08:58:16 +08:00 |
|
Brandon Mak
|
2e7bfd8b28
|
Merge branch 'main' into SP3-1-Rendering
|
2023-03-01 08:56:45 +08:00 |
|
Glence
|
d5c9010661
|
Clean up the scenes
|
2023-03-01 01:16:34 +08:00 |
|
Glence
|
ab92d56cf0
|
disable movement when pop out is in place
|
2023-03-01 00:51:57 +08:00 |
|
XiaoQiDigipen
|
dd9eeac0d1
|
Merge pull request #376 from SHADE-DP/PlayerController
Bug fixes, Scene changes and new features
|
2023-02-28 23:10:33 +08:00 |
|
Glence
|
4e56061ebe
|
adjust text in cutscene
|
2023-02-28 22:53:54 +08:00 |
|
Glence
|
bd9349eae7
|
FRC fix, stealfood popup almost done and reset dt when load
|
2023-02-28 21:42:05 +08:00 |