Sri Sham Haran
22cad78728
Clean up
2022-10-14 15:53:29 +08:00
Sri Sham Haran
20cedbb4ec
Merge branch 'main' into SP3-4-editor_fix
2022-10-14 15:53:12 +08:00
Sri Sham Haran
49575893fe
Made Editor a system and create editor routine so that the editor routine will run between graphics routines
2022-10-14 15:39:43 +08:00
Brandon Mak
682a5a6cbf
bug fix
2022-10-14 00:10:56 +08:00
Brandon Mak
d265aa4541
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2022-10-14 00:10:45 +08:00
Brandon Mak
ab09d78e42
removed routines for graphics from application (remember to add back after ingui update routine is added).
...
Scene graph and physics system had some extra couts
input system bug fix (this change is now in main)
Mouse pick system wip
2022-10-14 00:08:14 +08:00
Diren D Bharwani
acd3174c39
Merge branch 'SP3-16-Math' into SP3-2-Physics
2022-10-13 18:15:52 +08:00
Diren D Bharwani
ff9b504bc5
Moved collider interface into physics object. Added support for removing rigidbodies
2022-10-11 01:26:12 +08:00
Brandon Mak
d432822608
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2022-10-02 01:13:43 +08:00
Kah Wei
201ce17a40
Fixed validation errors when closing the app
2022-10-02 00:56:34 +08:00
Xiao Qi
40bcea133d
Changed texture index to 0 for both racoons
2022-10-02 00:09:38 +08:00
Brandon Mak
e2b86545bb
Window resize working
2022-10-01 23:57:08 +08:00
Diren D Bharwani
4007120dbd
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-10-01 22:06:50 +08:00
Diren D Bharwani
e4a6877ed3
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-10-01 20:43:18 +08:00
XiaoQiDigipen
48413bdc1f
Merge pull request #75 from SHADE-DP/ProjectWarningDisables
...
Warning disables
2022-10-01 19:44:17 +08:00
Sri Sham Haran
a6e17847bf
Warning disables
...
Remove SDL hint that gave warning (it was unnecessary anyway)
2022-10-01 18:58:13 +08:00
mushgunAX
3c58a538ae
Mouse Vel & UpdateInput called from SBApplication
2022-10-01 18:02:27 +08:00
mushgunAX
aef3e4ef1a
Update SBApplication.cpp
2022-10-01 17:04:07 +08:00
mushgunAX
857f88c4a8
Merge branch 'main' into SP3-10-input-management
2022-10-01 17:03:58 +08:00
Diren D Bharwani
374f1a961d
Integrated rigidbodies into physics system
2022-10-01 16:50:50 +08:00
Diren D Bharwani
4f56a32a9b
Added physics system (untested)
2022-10-01 15:26:08 +08:00
Glence
0c78eca1bc
added audiosystem back in
...
added a button for the audio
2022-10-01 15:09:26 +08:00
mushgunAX
0360a8bfa1
made the Input Manager NOT be a System anymore
2022-10-01 14:34:30 +08:00
Xiao Qi
0792979dff
Moved some comments
2022-10-01 13:31:08 +08:00
Xiao Qi
adbb77932c
Merge branch 'main' into SP3-13-Assets-Manager
2022-10-01 13:29:51 +08:00
Xiao Qi
c82d01631c
SP3-237 Texture load/compile successfully
2022-10-01 13:27:51 +08:00
Xiao Qi
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
Diren D Bharwani
e956797441
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-10-01 01:13:13 +08:00
maverickdgg
114ae86a9f
Fixed SHFamilyID for SHSystem and SHComponent but still have issues with SHScene
2022-09-30 20:13:18 +08:00
Xiao Qi
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
maverickdgg
b1a799cf05
Attempt using dllimport/dllexport
2022-09-29 07:59:04 +08:00
Kah Wei
70559204bf
Added spinning raccoons and fixed TRansform component bug
2022-09-28 23:55:44 +08:00
Kah Wei
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
Diren D Bharwani
0e07960938
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-09-28 21:30:57 +08:00
Brandon Mak
363e09bd55
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2022-09-28 20:39:42 +08:00
Brandon Mak
78f216e445
Rendered multiple racoons
2022-09-28 20:33:29 +08:00
Glence
5f4c81aeed
comment out audiosystem from application to prevent accidents
2022-09-28 18:22:53 +08:00
Glence
43ad883bdb
removing unnecessary creation of cpmponent
2022-09-28 18:08:49 +08:00
Brandon Mak
4fcb5e313b
Added more objects + tested materials (still needs testing)
2022-09-28 18:03:46 +08:00
Diren D Bharwani
c698bac731
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-09-28 17:52:02 +08:00
Glence
658562bdc4
Merge branch 'main' into SP3-129-AudioSystem
2022-09-28 17:51:40 +08:00
Xiao Qi
6ef30bc415
post processing copy for publish build
2022-09-28 17:22:22 +08:00
XiaoQiDigipen
a9932d5494
Merge pull request #59 from SHADE-DP/SP3-19-frame-rate-controller
...
FRC changed
FRC code changed to adapt better with current state of the engine. Sole purpose to retrieve the varying raw delta time
Only two functions:
Get the varying raw delta time of the current frame
Update the FRC to update the raw delta time
2022-09-28 17:09:31 +08:00
Diren D Bharwani
097b1be3f7
Added Physics System
2022-09-28 16:15:36 +08:00
Brandon Mak
2df9252e17
Fixed material desc set binding
2022-09-28 15:31:37 +08:00
Diren D Bharwani
a08b123814
Added reactphysics to SHADE_Application premake file
2022-09-28 13:34:35 +08:00
Brandon Mak
a2311a473e
Auto stash before merge of "SP3-1-Rendering" and "origin/SP3-1-Rendering"
2022-09-28 10:29:42 +08:00
Xiao Qi
d5cc923413
Hard coded to always load racoon mesh instead of bag
2022-09-27 22:37:49 +08:00
mushgunAX
1813ad138c
FRC changed
2022-09-27 22:05:59 +08:00
Kah Wei
d71fbc22de
Merge branch 'SP3-1-Rendering' of https://github.com/SHADE-DP/SHADE_Y3 into SP3-1-Rendering
...
# Conflicts:
# TempShaderFolder/TestCubeFs.glsl
# TempShaderFolder/TestCubeFs.spv
2022-09-27 21:07:55 +08:00