5669babc0f
Fixed animator components in scripts not being retrievable. Also added script for testing animations
2023-03-09 13:35:49 +08:00
73022cb8d6
update scene with new tween
2023-03-09 13:22:14 +08:00
2c8eca4125
Added facility to create new animation clip container asset.
...
Changed raw anim editor to open when double clicking anim container asset/after creating new anim container asset
Changed new clip fields from slider to unsigned int input
2023-03-09 01:51:54 +08:00
66026ff926
jumppad done
2023-03-09 00:33:36 +08:00
4012eb97ba
Auto stash before merge of "SP3-1-Rendering" and "origin/main"
...
Solved shadow bugs and WIP trajectory
2023-03-08 21:23:03 +08:00
69ac4d1219
Merge branch 'main' into SP3-22-AnimationController
2023-03-08 20:00:58 +08:00
35b60a24e4
Added variable to control number of simulation steps for the SimulateBody method
2023-03-08 19:06:57 +08:00
10555f646c
base for jumppad
2023-03-08 18:49:36 +08:00
87f7b42ec3
made raccoon use capsule, setting for fov done
2023-03-08 17:00:43 +08:00
6854c41614
setting up volume
2023-03-08 16:22:05 +08:00
79fe9ec43d
Merge branch 'main' into SP3-22-AnimationController
...
# Conflicts:
# SHADE_Engine/src/Animation/SHAnimationClip.cpp
# SHADE_Engine/src/Animation/SHAnimationClip.h
# SHADE_Engine/src/Animation/SHAnimatorComponent.cpp
# SHADE_Engine/src/Animation/SHAnimatorComponent.h
# SHADE_Engine/src/Assets/Asset Types/Models/SHAnimationAsset.h
# SHADE_Engine/src/Assets/SHAssetMacros.h
# SHADE_Engine/src/Assets/SHAssetManager.cpp
2023-03-08 15:54:32 +08:00
441d2fe7a4
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2023-03-08 14:15:12 +08:00
ea3b851ed0
Merge branch 'main' into SP3-13-Assets-Manager
2023-03-07 23:01:21 +08:00
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
e3fb14d698
Merge branch 'main' into SP3-2-Physics
2023-03-07 18:48:31 +08:00
b6b2c75fc3
Implemented Shadows (f0kin finally)
2023-03-07 17:39:51 +08:00
e42a5c68f3
Settings
2023-03-07 10:08:30 +08:00
2197a3bcb9
Added capsule collider
...
Debug draw is a bit wonky. Further polish needed,
2023-03-07 04:51:58 +08:00
5e6b68915b
Working Animations
2023-03-07 01:25:32 +08:00
f861304f5e
Testing in progress for skinning test
2023-03-06 17:34:38 +08:00
0b803d0bd1
Merge branch 'main' into SP3-2-Physics
2023-03-06 13:31:48 +08:00
826df94c96
Shadows WIP
2023-03-06 00:02:06 +08:00
52f61363c0
Build shiny highlight shader
2023-03-05 23:50:44 +08:00
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
d59f4e88c2
Added gravity scale
...
Update react dependency
2023-03-05 23:39:33 +08:00
e40346513c
Pause sfx fix
2023-03-05 22:27:35 +08:00
794f59ac48
Adjusted stair collision
2023-03-05 21:37:29 +08:00
5191eb529a
Update level 3 scene
2023-03-05 21:34:05 +08:00
c118ec136f
Call centering of mouse at the correct place and default DT on awake
2023-03-05 21:23:41 +08:00
9f57ed1ef1
small scene changes and reenable mouse centering and hiding
2023-03-05 21:11:24 +08:00
e27b143819
shift pic to avoid black alpha
2023-03-05 20:53:16 +08:00
808adaa5dd
level 2 go to the correct next scene now
2023-03-05 18:06:08 +08:00
bf5472e2c6
stuff dont ask me
2023-03-05 15:35:57 +08:00
3778ded1be
Merge branch 'main' into PlayerController
2023-03-05 14:49:46 +08:00
7a577ecd6b
Merge branch 'main' into PlayerController
2023-03-05 14:42:31 +08:00
e417ebdfcc
added missing colliders for level3
2023-03-05 14:22:24 +08:00
f52e5a1394
Changed pause menu to use onRelease instead of onClick
2023-03-05 14:01:30 +08:00
4bc568899d
Fix Button click state not resetting if the release event happen when button is inactive
2023-03-05 13:55:51 +08:00
f10293e2d2
Fixed button sounds
2023-03-05 10:47:16 +08:00
6c396469d4
Recompiled files for testing
2023-03-05 04:22:27 +08:00
3f960509f1
scene changes
2023-03-05 02:51:11 +08:00
cc81eed630
Merge branch 'main' into PlayerController
2023-03-04 23:42:20 +08:00
73c5a0ff4a
Updated shadow shaders
2023-03-04 23:12:12 +08:00
13f28d6bdb
Fixed shiny highlight shaders
2023-03-04 15:55:04 +08:00
7eb4921b33
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2023-03-04 15:50:10 +08:00
e7ce3263b8
Level 2 Pause menu update
2023-03-04 13:12:02 +08:00
f3908d3afb
Merge branch 'main' into SP3-20-UI-System
2023-03-04 13:09:06 +08:00
c3a452a1c4
Pause Canvas Updated with correct button scales and button FX
2023-03-04 12:51:19 +08:00
6cf8f03ff1
Merge branch 'main' into AIFixes
2023-03-04 12:50:13 +08:00
90c9a0a959
Merge branch 'main' into AudioImplementation
2023-03-04 12:46:59 +08:00
0a8f90ae80
Added Gameplay Canvas for Level 1
2023-03-04 12:44:58 +08:00
28949b29ff
Level 1 AI start waypoint
2023-03-04 05:07:39 +08:00
dc54ae92a2
AI gets sent to a waypoint of choice when caught
2023-03-04 04:57:59 +08:00
3a60eee32f
merged
2023-03-04 03:17:20 +08:00
6d1e179baf
UI doine
2023-03-04 02:46:56 +08:00
17bb7a08eb
Fixed render to swapchain errors
2023-03-04 01:01:26 +08:00
ce41e975d0
Merge branch 'main' into SP3-1-Rendering
2023-03-04 00:52:05 +08:00
56693565f4
WIP Load and test animations
2023-03-04 00:43:31 +08:00
a5fe4bf0a0
New SFX and (supposedly) spatial SFX
2023-03-04 00:19:35 +08:00
166e13a339
Shadows WIP
...
- Light direction in 2nd level changed
2023-03-03 22:01:34 +08:00
beeeae99ca
SHRawAnimInspector can now generate incomplete animation clips
2023-03-03 18:53:59 +08:00
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
dfc2a68dde
Add Set audio param with label functionality
2023-03-03 18:13:35 +08:00
0a224726b3
revert?
2023-03-03 17:25:09 +08:00
d65af97166
Revert of a previous commit for scene files
2023-03-03 17:24:27 +08:00
27b00a6c4a
end cutscene done
2023-03-03 14:28:10 +08:00
f7c33bc89a
Various null checks
2023-03-03 14:26:36 +08:00
81da3e501d
fix minor preview level bug
2023-03-03 00:40:16 +08:00
7763a969b2
Merge branch 'main' into SP3-10-input-management
2023-03-02 22:55:29 +08:00
0984eee6bb
Gameplay UI WIP
2023-03-02 17:34:11 +08:00
97db3b1021
Merge branch 'main' into PlayerController
2023-03-02 17:33:42 +08:00
8c74ec85d3
Done with level preview
2023-03-02 17:33:02 +08:00
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
6b42d78f16
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2023-03-02 15:49:36 +08:00
802924141a
Scene Fade In and Out Fixes
2023-03-02 15:47:00 +08:00
e2ef32f130
Fixed Trajectory Rendering
2023-03-02 15:29:24 +08:00
1e734b6006
Merge branch 'main' into SP3-10-input-management
2023-03-02 13:31:13 +08:00
2834414115
Merge branch 'main' into PlayerController
2023-03-02 13:05:28 +08:00
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
1e59b6436c
Merge branch 'main' into SP3-1-Rendering
2023-03-02 11:36:35 +08:00
381fe476be
Game UI WIP
2023-03-02 11:33:21 +08:00
30923389ae
Merge branch 'main' into SP3-20-UI-System
2023-03-02 10:23:09 +08:00
4131c58c08
Modified calls to IsCursorVisible
2023-03-02 10:01:52 +08:00
e0ee2a8079
Gameplay UI progress
2023-03-02 09:55:41 +08:00
9dd01f5fa1
Replaced How to play screen and credits placeholder
2023-03-02 03:01:24 +08:00
e4345d4937
Changed all button textures and update win and lose screen to use buttonFX
2023-03-02 02:30:59 +08:00
2af19baccd
Added the transition back to the scene
2023-03-02 00:02:18 +08:00
b2c702c780
Merge branch 'main' into PlayerController
2023-03-02 00:01:34 +08:00
a04eee0a2f
mouse centering and visibility when appropriate
2023-03-01 23:56:40 +08:00
403df62a0b
cleaning up scenes and WIP for previewlevel camera
2023-03-01 18:05:42 +08:00
1f5cfd36f7
Scene transitions done
2023-03-01 17:36:02 +08:00
a65735e0b3
progress
2023-03-01 16:37:33 +08:00
bc17479284
Merge branch 'main' into SP3-13-Assets-Manager
2023-03-01 16:33:30 +08:00
17a7db8a91
Merge branch 'main' into scenetransitions
2023-03-01 12:51:43 +08:00
2e7bfd8b28
Merge branch 'main' into SP3-1-Rendering
2023-03-01 08:56:45 +08:00
d5c9010661
Clean up the scenes
2023-03-01 01:16:34 +08:00
ab92d56cf0
disable movement when pop out is in place
2023-03-01 00:51:57 +08:00
4e56061ebe
adjust text in cutscene
2023-02-28 22:53:54 +08:00
bd9349eae7
FRC fix, stealfood popup almost done and reset dt when load
2023-02-28 21:42:05 +08:00
0da61aa842
Fixed text rendering rendering last
2023-02-28 21:30:09 +08:00
04c19fb586
Merge branch 'main' into PlayerController
2023-02-28 19:13:11 +08:00
0bdab3b079
WIP for steal food pop up
2023-02-28 18:35:43 +08:00
d9f064994e
Merge branch 'main' into scenetransitions
2023-02-28 18:34:07 +08:00
52ba54a82a
Fix ShinyHighlight issue and updated level 3
2023-02-28 15:42:28 +08:00
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
2ab4981a43
renamed cutscene to cutsceneIntro and adjusted level 2
2023-02-28 15:06:19 +08:00
d563247ec2
Merge branch 'main' into scenetransitions
2023-02-28 06:49:55 +08:00
b3ec2fb4df
implementing in progress
2023-02-28 06:49:40 +08:00
380de28358
cutscene for intro done
2023-02-28 01:57:00 +08:00
79cb0f12ae
WIP for Alpha, added material name in editor WIP for cutscene
2023-02-27 18:09:05 +08:00
4f1ecf1b50
multiplierTextFX WIP
2023-02-27 17:01:46 +08:00
cbb334d48e
Slider Text Default Value fix
2023-02-27 16:39:31 +08:00
c328672286
black shader
2023-02-27 16:22:54 +08:00
75295b5d6e
Merge branch 'main' into PlayerController
2023-02-27 15:58:37 +08:00
c912dd2e4b
WIP for cutscene and added test for KW
2023-02-27 15:33:58 +08:00
ba89dcea14
Merge branch 'main' into scenetransitions
2023-02-27 15:30:04 +08:00
f9c90ece7e
Scene Transition Script
2023-02-27 15:28:05 +08:00
4c7d06452e
viewport changed
2023-02-27 15:25:01 +08:00
0e7ecd382f
Merge branch 'main' into SP3-20-UI-System
2023-02-27 15:17:03 +08:00
08e4db134a
Tweaked main menu UI
2023-02-27 15:16:48 +08:00
f6db65ddf4
Particles WIP
2023-02-27 15:14:32 +08:00
0eae325b5f
Merge pull request #369 from SHADE-DP/SP3-20-UI-System
...
Added Sliders. Added Level Select, How To Play,. Credits Options Canvases layout for in main menu. Added Tweening Manager(Script)
2023-02-27 12:00:24 +08:00
984473bdab
Slider text fixed
2023-02-27 10:28:20 +08:00
db8ed27cb7
main Menu layout complete for now
2023-02-27 10:05:30 +08:00
eb7c0e749e
Added a slider_textured fs
2023-02-27 09:59:58 +08:00
949ade5775
Options Layout done
2023-02-27 09:55:54 +08:00
90763ded71
Change Canvas Button Script
2023-02-27 08:08:04 +08:00
f23853c85c
Main Menu Canvas Layout with button FX and scalebounce
2023-02-27 07:32:26 +08:00
eb3d8b6b8b
Slider done, Slider Shader bugged
2023-02-27 05:42:54 +08:00
efcca56c99
WIP foir silhouette, renamed scene files and fix breakable bug
2023-02-27 00:41:25 +08:00
31491d06ef
Merge branch 'main' into SP3-8-serialization
2023-02-26 22:44:57 +08:00
ff2b9b4af3
Rudimentary Prefab (no resolution)
...
Warning Fixes
2023-02-26 22:44:39 +08:00
027a2c490b
Added elapsedTime and shiny Highlight along with Level 3 asset and scene
2023-02-25 21:56:49 +08:00
acc548678e
Merge branch 'main' into PlayerController
2023-02-24 21:10:10 +08:00
dfbd1d027c
Merge branch 'main' into PlayerController
2023-02-24 18:04:26 +08:00
d85382a06d
Merge pull request #363 from SHADE-DP/SP3-1-Rendering
...
Implemented scanline and silhouette effect
2023-02-24 17:20:45 +08:00
18f6720055
Merge branch 'main' into SP3-1-Rendering
2023-02-24 17:18:40 +08:00
6045214b13
Camera width to resize with view port
2023-02-24 15:35:02 +08:00
7eac238226
Accounted for subpass input descriptors
...
Silhouette shader is working
2023-02-24 11:47:58 +08:00
6faa4e676b
Updated shader for scanline (needs refining)
...
Shader hot reloading is working
2023-02-24 08:27:04 +08:00
86b662c7dc
Merge branch 'main' into PlayerController
2023-02-23 19:45:38 +08:00
c4db16bb95
Merge branch 'main' into SP3-20-UI-System
2023-02-23 13:44:12 +08:00
69f2e678df
re-enabled scene change and disabled debug logs
2023-02-23 13:42:22 +08:00
1b865b129b
Added finalizeChanges call and debug logs for hover enter
2023-02-23 12:50:42 +08:00
f7bb8606be
Shader, text, asset manager events and generic data desc sets
...
- Made shader for shiniy effect (half done)
- Text objects in scene now use a UI component for better scaling
- Asset manager now creates an event for compilation of assets
- Descriptor for generic data is implemented
2023-02-22 16:39:21 +08:00
8d10c48645
Bug fixes and WIP for alpha
2023-02-21 19:31:50 +08:00
269d5ffc15
Merge pull request #356 from SHADE-DP/SP3-20-UI-System
...
Added 3 button event. Changed hovered and clicked boolean to be stored in UIComponent instead. Fixed Canvas Scaling matrix.
2023-02-21 15:49:27 +08:00
a3112f9c60
Fixed Canvas Scaler to keep AR of the UI Elements
2023-02-21 10:48:07 +08:00
febe22e487
Added new button events
2023-02-21 09:52:23 +08:00
d7725f4e26
Pause is done
2023-02-21 00:47:20 +08:00
Kah Wei