f2a0b38406
Merge branch 'main' into SP3-4-Editor
2023-01-30 17:56:38 +08:00
cf999b0d3b
Added entity filter
2023-01-30 17:44:06 +08:00
213ac9d275
Merge pull request #321 from SHADE-DP/SP3-17-animation-system
...
Animation WIP merge
2023-01-30 17:35:56 +08:00
4c5becff46
Merge pull request #320 from SHADE-DP/AudioScripting
...
Added Scripting interface for AudioClips
2023-01-30 17:08:38 +08:00
c2aa067cc4
Fixed crash caused by loading incorrect renderpass for subpass replacement
2023-01-30 16:55:15 +08:00
59ef28baf1
Merge branch 'main' into AudioScripting
2023-01-30 16:47:46 +08:00
526c6dc883
Spatial scripting inteface changes (remove eid requirement)
2023-01-30 16:47:38 +08:00
74b8ee73c5
Spatial setup
2023-01-30 16:47:03 +08:00
a3ca04535f
More changes
2023-01-30 16:46:42 +08:00
89b101f3e5
passed string by value dum dum brandon
2023-01-30 16:46:14 +08:00
c45c469c8e
Change GetUsableSubpasses to GetUsableSubpass
2023-01-30 16:42:19 +08:00
f8bde9fc35
Added map to retrieve usable subpasses
2023-01-30 16:35:12 +08:00
8a4a469abf
Added ability to change subpass for a material and fixed typo for vertex shader in the material editor
2023-01-30 15:52:42 +08:00
a67e65ff76
Made array for usable subpasses
2023-01-30 15:34:22 +08:00
23734fa42c
Merge branch 'main' into SP3-1-Rendering
2023-01-30 15:23:00 +08:00
61fa2ae923
Merge branch 'main' into SP3-17-animation-system
2023-01-30 15:16:09 +08:00
53ef202e46
Merge branch 'main' into SP3-17-animation-system
...
# Conflicts:
# SHADE_Engine/src/Editor/EditorWindow/Inspector/SHEditorComponentView.hpp
# SHADE_Engine/src/Serialization/SHYAMLConverters.h
2023-01-30 15:15:46 +08:00
5240c837ec
Merge pull request #318 from SHADE-DP/SP3-10-input-management
...
Implemented Input Binding Panel via Editor
2023-01-30 15:00:58 +08:00
b3f79e31db
Forgot to commit shader binary
2023-01-30 14:58:52 +08:00
52c0cc2f84
Merge branch 'main' into SP3-17-animation-system
...
# Conflicts:
# Assets/Shaders/TestCube_VS.shshaderb
# SHADE_Engine/src/Editor/EditorWindow/Inspector/SHEditorComponentView.hpp
# SHADE_Engine/src/Graphics/MiddleEnd/Batching/SHBatch.h
# SHADE_Engine/src/Graphics/MiddleEnd/GlobalData/SHGraphicsPredefinedData.cpp
# SHADE_Engine/src/Graphics/MiddleEnd/GlobalData/SHGraphicsPredefinedData.h
# SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsConstants.h
# SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsSystem.cpp
# SHADE_Engine/src/Graphics/MiddleEnd/Meshes/SHPrimitiveGenerator.cpp
# SHADE_Engine/src/Graphics/MiddleEnd/Meshes/SHPrimitiveGenerator.h
# SHADE_Engine/src/Graphics/MiddleEnd/Pipeline/SHPipelineLibrary.cpp
# SHADE_Engine/src/Graphics/MiddleEnd/Pipeline/SHPipelineLibrary.h
# SHADE_Engine/src/Serialization/SHYAMLConverters.h
2023-01-30 14:57:46 +08:00
2fd8506fab
Merge pull request #319 from SHADE-DP/revert-316-SHPhysics
...
Revert "Implemented a custom physics engine"
2023-01-30 14:41:09 +08:00
3ff2e6bb92
Revert "Implemented a custom physics engine"
2023-01-30 14:40:55 +08:00
8c3703ce04
Fixed models using wrong animation bone matrices
2023-01-29 20:52:04 +08:00
4a00312f57
Added serialization of AnimatorComponent
2023-01-29 20:35:18 +08:00
2d1987e14b
Added handling for rendering objects using an animated shader but without an animator component or an attached rig
2023-01-29 19:27:58 +08:00
741489b0ae
Merge branch 'SP3-17-animation-system' of https://github.com/SHADE-DP/SHADE_Y3 into SP3-17-animation-system
2023-01-29 18:51:36 +08:00
6af4933b52
Fixed on-close crashes coming from SHResourceManager
2023-01-29 18:51:31 +08:00
83a33b3851
Bone count data member in mesh asset
2023-01-29 18:38:12 +08:00
eab2f2d54a
Fixed bug where replacing an animator's rig causes the GPU to be lost
2023-01-29 16:03:08 +08:00
3f1a25c95b
Fixed crash caused by loading more than one SHRig
2023-01-29 15:39:48 +08:00
1472823dc0
Removed buggy animation debug draw
2023-01-29 14:45:46 +08:00
d5897387c5
Merge branch 'main' into SP3-1-Rendering
2023-01-29 13:25:40 +08:00
ac10b95b01
Tooltips
2023-01-25 23:54:04 +08:00
bde191aeca
Input Bindings Panel Done
2023-01-25 23:22:15 +08:00
7d9ab7a381
items changes
...
items now return back to their original position when owner collides with it
2023-01-25 18:20:26 +08:00
80a7fe701b
Added debug draw for animation system
2023-01-24 23:31:00 +08:00
e70354df74
Get input code name functions
2023-01-24 19:17:27 +08:00
834d474f21
Merge branch 'main' into SP3-10-input-management
2023-01-23 18:04:07 +08:00
cec8d9e618
Merge pull request #316 from SHADE-DP/SHPhysics
...
Implemented a custom physics engine
2023-01-23 15:55:45 +08:00
4ed7aa3aed
Reverted an attempt to stabilise edge detection between polyhedrons
2023-01-23 03:03:40 +08:00
5730381302
Physics objects can be implicity static if only a collider was added.
...
Removed the need to create an extra body. Math is great.
2023-01-23 00:56:46 +08:00
a0f6cd3ae7
Cached SAT for improved stability
...
The effects of baumgarte stabilisation can be rather obvious especially when polyhedrons are thrown around at angles. Regardless, the system is relatively stable bar the added energy from the solving method, which may make for a more "bombastic" physics playground
2023-01-23 00:37:22 +08:00
354d9434f6
SHAnimatorComponent and SHRig now use the proper transform and offset matrices
2023-01-22 21:43:37 +08:00
0c3106f15b
Abstracted contact derivation as setup for cached SAT
2023-01-22 19:20:03 +08:00
dddb556553
Progress
2023-01-22 17:59:36 +08:00
826a1bc617
Merge remote-tracking branch 'origin/main' into SHPhysics
2023-01-22 17:39:06 +08:00
1dc16fdcda
Fixed typos
2023-01-22 17:38:51 +08:00
80fb8f7c73
Saved and loaded bone offsets
2023-01-22 17:00:55 +08:00
7f787f2593
Merge branch 'main' into PlayerController
2023-01-20 15:19:49 +08:00
79a40cb58b
Merge branch 'main' into SP3-10-input-management
2023-01-20 14:02:06 +08:00
SHAM-DP