760c0386a9
Merge branch 'SP3-1-MaterialUpdate' into SP3-1-MaterialEditSupport
...
# Conflicts:
# SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHMaterial.h
2022-11-16 16:45:22 +08:00
db7c4a6d38
Merge branch 'main' into SP3-1-MaterialUpdate
2022-11-16 16:40:15 +08:00
acae84d12c
Fixed bug where creation of custom material instance for Renderables are not updated on the GPU
2022-11-16 16:38:04 +08:00
3e3a66f261
Fixed memory corruption issue caused by SHMaterialInstance::SetMaterial()
2022-11-16 16:32:12 +08:00
690ebef77d
Merge pull request #213 from SHADE-DP/SP3-4-Editor
...
Added Custom RigidBody Component View in Editor
2022-11-16 15:33:38 +08:00
b887a303ef
Merge pull request #212 from SHADE-DP/SP3-6-c-scripting
...
Added Audio class for playing audio from C#
2022-11-16 15:31:17 +08:00
3a6f1f852b
SHMaterialInstance::GetProperty() will now retrieve a property from the base material if it was not overriden
2022-11-16 15:29:11 +08:00
ba39c02f9f
Changed formatting slightly for RigidBody component view
2022-11-16 15:28:42 +08:00
dc9291bc01
Added Audio class for playing audio from C#
2022-11-16 15:00:56 +08:00
3affaf426d
WIP Runtime Material Editing support
2022-11-16 09:06:29 +08:00
a9f77d666c
Fixed compile error
2022-11-16 00:04:56 +08:00
f172ccb744
Added Automass and Sleep check for Rigidbodies
2022-11-15 23:58:08 +08:00
1b2ff7f4a2
Expanded Collision Shape C# Interface
2022-11-15 23:57:38 +08:00
37aad49406
Added requested rigidbody component view with debug information
...
Changed DragVec controls to not push commands if ImGuiSliderFlags_ReadOnly is enabled
2022-11-15 21:09:24 +08:00
292fdf4ee2
Fixed some bugs but SHFont constructor still breaks
...
the vkImage is not loading correctly
2022-11-15 20:40:43 +08:00
ec215b944e
Merge pull request #211 from SHADE-DP/SP3-16-Math
...
Fixed Vector3.GetNormalised!!!!!!!
2022-11-15 19:27:27 +08:00
3f3770f74f
now hard sets the vel instead of adding force
2022-11-15 18:52:46 +08:00
a752bdb985
someone donno how to normalise sia
2022-11-15 18:45:58 +08:00
a3d2f95aa0
Merge remote-tracking branch 'origin/main' into SP3-16-Math
2022-11-15 18:41:16 +08:00
b6bae850bf
Merge remote-tracking branch 'origin/main' into FontIntegration
2022-11-15 18:25:40 +08:00
958310a8ea
Renderable now shows the name of the mesh and material assigned instead of asset IDs
2022-11-15 18:16:07 +08:00
c69ad04f1e
Added functions to get name of a backing asset from SHResourceManager
2022-11-15 18:15:49 +08:00
4b70fbf0d6
Merge pull request #210 from SHADE-DP/SP3-8-serialization
...
Added serialization of component isActive
2022-11-15 18:15:23 +08:00
cd164cc2d5
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-11-15 18:10:54 +08:00
93cded6ed9
Added serialization of component isActive
2022-11-15 17:04:52 +08:00
0aaa493bcc
Merge pull request #209 from SHADE-DP/SP3-4-Editor
...
Editor fixes - Parenting of range selected entities, Component IsActive Checkbox, Scene Play/Pause behaviour, Gizmo controls
2022-11-15 16:37:09 +08:00
0e4d97da81
tooltip now reflects the correct keys
2022-11-15 16:28:46 +08:00
f62fec77e3
Merge branch 'main' into SP3-2-Physics
2022-11-15 16:26:42 +08:00
b0404bd59a
Merge branch 'main' into SP3-4-Editor
2022-11-15 16:22:56 +08:00
d3be8127cd
[FIXED] Parenting of entities selected using Shift+Select
...
[FIXED] Component Active Checkbox not working for non reflected components
2022-11-15 16:22:48 +08:00
d3103598f3
Removed old SHLog trace methods
2022-11-15 16:22:16 +08:00
75f103c372
Setting pipeline of a material now triggers a reset of all properties for material instances based on the material
2022-11-15 15:58:38 +08:00
0c6cae5ec8
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-11-15 15:41:53 +08:00
e7a66eed08
Merge branch 'main' into SP3-4-Editor
2022-11-15 15:12:16 +08:00
f7cca42e59
Added shlog information source
2022-11-15 13:53:15 +08:00
96cb832e81
Font meta file and line in application to manually trigger font load
2022-11-15 13:48:54 +08:00
786e15771c
Addedo control paths for font compilation and loading
2022-11-15 13:44:39 +08:00
92ddc3f1eb
Fixed wrong include path to SHUtilities
2022-11-15 13:30:25 +08:00
3dcb6f26c2
Merge branch 'main' into SP3-1-Rendering
2022-11-15 13:21:28 +08:00
c8ba066929
Merge pull request #208 from SHADE-DP/SP3-15-Tools
...
Added debug-only logging macros
2022-11-15 13:19:37 +08:00
e93eea6381
Cleaned up tools folder. Added debug only logging macros with _D suffix
2022-11-15 03:03:37 +08:00
b164e95b12
Merge remote-tracking branch 'origin/main' into SP3-15-Tools
2022-11-15 02:30:05 +08:00
94b4e3d169
Merge pull request #206 from SHADE-DP/SP3-6-c-scripting
...
Updated projects documentation auto generation
2022-11-15 01:52:53 +08:00
638e95473c
Merge pull request #207 from SHADE-DP/SP3-13-Assets-Manager
...
Fixed and Updated internal asset creation pipeline for editor (Textures)
Accounted for texture compilation within editor
Fixed bug with rebuilding of asset collection and asset directory
Added checks for already registered assets and sub assets
2022-11-15 01:50:13 +08:00
5cb87402b2
Hide .shmeta files from C# script project
2022-11-15 01:22:22 +08:00
16e357acb0
Accounted for texture compilation
...
Changed refresh, doesnt clear asset collection anymore
Checks for preexisting sub assets and asset meta in collection
2022-11-14 21:18:36 +08:00
7c636adbfc
Merge branch 'main' into SP3-4-Editor
2022-11-14 20:41:50 +08:00
36ed195a69
[FIX] Scene saving when you press play from pause
...
[FIX] WER for transform gizmo can now be pressed regardless of whether editor viewport is focused
2022-11-14 20:40:52 +08:00
47c50c3a31
Merge branch 'main' into SP3-6-c-scripting
2022-11-14 19:38:43 +08:00
4eb5fa64e0
Text Rendering WIP
2022-11-14 19:31:26 +08:00
Kah Wei