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
Brandon Mak
7f13462db7
GetGraphicsPipeline now takes in a subpass (thanks KW)
...
- Fixed blending issues in pipeline
2023-02-28 19:47:52 +08:00
Kah Wei
36af939c67
Added reworked AnimationClip and SHAnimClipAsset
2023-02-28 19:19:06 +08:00
Glence
04c19fb586
Merge branch 'main' into PlayerController
2023-02-28 19:13:11 +08:00
SHAM-DP
ef268bc9e5
Drag drop prefab onto entity (NON UNDO/REDO ACTION for now)
2023-02-28 16:01:52 +08:00
Glence
52ba54a82a
Fix ShinyHighlight issue and updated level 3
2023-02-28 15:42:28 +08:00
SHAM-DP
7e34edecdd
safety check for scroll to after paste entity
2023-02-28 15:36:45 +08:00
SHAM-DP
5b5a9342c3
Merge branch 'main' into SP3-4-Editor
2023-02-28 15:12:31 +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
SHAM-DP
3141902e3d
Merge branch 'main' into SP3-129-AudioSystem
2023-02-28 13:11:36 +08:00
SHAM-DP
a6659f7cbc
Remove some redundant lines
2023-02-28 13:11:21 +08:00
SHAM-DP
417f086dfa
Clean up and verified VCA Volume editing is working fine
2023-02-28 09:36:28 +08:00
SHAM-DP
50d7ad80a2
Added Spatial Audio
2023-02-27 22:02:48 +08:00
Glence
79cb0f12ae
WIP for Alpha, added material name in editor WIP for cutscene
2023-02-27 18:09:05 +08:00
Kah Wei
33b5b84fd4
add anim clip
2023-02-27 17:04:16 +08:00
Kah Wei
f061e8ed43
Updated comments to use SHRawAnimation instead of SHAnimationData
2023-02-27 16:52:41 +08:00
Kah Wei
7839bd21f2
Renamed SHAnimationData to SHRawAnimation
2023-02-27 16:51:02 +08:00
maverickdgg
cbb334d48e
Slider Text Default Value fix
2023-02-27 16:39:31 +08:00
Kah Wei
ba22638520
Renamed SHAnimationClip to SHAnimationData
2023-02-27 16:17:36 +08:00
Glence
75295b5d6e
Merge branch 'main' into PlayerController
2023-02-27 15:58:37 +08:00
Kah Wei
9486762693
Merge branch 'main' into SP3-22-AnimationController
2023-02-27 15:54:48 +08:00
maverickdgg
4c7d06452e
viewport changed
2023-02-27 15:25:01 +08:00
Brandon Mak
f6db65ddf4
Particles WIP
2023-02-27 15:14:32 +08:00
XiaoQiDigipen
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
XiaoQiDigipen
29f1edb9e8
Merge pull request #368 from SHADE-DP/SP3-4-Editor
...
Added display of editor camera position
2023-02-27 11:59:58 +08:00
maverickdgg
90763ded71
Change Canvas Button Script
2023-02-27 08:08:04 +08:00
maverickdgg
eb3d8b6b8b
Slider done, Slider Shader bugged
2023-02-27 05:42:54 +08:00
Glence
55953e0f08
Merge branch 'main' into PlayerController
2023-02-27 00:41:35 +08:00
Sri Sham Haran
dabc94a845
editor cam pos display as requested
2023-02-26 23:26:24 +08:00
Sri Sham Haran
7c21544d69
Merge branch 'main' into SP3-4-Editor
2023-02-26 23:22:36 +08:00
Sri Sham Haran
31491d06ef
Merge branch 'main' into SP3-8-serialization
2023-02-26 22:44:57 +08:00
Sri Sham Haran
ff2b9b4af3
Rudimentary Prefab (no resolution)
...
Warning Fixes
2023-02-26 22:44:39 +08:00
maverickdgg
234da235b5
Merge branch 'main' into SP3-141-Camera-System
2023-02-26 02:21:30 +08:00
maverickdgg
c8baff878e
Added offset calculation to camera get position
2023-02-26 02:20:57 +08:00
Sri Sham Haran
2878c840c5
Merge remote-tracking branch 'origin/SP3-4-Editor' into SP3-4-Editor
2023-02-25 23:37:22 +08:00
Glence
027a2c490b
Added elapsedTime and shiny Highlight along with Level 3 asset and scene
2023-02-25 21:56:49 +08:00
Brandon Mak
fe27f8752b
Particle system WIP
2023-02-24 21:46:01 +08:00
Glence
a27b3fb80e
fix vulkan red line
2023-02-24 21:10:45 +08:00
Glence
acc548678e
Merge branch 'main' into PlayerController
2023-02-24 21:10:10 +08:00
SHAM-DP
38c6cb6fed
Prefab WIP
...
Added component status
2023-02-24 20:34:49 +08:00
SHAM-DP
42f4c1c75e
Aspect Ratio WIP
2023-02-24 20:21:09 +08:00
Glence
dfbd1d027c
Merge branch 'main' into PlayerController
2023-02-24 18:04:26 +08:00
XiaoQiDigipen
d85382a06d
Merge pull request #363 from SHADE-DP/SP3-1-Rendering
...
Implemented scanline and silhouette effect
2023-02-24 17:20:45 +08:00
Brandon Mak
18f6720055
Merge branch 'main' into SP3-1-Rendering
2023-02-24 17:18:40 +08:00
maverickdgg
b017618373
Merge branch 'main' into SP3-141-Camera-System
2023-02-24 16:32:01 +08:00
maverickdgg
4690fa5f91
GetMainCamera exposed to scripts.
2023-02-24 16:31:53 +08:00
maverickdgg
6045214b13
Camera width to resize with view port
2023-02-24 15:35:02 +08:00
XiaoQiDigipen
bbc21670c3
Merge pull request #361 from SHADE-DP/SP3-141-Camera-System
...
Change AR to be shared and stored in camera system
2023-02-24 15:12:17 +08:00
maverickdgg
c774071b35
Merge branch 'main' into SP3-141-Camera-System
2023-02-24 15:05:40 +08:00
maverickdgg
546ac9bb00
Gets the resource manager to pre-Load the textures when we set button texture asset ids
2023-02-24 15:02:41 +08:00
Brandon Mak
7eac238226
Accounted for subpass input descriptors
...
Silhouette shader is working
2023-02-24 11:47:58 +08:00
Brandon Mak
6faa4e676b
Updated shader for scanline (needs refining)
...
Shader hot reloading is working
2023-02-24 08:27:04 +08:00
Glence
86b662c7dc
Merge branch 'main' into PlayerController
2023-02-23 19:45:38 +08:00
XiaoQiDigipen
79433bcba2
Merge pull request #359 from SHADE-DP/SP3-20-UI-System
...
Moved UIRoutines call order. Call FinalizeChanges. Fixed UI Button Events.
2023-02-23 14:00:50 +08:00
Xiao Qi
5d3e755b9b
Reload of recompiled data
2023-02-23 13:49:21 +08:00
maverickdgg
c4db16bb95
Merge branch 'main' into SP3-20-UI-System
2023-02-23 13:44:12 +08:00
maverickdgg
69f2e678df
re-enabled scene change and disabled debug logs
2023-02-23 13:42:22 +08:00
Kah Wei
64be53bad3
Fixed button events only working once
2023-02-23 13:39:09 +08:00
Brandon Mak
a391d9373e
WIP
2023-02-23 13:35:46 +08:00
Kah Wei
d7846082a3
Fixed incorrect managed functions being called for new button events
2023-02-23 13:32:00 +08:00
maverickdgg
1b865b129b
Added finalizeChanges call and debug logs for hover enter
2023-02-23 12:50:42 +08:00
mushgunAX
dbe9b4d133
Controller, Bindings and Mouse Centre via C#
2023-02-22 23:50:39 +08:00
Kah Wei
ecc88dc142
Fleshed out SHAnimationController more
2023-02-22 23:45:42 +08:00
Kah Wei
913241c73a
Merge branch 'main' into SP3-22-AnimationController
2023-02-22 21:49:45 +08:00
Kah Wei
bea179fb0f
Added script mappings for new button events
2023-02-22 21:49:10 +08:00
Brandon Mak
4dd496a6e8
Auto stash before merge of "SP3-1-Rendering" and "origin/SP3-1-Rendering"
...
WIP Hot reload
2023-02-22 19:51:50 +08:00
Xiao Qi
ff76704a86
New internal function in asset manager to get asset ID from name of compiled asset
2023-02-22 19:48:49 +08:00
Xiao Qi
8e9854a130
Check for existing asset meta in browser file before sendin asset id
2023-02-22 16:49:21 +08:00
Xiao Qi
5623115e29
Added asset id into compile function to facilitate event sending
2023-02-22 16:43:49 +08:00
Brandon Mak
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
mushgunAX
bc87fa3ae0
Merge branch 'main' into SP3-10-input-management
2023-02-22 15:16:05 +08:00
mushgunAX
0e572d7f89
progress
2023-02-22 15:15:38 +08:00
Sri Sham Haran
fbd0035ade
Merge branch 'main' into SP3-4-Editor
2023-02-21 22:17:20 +08:00
Glence
8d10c48645
Bug fixes and WIP for alpha
2023-02-21 19:31:50 +08:00
XiaoQiDigipen
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
maverickdgg
6b6bbc6ac5
Camera AR now stored in system instead of camera component.
2023-02-21 11:37:09 +08:00
Brandon Mak
49692e5c37
Text Rendering now checks for UI Component
2023-02-21 11:16:44 +08:00
maverickdgg
a3112f9c60
Fixed Canvas Scaler to keep AR of the UI Elements
2023-02-21 10:48:07 +08:00
maverickdgg
51909071e6
Change isHovered and isClicked to be stored in UIComponent instead and made a helper function to check for clicks and hovered
2023-02-21 10:09:58 +08:00
mushgunAX
9cc318cf27
Merge branch 'main' into SP3-10-input-management
2023-02-21 09:55:28 +08:00
mushgunAX
fe64844c4e
Mouse Centering
2023-02-21 09:55:14 +08:00
maverickdgg
febe22e487
Added new button events
2023-02-21 09:52:23 +08:00
Glence
09d88b5a70
small bug fixes for text and serialization and added game pause
2023-02-20 19:53:22 +08:00
Glence
f2e9d3b349
Merge branch 'main' into PlayerController
2023-02-20 19:07:56 +08:00
Kah Wei
c85298db88
Added initial stubs for SHAnimationController
2023-02-20 16:55:08 +08:00
maverickdgg
c9e9a30c3f
Exposed FOV to editor. Adjust AR for game camera
2023-02-20 14:52:01 +08:00
maverickdgg
33a6fac7c9
Merge branch 'main' into SP3-141-Camera-System
2023-02-20 14:39:14 +08:00
maverickdgg
debdba183e
removed some debug code
2023-02-20 14:39:10 +08:00
Brandon Mak
7b500d0cac
Merge branch 'main' into SP3-1-Rendering
2023-02-20 14:28:54 +08:00
Brandon Mak
15df08ef67
Implemented events for screen resize
2023-02-20 14:28:23 +08:00
Glence
d754a0b5c3
added targetOffSet to camera position
2023-02-18 23:43:43 +08:00
Kah Wei
916a7315da
Merge branch 'main' into SP3-6-CSharpStaticReset
2023-02-18 12:24:17 +08:00
Brandon Mak
19d81b80f6
Base files for particles
2023-02-17 18:29:44 +08:00
Brandon Mak
f1217cc20b
Trajectory Rendering WIP
...
- Trajectory rendering system is all in place. Just requires testing through the component.
- Component needs to be reflected in editor
- Shaders for trajectory rendering is also in place
2023-02-17 13:48:14 +08:00
Brandon Mak
cee45863fa
Trajectory rendering WIP
2023-02-17 00:53:45 +08:00
Brandon Mak
5acca02363
Implemented different shadow mapping technique
2023-02-15 21:34:22 +08:00
Diren D Bharwani
c0249531d3
Potential fix to physics collision states being incorrect
2023-02-04 15:18:15 +08:00
Diren D Bharwani
385b34fea4
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2023-02-04 14:20:25 +08:00
Sri Sham Haran
e41c161202
Adjusted lighting a bit cuz it looked janky at one portion
...
Hide and clip mouse cursor for builds without editor (only when window is active)
2023-02-04 11:21:25 +08:00
XiaoQiDigipen
f617a1a984
Merge pull request #345 from SHADE-DP/SP3-141-Camera-System
...
Camera Collision fix. Still have some minor bugs
2023-02-04 02:39:55 +08:00
Xiao Qi
33807de93d
Pushed scene change and animator component bug fix for models without rigs
2023-02-04 02:32:35 +08:00
maverickdgg
c5296db6f6
Camera Collision fix
2023-02-04 02:20:42 +08:00
maverickdgg
94fe055aa9
fixed collision
2023-02-04 02:10:08 +08:00
Diren D Bharwani
638286b357
Fixed missing trigger state
2023-02-04 01:57:27 +08:00
maverickdgg
e5d372c94e
Merge branch 'main' into SP3-141-Camera-System
2023-02-04 01:20:22 +08:00
Sri Sham Haran
b89be05ceb
Shortcuts in hierarchy panel cannot be pressed when any widget is focused
2023-02-04 01:20:01 +08:00
Diren D Bharwani
d517a98bab
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2023-02-04 00:54:03 +08:00
Diren D Bharwani
a520571d82
Collision Tags now serialise based on index & autosave
2023-02-04 00:52:58 +08:00
maverickdgg
81d63f9776
Merge branch 'main' into SP3-141-Camera-System
2023-02-04 00:43:41 +08:00
maverickdgg
63a546b7aa
Merge branch 'main' into SP3-141-Camera-System
2023-02-04 00:32:41 +08:00
maverickdgg
4de32341e1
Merge branch 'main' into SP3-20-UI-System
2023-02-04 00:24:59 +08:00
maverickdgg
c88ce23d45
WIP collision
2023-02-04 00:17:29 +08:00
Kah Wei
3cd1778d08
Fixed SHUIComponent serialization
2023-02-04 00:04:25 +08:00
Diren D Bharwani
ff6ee80df2
Fixed bug where collision tag file could not be editir
...
Fuck file i/o
2023-02-03 23:51:31 +08:00
Kah Wei
7ded7a0706
Merge branch 'SP3-20-UI-System' of https://github.com/SHADE-DP/SHADE_Y3 into SP3-20-UI-System
...
# Conflicts:
# Assets/Editor/Layouts/UserLayout.ini
2023-02-03 23:33:40 +08:00
Kah Wei
940c55d665
Fixed Renderables not being removed from a batch if their modifiable material was retrieved
2023-02-03 23:33:23 +08:00
maverickdgg
21695fd4f3
Merge branch 'main' into SP3-20-UI-System
2023-02-03 23:28:17 +08:00
Diren D Bharwani
7a79cda729
Reworked Collision Tag Interface and Logic
2023-02-03 23:22:21 +08:00
maverickdgg
b15b5eadbc
Merge branch 'main' into SP3-20-UI-System
2023-02-03 22:59:56 +08:00
Diren D Bharwani
c61be35da0
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2023-02-03 22:44:58 +08:00
maverickdgg
382a2d0f6a
Added start game button. Texture changing for buttons now only change when necessary
2023-02-03 22:44:02 +08:00
Glence
5284066cee
Merge branch 'main' into PlayerController
2023-02-03 21:29:02 +08:00
Glence
2ee46f33df
update collision tag to have a save button and clamp raycast draw
2023-02-03 21:28:50 +08:00
XiaoQiDigipen
0bf1fc9839
Merge pull request #335 from SHADE-DP/SP3-1-Rendering
...
Updated shadow implementation
2023-02-03 20:22:03 +08:00
XiaoQiDigipen
b705db8a8c
Merge pull request #334 from SHADE-DP/SP3-129-AudioSystem
...
Added global parameter control and VCA volume control
2023-02-03 20:21:28 +08:00
Brandon Mak
6cde511b36
Shadows update
...
Made it less dark
2023-02-03 20:16:42 +08:00
maverickdgg
a6290d9c8f
Added texture, modifiable material fix
2023-02-03 20:12:48 +08:00
Xiao Qi
50c3855476
Merge remote-tracking branch 'origin/main' into main
2023-02-03 19:38:02 +08:00
Xiao Qi
c9db8262b7
Added preprocessor checks for editor
2023-02-03 19:37:56 +08:00
SHAM-DP
98d4dd9483
Merge branch 'main' into SP3-129-AudioSystem
2023-02-03 19:16:25 +08:00
SHAM-DP
5b2f42a920
Added controls for global parameters
...
Added controls for VCA volume
2023-02-03 19:16:12 +08:00
maverickdgg
e3d616b4e1
Merge branch 'main' into SP3-20-UI-System
2023-02-03 18:42:53 +08:00
Diren D Bharwani
b02f4ac49b
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2023-02-03 18:40:51 +08:00
Diren D Bharwani
36de32447d
Fixed some bugs with serialisation
2023-02-03 18:40:45 +08:00
Kah Wei
929bfa8a54
Merge branch 'SP3-6-c-scripting' into SP3-6-CSharpStaticReset
2023-02-03 17:05:56 +08:00
Kah Wei
4cf17c16b5
Fixed bug where shmeta files in folders would still appear in SHADE_Scripting.csproj's solution explorer
2023-02-03 16:54:35 +08:00
Diren D Bharwani
c73275f2d3
Added temporary use of collision layers to C# and fixed raycast drawing
2023-02-03 16:11:30 +08:00
maverickdgg
bb00889553
Merge branch 'main' into SP3-20-UI-System
2023-02-03 15:53:26 +08:00
Diren D Bharwani
b81e71ed08
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2023-02-03 02:03:12 +08:00
Diren D Bharwani
b6d91d5492
Fixed bug with collision tags not behaving as intended
...
Why the damn hell must react's system be so confusing??
2023-02-03 01:37:45 +08:00
Diren D Bharwani
931f6fe5e2
Fixed almost everything. Ray debug drawing has a small bug
2023-02-02 20:56:55 +08:00
Diren D Bharwani
d5c731dd20
Fixed collision shape debug drawing and more serialisation bugs
2023-02-02 20:48:32 +08:00
Diren D Bharwani
931ed58287
Added individual collider debug drawing
2023-02-02 20:19:21 +08:00
Diren D Bharwani
3593df3ada
Fixed collider shape serialisation
2023-02-02 20:15:59 +08:00
Diren D Bharwani
71f4cdd29e
Fixed rigidbody serialisation
2023-02-02 19:23:42 +08:00
Diren D Bharwani
6a57be2e60
Refactored old physics to match new interface
...
Compiles but still buggy, need a bit of time to clear up all the bugs
2023-02-02 19:06:56 +08:00
Kah Wei
ee03722153
Merge branch 'main' into SP3-6-c-scripting
2023-02-01 23:49:44 +08:00
Kah Wei
3a4288d4bc
Merge branch 'SP3-6-c-scripting' into SP3-6-CSharpStaticReset
2023-02-01 19:18:29 +08:00
maverickdgg
d149aae6fb
Merge branch 'main' into SP3-20-UI-System
2023-02-01 12:44:30 +08:00
maverickdgg
2dfaa75ab3
Add CreateComponentSparseSet and bug fix for togglebutton nt triggering
2023-02-01 12:42:51 +08:00
Kah Wei
0b0590180d
Fixed incorrect functor called in SHScriptEngine::onUIElementClicked()
2023-02-01 11:57:11 +08:00
Kah Wei
39fbfbd6fa
Added more reliable method of reloading static C# data
2023-02-01 00:34:09 +08:00
Kah Wei
72953762cb
Attempt at resetting static data members
2023-01-31 23:48:44 +08:00
Brandon Mak
d9833ca8b0
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2023-01-31 19:07:28 +08:00
Brandon Mak
109f35f297
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2023-01-31 19:02:11 +08:00
Brandon Mak
ea74f5ebf6
Fixed some errors in SHUISystem
2023-01-31 19:01:21 +08:00
SHAM-DP
d6fc83d3b7
Merge branch 'main' into SP3-4-Editor
2023-01-31 18:56:09 +08:00
SHAM-DP
4c4d39d4bb
Added double click asset id in inspector to scroll to asset in asset browser
...
Added asset browser filter by name and type
2023-01-31 18:55:50 +08:00
Xiao Qi
883c3c8fc1
Added recognition for audio bank files
...
Added wrapper class to hold path for fmod system
2023-01-31 18:27:39 +08:00
Kah Wei
8f9a4e8c73
Fixed bug where onDestroy() is not called for scripts that are destroyed when leaving play mode in the editor
2023-01-31 18:09:07 +08:00
Brandon Mak
e9452093f0
Fixed UI
2023-01-31 15:17:40 +08:00
mushgunAX
710bfe1dac
Merge branch 'main' into SP3-10-input-management
2023-01-31 12:51:50 +08:00
mushgunAX
38f2ba69db
Force use of Dedicated GPU
2023-01-31 12:43:02 +08:00
Kah Wei
a5b7672102
Merge branch 'main' into SP3-6-c-scripting
2023-01-30 20:53:42 +08:00
Kah Wei
f93d5fcd63
Added scripting inteface for SHUIComponent
2023-01-30 20:52:39 +08:00
Xiao Qi
c13f06e4a6
Added warning line to check for existing path
2023-01-30 19:55:42 +08:00
XiaoQiDigipen
f1bf9cb865
Merge pull request #322 from SHADE-DP/SP3-4-Editor
...
Added hierarchy panel filter
2023-01-30 18:29:47 +08:00
Xiao Qi
f2b8e52608
Commented unused shader build lines
2023-01-30 18:28:49 +08:00
SHAM-DP
f2a0b38406
Merge branch 'main' into SP3-4-Editor
2023-01-30 17:56:38 +08:00
SHAM-DP
cf999b0d3b
Added entity filter
2023-01-30 17:44:06 +08:00
XiaoQiDigipen
213ac9d275
Merge pull request #321 from SHADE-DP/SP3-17-animation-system
...
Animation WIP merge
2023-01-30 17:35:56 +08:00
Kah Wei
c2aa067cc4
Fixed crash caused by loading incorrect renderpass for subpass replacement
2023-01-30 16:55:15 +08:00
SHAM-DP
59ef28baf1
Merge branch 'main' into AudioScripting
2023-01-30 16:47:46 +08:00
SHAM-DP
74b8ee73c5
Spatial setup
2023-01-30 16:47:03 +08:00
Brandon Mak
a3ca04535f
More changes
2023-01-30 16:46:42 +08:00
Brandon Mak
89b101f3e5
passed string by value dum dum brandon
2023-01-30 16:46:14 +08:00
Brandon Mak
c45c469c8e
Change GetUsableSubpasses to GetUsableSubpass
2023-01-30 16:42:19 +08:00
Brandon Mak
f8bde9fc35
Added map to retrieve usable subpasses
2023-01-30 16:35:12 +08:00
Kah Wei
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
Brandon Mak
a67e65ff76
Made array for usable subpasses
2023-01-30 15:34:22 +08:00
Kah Wei
61fa2ae923
Merge branch 'main' into SP3-17-animation-system
2023-01-30 15:16:09 +08:00
Kah Wei
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
XiaoQiDigipen
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
Kah Wei
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
XiaoQiDigipen
3ff2e6bb92
Revert "Implemented a custom physics engine"
2023-01-30 14:40:55 +08:00
Kah Wei
8c3703ce04
Fixed models using wrong animation bone matrices
2023-01-29 20:52:04 +08:00
Kah Wei
4a00312f57
Added serialization of AnimatorComponent
2023-01-29 20:35:18 +08:00
Kah Wei
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
Kah Wei
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
Kah Wei
6af4933b52
Fixed on-close crashes coming from SHResourceManager
2023-01-29 18:51:31 +08:00
Xiao Qi
83a33b3851
Bone count data member in mesh asset
2023-01-29 18:38:12 +08:00
Kah Wei
eab2f2d54a
Fixed bug where replacing an animator's rig causes the GPU to be lost
2023-01-29 16:03:08 +08:00
Kah Wei
3f1a25c95b
Fixed crash caused by loading more than one SHRig
2023-01-29 15:39:48 +08:00
Kah Wei
1472823dc0
Removed buggy animation debug draw
2023-01-29 14:45:46 +08:00
mushgunAX
ac10b95b01
Tooltips
2023-01-25 23:54:04 +08:00
mushgunAX
bde191aeca
Input Bindings Panel Done
2023-01-25 23:22:15 +08:00
Kah Wei
80a7fe701b
Added debug draw for animation system
2023-01-24 23:31:00 +08:00
mushgunAX
e70354df74
Get input code name functions
2023-01-24 19:17:27 +08:00