4eef6143dc
base for pick and throw
2022-11-02 00:25:43 +08:00
07bfb2f485
Merge remote-tracking branch 'origin/main' into SP3-16-Math
2022-11-02 00:22:36 +08:00
97a39d62c6
player controller done for now
2022-11-01 23:28:31 +08:00
dd0d336ccb
Merge branch 'main' into PlayerController
2022-11-01 22:03:52 +08:00
dc8ed48be3
Fixed debug draw system cube rendering
2022-11-01 21:49:57 +08:00
129f92e4b6
mat inspector properties handling (WIP)
2022-11-01 21:49:42 +08:00
904d6be6b0
Merge branch 'main' into SP3-1-DebugDraw2
...
# Conflicts:
# SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsSystem.cpp
# SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsSystem.h
2022-11-01 21:00:55 +08:00
e2778da955
WIP Rewrite flow from compiling to loading to recognising assets
2022-11-01 20:54:51 +08:00
0096bc4975
Debug Draw fixes
2022-11-01 20:32:35 +08:00
674b4d5155
Fixed extra # appearing on all names of script variables
2022-11-01 20:29:03 +08:00
b0d08d27fd
SSAO is fully implemented
2022-11-01 20:10:59 +08:00
5fe81932e1
Merge pull request #158 from SHADE-DP/SP3-12-SceneGraph
...
SP3-12 Hierarchy Interface for C#
UPDATES
Setting & Getting of Parent has been moved from Transform to GameObject
2022-11-01 19:03:16 +08:00
26591e8c24
material inspector
2022-11-01 19:03:08 +08:00
72dc07bbd9
Shifted Hierarchy interface from Transform to GameObject
2022-11-01 19:00:31 +08:00
40be8a7962
Merge branch 'main' into SP3-12-SceneGraph
2022-11-01 19:00:12 +08:00
04f6e54007
Merge branch 'main' into PlayerController
2022-11-01 17:50:53 +08:00
e397d180dd
jumping almost there
2022-11-01 17:49:01 +08:00
ff74c090d5
Merge pull request #157 from SHADE-DP/SP3-6-c-scripting
...
GameObjects on scripts can now be edited in the inspector and are serialized
Also credit to @srishamharan for fix to SHHierarchyPanel's drag and drop
2022-11-01 17:26:26 +08:00
8afe8c1a79
GameObjects on scripts can now be edited in the inspector and are serialized
2022-11-01 17:24:20 +08:00
1f7abc7a96
Merge pull request #156 from SHADE-DP/SP3-141-Camera-System
...
Sp3 141 camera system
Added C# interface for Camera and Camera Arm
Added Time.DeltaTimeF and Input.GetMouseVelocity to C# interface
Added ThirdPersonCamera and Camera Control scripts
Added a GetForward function to Camera C# interface. This gets the forward of the last calculated view Matrix.
2022-11-01 16:06:37 +08:00
eb54b49a5e
Merge branch 'main' into SP3-141-Camera-System
2022-11-01 15:50:45 +08:00
39910afa54
Added GetForward to Camera C# interface.
...
GetForward gets the forward according to Camera's last calculated view matrix
2022-11-01 15:49:15 +08:00
294e61a549
Merge pull request #153 from SHADE-DP/SP3-2-Physics
...
SP3-2 Reworked Physics Component Removal, Added Editor State Change events
NEW
Events for editor state change added:
SH_EDITOR_ON_PLAY_EVENT,
SH_EDITOR_ON_PAUSE_EVENT,
SH_EDITOR_ON_STOP_EVENT
BUGFIX
Reworked physics component removal to match ECS update
2022-11-01 15:36:34 +08:00
a45432ef66
Merge conflict
2022-11-01 15:35:50 +08:00
e8553b6181
Merge pull request #152 from SHADE-DP/SP3-6-c-scripting
...
Added EntityID retrieval from GameObject and compiled docs for Intellisense in C# projects
2022-11-01 15:35:46 +08:00
f0c90ceb37
Merge pull request #151 from SHADE-DP/Fix-SetMesh
...
Fix SetMesh(), SHResourceManager and BatcherDispatcher issues that blocked mesh switching
2022-11-01 15:35:04 +08:00
e0dcf9e13e
Added Editor State Change events
2022-11-01 15:32:01 +08:00
d917159f67
Merge branch 'main' into SP3-141-Camera-System
2022-11-01 15:31:11 +08:00
f919d95c0b
Added C# interface for Camera and Camera Arm. Added some test scripts
2022-11-01 15:30:13 +08:00
00ee8a4641
Added compiled documentation for C# interfaces
2022-11-01 15:29:12 +08:00
69e625014d
Added EntityID retrieval from GameObject
2022-11-01 15:25:19 +08:00
4dcd60f239
Added rotation offsets to colliders
2022-11-01 15:10:47 +08:00
0bd8cf5569
Merge branch 'main' into PlayerController
2022-11-01 14:58:05 +08:00
d7429c4627
Merge branch 'main' into Fix-SetMesh
2022-11-01 14:56:16 +08:00
e1587c7252
Fixed SetMesh() not working and loading of mesh and textures
2022-11-01 14:56:03 +08:00
35771a619a
Adjusted for new component removal method
2022-11-01 14:46:56 +08:00
8139cc78b2
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-11-01 14:32:48 +08:00
2f94002561
Merge pull request #150 from SHADE-DP/SP3-5-ECS
...
Sp3 5 ecs
Removed Component event now runs after the component has been removed from the sparse set
2022-11-01 14:24:05 +08:00
43604066b2
Merge branch 'main' into SP3-5-ECS
2022-11-01 14:22:20 +08:00
d5cadfe8ed
Removed Component event now runs after the component has been removed from the sparse set
2022-11-01 14:21:43 +08:00
d82bc8833f
Camera C# interface
2022-11-01 14:20:03 +08:00
56f2ac3f7f
Merge pull request #149 from SHADE-DP/SP3-2-Physics
...
SP3-2 More Physics Bugfixes
BUGFIXES
My change got overriden somehow. Fixed bug where collisions are reported in the correct state
2022-11-01 14:10:39 +08:00
68be65f341
Fixed bug where collisions were reported in the wrong state
2022-11-01 14:08:47 +08:00
450970579a
Merge branch 'main' into Fix-SetMesh
2022-11-01 13:38:34 +08:00
c4ed57fea8
sprinting works now
2022-11-01 13:24:14 +08:00
78545889da
SHSHSHAO
2022-11-01 12:47:50 +08:00
53fc1fce95
WIP
2022-11-01 12:10:15 +08:00
2466ef00f3
Merge branch 'main' into SP3-10-input-management
2022-11-01 12:09:59 +08:00
b0054d62c6
Create AIPrototype.cs
2022-11-01 12:09:50 +08:00
5852c409e6
SSAO WIP
2022-11-01 11:57:08 +08:00
Glence