ec2ec82163
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2022-10-01 15:00:01 +08:00
8ad315193d
Merge pull request #72 from SHADE-DP/SP3-6-c-scripting
...
Fixed MSIL warning when building scripts
2022-10-01 14:55:31 +08:00
b3b565454f
Merge branch 'main' into SP3-6-c-scripting
2022-10-01 14:50:46 +08:00
0360a8bfa1
made the Input Manager NOT be a System anymore
2022-10-01 14:34:30 +08:00
78d13c0ab8
Changed some couts and asserts to use SHLOG
2022-10-01 14:28:13 +08:00
dc8d58d95c
fix GetMouseWindowPosition()
2022-10-01 13:49:11 +08:00
af24ed78dc
Fixed MSIL warning when building scripts
2022-10-01 13:43:34 +08:00
a011e9a795
Merge pull request #71 from SHADE-DP/SP3-13-Assets-Manager
...
SP3-13 Assets Management
SP3-103 SP3-104 SP3-237 GLTF/DDS Loading complete. Compilation/Loading of mesh and texture data into custom binary files implemented
2022-10-01 13:39:33 +08:00
0792979dff
Moved some comments
2022-10-01 13:31:08 +08:00
adbb77932c
Merge branch 'main' into SP3-13-Assets-Manager
2022-10-01 13:29:51 +08:00
c82d01631c
SP3-237 Texture load/compile successfully
2022-10-01 13:27:51 +08:00
5069a42319
SP3-237 Mesh compile and load successfully. Although now path to load/compile is hardcoded. Flow will be done after MS1
2022-10-01 13:12:37 +08:00
e956797441
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-10-01 01:13:13 +08:00
8a3d3c8d4e
SP3-237 SP3-103 SP3-104 Implemented SHTexture and SHMesh binary file writing and loading. NOT TESTED
...
Added file level comments
2022-09-30 22:08:17 +08:00
e046dafced
Merge pull request #70 from SHADE-DP/SP3-5-ECS
...
Sp3 5 ecs
Added event manager include for added/removedComponentEvent
2022-09-30 20:36:02 +08:00
cbf4a1f5fd
Merge branch 'main' into SP3-5-ECS
2022-09-30 20:35:12 +08:00
e4be5e0987
Added event manager include
2022-09-30 20:34:46 +08:00
4647a94aa3
Merge pull request #68 from SHADE-DP/SP3-5-ECS
...
Sp3 5 ecs
Fixed SHFamilyID for SHSystem and SHComponent. It is still bugged for SHScene. For now we cant change SHScene.
Added ComponentAdded and ComponentRemoved events. (untested).
2022-09-30 20:27:44 +08:00
2d07fb0afc
Added component added and removed events
2022-09-30 20:25:26 +08:00
9930b002c6
Merge pull request #67 from SHADE-DP/SHFamilyID-BugFix
...
Sh family id bug fix
2022-09-30 20:15:03 +08:00
114ae86a9f
Fixed SHFamilyID for SHSystem and SHComponent but still have issues with SHScene
2022-09-30 20:13:18 +08:00
584b7e425f
WIP Write meta files to track whether raw asset (fbx/gltf/dds) have been compiled into custom binary
2022-09-30 08:57:25 +08:00
00695950d9
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2022-09-29 10:59:18 +08:00
a51cbb7e70
Merge branch 'main' into SP3-13-Assets-Manager
2022-09-29 10:55:49 +08:00
b1a799cf05
Attempt using dllimport/dllexport
2022-09-29 07:59:04 +08:00
a9ff693646
Merge pull request #66 from SHADE-DP/SP3-6-c-scripting
...
Added script inspector, added Transform component for C# and added hot reloading options into editor
2022-09-29 00:11:51 +08:00
70559204bf
Added spinning raccoons and fixed TRansform component bug
2022-09-28 23:55:44 +08:00
566c12a922
Merge branch 'main' into SP3-6-c-scripting
...
# Conflicts:
# SHADE_Application/src/Scenes/SBTestScene.cpp
# SHADE_Engine/src/Editor/SHEditorWidgets.hpp
2022-09-28 23:27:48 +08:00
0e07960938
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-09-28 21:30:57 +08:00
561f2b091f
Added PhysicsObject to handle interface between components and physics system
2022-09-28 21:09:27 +08:00
c963f1d978
Merge pull request #65 from SHADE-DP/SP3-1-Rendering
...
Rendering merge
2022-09-28 20:42:03 +08:00
363e09bd55
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2022-09-28 20:39:42 +08:00
78f216e445
Rendered multiple racoons
2022-09-28 20:33:29 +08:00
238ed1665c
Merge pull request #64 from SHADE-DP/SP3-4-editor_fix
...
New editor widgets and windows
Add new editor widgets
Handle remaining reflected types for component view (arithmetic and enumerations)
Add simple profiler
2022-09-28 19:53:02 +08:00
371f8e5e6f
Add simple profiler
2022-09-28 19:45:40 +08:00
10f5817c15
Merge branch 'main' into SP3-4-editor_fix
2022-09-28 19:01:18 +08:00
9909cfaa96
Merge pull request #63 from SHADE-DP/SP3-129-AudioSystem
...
change engine premake to copy fmod over from its lib
2022-09-28 18:56:08 +08:00
551853084b
Merge branch 'main' into SP3-129-AudioSystem
2022-09-28 18:54:21 +08:00
a96ef67ec4
change engine premake to copy fmod lib over
2022-09-28 18:53:53 +08:00
9a774508a8
Merge pull request #62 from SHADE-DP/SP3-129-AudioSystem
...
added fmod to dependencies.bat
2022-09-28 18:42:29 +08:00
f83b40c96c
added fmod to dependencies.bat
2022-09-28 18:40:45 +08:00
a1775db60b
Merge branch 'main' into SP3-4-editor_fix
2022-09-28 18:36:44 +08:00
02ec5d88e8
Add remaining controls to component view
2022-09-28 18:36:22 +08:00
fa6175256f
Merge pull request #61 from SHADE-DP/SP3-129-AudioSystem
...
Added AudioSystem
added audio system with banks
change the Dependencies to clone fmod
change premake to include fmode
space to play sound
Currently audiosystem is commented out due to causing the raccoon to not be rendered
2022-09-28 18:36:13 +08:00
219aaa1707
Split texture loader into 2 paths for dds and shtexture format.
...
SHTexture binary load half done
2022-09-28 18:35:59 +08:00
201b19e8a6
SP3-237
...
Renamed MeshWriter to MeshCompiler
Implemented texture compiler
2022-09-28 18:35:22 +08:00
5f4c81aeed
comment out audiosystem from application to prevent accidents
2022-09-28 18:22:53 +08:00
e71941cccf
removing not needed buttons
2022-09-28 18:12:01 +08:00
43ad883bdb
removing unnecessary creation of cpmponent
2022-09-28 18:08:49 +08:00
4fcb5e313b
Added more objects + tested materials (still needs testing)
2022-09-28 18:03:46 +08:00
Brandon Mak