Kah Wei
|
4144fe0d4a
|
Merge branch 'main' into SP3-22-AnimationController
# Conflicts:
# SHADE_Application/src/Application/SBApplication.cpp
# SHADE_Engine/src/Editor/EditorWindow/AssetBrowser/SHAssetBrowser.cpp
|
2023-03-07 20:30:47 +08:00 |
|
Diren D Bharwani
|
e3fb14d698
|
Merge branch 'main' into SP3-2-Physics
|
2023-03-07 18:48:31 +08:00 |
|
Brandon Mak
|
b6b2c75fc3
|
Implemented Shadows (f0kin finally)
|
2023-03-07 17:39:51 +08:00 |
|
maverickdgg
|
e42a5c68f3
|
Settings
|
2023-03-07 10:08:30 +08:00 |
|
Diren D Bharwani
|
2197a3bcb9
|
Added capsule collider
Debug draw is a bit wonky. Further polish needed,
|
2023-03-07 04:51:58 +08:00 |
|
Xiao Qi
|
5e6b68915b
|
Working Animations
|
2023-03-07 01:25:32 +08:00 |
|
Xiao Qi
|
f861304f5e
|
Testing in progress for skinning test
|
2023-03-06 17:34:38 +08:00 |
|
Diren D Bharwani
|
0b803d0bd1
|
Merge branch 'main' into SP3-2-Physics
|
2023-03-06 13:31:48 +08:00 |
|
Brandon Mak
|
826df94c96
|
Shadows WIP
|
2023-03-06 00:02:06 +08:00 |
|
Glence
|
52f61363c0
|
Build shiny highlight shader
|
2023-03-05 23:50:44 +08:00 |
|
Glence
|
8d6ef16625
|
Hot fix
Pause menu fix
Offing gameplay UI on preview level
clipping of mouse
change some keydown to keyup
|
2023-03-05 23:48:25 +08:00 |
|
Diren D Bharwani
|
d59f4e88c2
|
Added gravity scale
Update react dependency
|
2023-03-05 23:39:33 +08:00 |
|
Glence
|
e40346513c
|
Pause sfx fix
|
2023-03-05 22:27:35 +08:00 |
|
Glence
|
794f59ac48
|
Adjusted stair collision
|
2023-03-05 21:37:29 +08:00 |
|
Glence
|
5191eb529a
|
Update level 3 scene
|
2023-03-05 21:34:05 +08:00 |
|
Glence
|
c118ec136f
|
Call centering of mouse at the correct place and default DT on awake
|
2023-03-05 21:23:41 +08:00 |
|
Glence
|
9f57ed1ef1
|
small scene changes and reenable mouse centering and hiding
|
2023-03-05 21:11:24 +08:00 |
|
Glence
|
e27b143819
|
shift pic to avoid black alpha
|
2023-03-05 20:53:16 +08:00 |
|
Glence
|
808adaa5dd
|
level 2 go to the correct next scene now
|
2023-03-05 18:06:08 +08:00 |
|
Glence
|
bf5472e2c6
|
stuff dont ask me
|
2023-03-05 15:35:57 +08:00 |
|
Glence
|
3778ded1be
|
Merge branch 'main' into PlayerController
|
2023-03-05 14:49:46 +08:00 |
|
Glence
|
7a577ecd6b
|
Merge branch 'main' into PlayerController
|
2023-03-05 14:42:31 +08:00 |
|
Sri Sham Haran
|
e417ebdfcc
|
added missing colliders for level3
|
2023-03-05 14:22:24 +08:00 |
|
maverickdgg
|
f52e5a1394
|
Changed pause menu to use onRelease instead of onClick
|
2023-03-05 14:01:30 +08:00 |
|
maverickdgg
|
4bc568899d
|
Fix Button click state not resetting if the release event happen when button is inactive
|
2023-03-05 13:55:51 +08:00 |
|
maverickdgg
|
f10293e2d2
|
Fixed button sounds
|
2023-03-05 10:47:16 +08:00 |
|
Xiao Qi
|
6c396469d4
|
Recompiled files for testing
|
2023-03-05 04:22:27 +08:00 |
|
Glence
|
3f960509f1
|
scene changes
|
2023-03-05 02:51:11 +08:00 |
|
Glence
|
cc81eed630
|
Merge branch 'main' into PlayerController
|
2023-03-04 23:42:20 +08:00 |
|
Brandon Mak
|
73c5a0ff4a
|
Updated shadow shaders
|
2023-03-04 23:12:12 +08:00 |
|
Brandon Mak
|
13f28d6bdb
|
Fixed shiny highlight shaders
|
2023-03-04 15:55:04 +08:00 |
|
Brandon Mak
|
7eb4921b33
|
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
|
2023-03-04 15:50:10 +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
|
17bb7a08eb
|
Fixed render to swapchain errors
|
2023-03-04 01:01:26 +08:00 |
|
Brandon Mak
|
ce41e975d0
|
Merge branch 'main' into SP3-1-Rendering
|
2023-03-04 00:52:05 +08:00 |
|
Xiao Qi
|
56693565f4
|
WIP Load and test animations
|
2023-03-04 00:43:31 +08:00 |
|
mushgunAX
|
a5fe4bf0a0
|
New SFX and (supposedly) spatial SFX
|
2023-03-04 00:19:35 +08:00 |
|
Brandon Mak
|
166e13a339
|
Shadows WIP
- Light direction in 2nd level changed
|
2023-03-03 22:01:34 +08:00 |
|
Kah Wei
|
beeeae99ca
|
SHRawAnimInspector can now generate incomplete animation clips
|
2023-03-03 18:53:59 +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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
mushgunAX
|
1f5cfd36f7
|
Scene transitions done
|
2023-03-01 17:36:02 +08:00 |
|
mushgunAX
|
a65735e0b3
|
progress
|
2023-03-01 16:37:33 +08:00 |
|
Xiao Qi
|
bc17479284
|
Merge branch 'main' into SP3-13-Assets-Manager
|
2023-03-01 16:33:30 +08:00 |
|
mushgunAX
|
17a7db8a91
|
Merge branch 'main' into scenetransitions
|
2023-03-01 12:51:43 +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 |
|
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 |
|
Brandon Mak
|
0da61aa842
|
Fixed text rendering rendering last
|
2023-02-28 21:30:09 +08:00 |
|
Glence
|
04c19fb586
|
Merge branch 'main' into PlayerController
|
2023-02-28 19:13:11 +08:00 |
|
Glence
|
0bdab3b079
|
WIP for steal food pop up
|
2023-02-28 18:35:43 +08:00 |
|
mushgunAX
|
d9f064994e
|
Merge branch 'main' into scenetransitions
|
2023-02-28 18:34:07 +08:00 |
|
Glence
|
52ba54a82a
|
Fix ShinyHighlight issue and updated level 3
|
2023-02-28 15:42:28 +08:00 |
|
SHAM-DP
|
e75826436f
|
Fix editor config working scene, fix entities being copy/pasted when using copy paste in a field. Fix filtered display for asset browser
|
2023-02-28 15:12:17 +08:00 |
|
Glence
|
2ab4981a43
|
renamed cutscene to cutsceneIntro and adjusted level 2
|
2023-02-28 15:06:19 +08:00 |
|
mushgunAX
|
d563247ec2
|
Merge branch 'main' into scenetransitions
|
2023-02-28 06:49:55 +08:00 |
|
mushgunAX
|
b3ec2fb4df
|
implementing in progress
|
2023-02-28 06:49:40 +08:00 |
|
Glence
|
380de28358
|
cutscene for intro done
|
2023-02-28 01:57:00 +08:00 |
|
Glence
|
79cb0f12ae
|
WIP for Alpha, added material name in editor WIP for cutscene
|
2023-02-27 18:09:05 +08:00 |
|
maverickdgg
|
4f1ecf1b50
|
multiplierTextFX WIP
|
2023-02-27 17:01:46 +08:00 |
|
maverickdgg
|
cbb334d48e
|
Slider Text Default Value fix
|
2023-02-27 16:39:31 +08:00 |
|
mushgunAX
|
c328672286
|
black shader
|
2023-02-27 16:22:54 +08:00 |