Commit Graph

1518 Commits

Author SHA1 Message Date
Glence 293cc586d1 aiming is done in player 2022-11-21 00:12:09 +08:00
Glence 8107c92754 Merge branch 'main' into PlayerController 2022-11-20 16:53:12 +08:00
Glence 875657cfde added playerstate scripts
added sub folders for player
remove unneeded scripts
2022-11-20 16:27:39 +08:00
XiaoQiDigipen 788ba22e0a
Merge pull request #232 from SHADE-DP/UI_Integration
Added UI functionality to the Graphics System
2022-11-20 15:43:34 +08:00
XiaoQiDigipen a355d9911a
Merge pull request #231 from SHADE-DP/SP3-4-Editor
Fix not being able to disable/enable Rigidbody freeze rotation through editor inspector panel
2022-11-20 15:36:02 +08:00
XiaoQiDigipen 2a74690e16
Merge pull request #230 from SHADE-DP/SP3-1-VertexSwitch
Vertex shader can now be modified in the material inspector
2022-11-20 15:33:55 +08:00
Sri Sham Haran 2b41394a74 Fix not being able to disable/enable Rigidbody freeze rotation through editor inspector panel 2022-11-20 15:30:14 +08:00
Brandon Mak c566d065c8 Merge remote-tracking branch 'origin/UI_Integration' into UI_Integration 2022-11-20 01:45:27 +08:00
Brandon Mak 575132c4bb Added UI Component check in SHBatch
- UI Component shader changes
- Fixed picking issue
2022-11-20 01:45:14 +08:00
Brandon Mak 6bb27414e2 Added UI Component check in SHBatch
- UI Component shader changes
2022-11-20 01:38:26 +08:00
Brandon Mak b323735ba8 Merge remote-tracking branch 'origin/SP3-1-VertexSwitch' into UI_Integration 2022-11-19 23:27:06 +08:00
Kah Wei a988c45d52 Vertex shader can now be modified in the material inspector 2022-11-19 23:22:54 +08:00
Brandon Mak d55adcdfe4 Merge remote-tracking branch 'origin/main' into UI_Integration 2022-11-19 22:08:16 +08:00
Brandon Mak 6d1f30e05b Merge branch 'SP3-1-Rendering' into UI_Integration 2022-11-19 21:45:21 +08:00
Brandon Mak 223276dd87 Created partial functionality to render a texture to swapchain image 2022-11-19 21:44:41 +08:00
XiaoQiDigipen 61acbdc34e
Merge pull request #229 from SHADE-DP/Fix-BatchCrash
Re-aded ability to change shaders
2022-11-19 18:49:48 +08:00
Kah Wei 92b1c6676b Merge branch 'main' into Fix-BatchCrash 2022-11-19 18:26:37 +08:00
Kah Wei b2dc440d03 Fixed bug where moving objects stopped moving after chanigng their material's shader 2022-11-19 18:26:11 +08:00
Kah Wei 58e6a3c4c2 Re-aded ability to change shaders
Bugged, replacing shaders results in object being rendered in the old position
2022-11-19 17:30:48 +08:00
XiaoQiDigipen bd3b643c19
Merge pull request #228 from SHADE-DP/Fix-BatchCrash
Fixed crash caused when loading more than one graphics pipeline
2022-11-19 16:26:37 +08:00
XiaoQiDigipen 06e8ee6b2d
Merge pull request #227 from SHADE-DP/SP3-6-c-scripting
Fixed premake bug where project configuration tag was missing for SHADE_CSharp
2022-11-19 16:25:32 +08:00
XiaoQiDigipen 51d663ab14
Merge pull request #226 from SHADE-DP/SP3-2-Physics
Added in Raycasting through Physics
2022-11-19 16:24:50 +08:00
XiaoQiDigipen 8753bc14a6
Merge pull request #225 from SHADE-DP/SP3-1-RenderOnlyActive
Renderables now no longer render if disabled
2022-11-19 16:24:22 +08:00
Kah Wei f3a44d2ead Fixed crash caused when loading more than one graphics pipeline 2022-11-19 16:11:07 +08:00
Kah Wei daa6247bff Fixed premake bug where project configuration tag was missing 2022-11-19 15:03:49 +08:00
Diren D Bharwani 6ad05d306f Merge remote-tracking branch 'origin/main' into SP3-2-Physics 2022-11-19 04:21:58 +08:00
Diren D Bharwani 411c4a4e56 Added C# Interface for Raycasting
Untested with Scripts, tested engine side.
2022-11-19 04:21:46 +08:00
Brandon Mak 798803cf81 UI WIP 2022-11-18 22:03:21 +08:00
Kah Wei 27413c380e Renderables now no longer render if disabled 2022-11-18 21:59:18 +08:00
Kah Wei 5ec8475842 Merge branch 'main' into SP3-1-RenderOnlyActive 2022-11-18 21:34:28 +08:00
XiaoQiDigipen fa05d8d719
Merge pull request #224 from SHADE-DP/PlayerController
Update changes to scripts and AudioSystem
2022-11-18 19:01:24 +08:00
Diren D Bharwani a4e5a1c269 Merge remote-tracking branch 'origin/main' into SP3-2-Physics 2022-11-18 18:31:38 +08:00
Diren D Bharwani 6b5b0387a9 Fixed bug where pausing then playing crashes physics 2022-11-18 18:31:07 +08:00
Diren D Bharwani b328d1df82 Added Physics Raycasts with Debug Drawing
Press F11 while the scene is playing to toggle debug drawing of rays.
2022-11-18 18:15:19 +08:00
Glence a77740db51 Merge branch 'main' into PlayerController 2022-11-18 17:16:04 +08:00
Glence 0551b1fb8a added the new banks
added onplay/onpause/onstop for audiosytem
2022-11-18 17:04:06 +08:00
Brandon Mak 09249cf9e8 Merge remote-tracking branch 'origin/main' into SP3-1-Rendering 2022-11-18 16:48:09 +08:00
XiaoQiDigipen 9ada09dec1
Merge pull request #223 from SHADE-DP/SP3-20-UI-System
Added UI and Canvas to editor
2022-11-18 16:39:46 +08:00
maverickdgg e5b9192044 Merge branch 'main' into SP3-20-UI-System 2022-11-18 16:37:41 +08:00
maverickdgg a181d7b896 Added Canvas and UI to editor 2022-11-18 16:37:33 +08:00
Brandon Mak 03ce142137 Merge remote-tracking branch 'origin/main' into SP3-1-Rendering 2022-11-18 16:37:06 +08:00
Brandon Mak b5f37195a9 Merge branch 'FontIntegration' into SP3-1-Rendering 2022-11-18 16:36:10 +08:00
Brandon Mak 66f33554a3 Tested adding text component to entities 2022-11-18 16:35:49 +08:00
XiaoQiDigipen 8f513de9c3
Merge pull request #222 from SHADE-DP/SP3-20-UI-System
Implemented Canvas and UI Component
2022-11-18 12:29:40 +08:00
maverickdgg 36a1a1c696 Merge branch 'main' into SP3-20-UI-System 2022-11-18 12:24:24 +08:00
XiaoQiDigipen 84dc63d6d3
Merge pull request #221 from SHADE-DP/SP3-141-Camera-System
Separated Ortho and perspective matrices in camera
2022-11-18 12:24:19 +08:00
maverickdgg 0b5ec34b00 Merge branch 'main' into SP3-141-Camera-System 2022-11-18 09:38:52 +08:00
maverickdgg 9ac1c01008 Merge branch 'main' into SP3-20-UI-System 2022-11-18 09:38:42 +08:00
maverickdgg d997cd4da6 Added canvas ID to UI Component 2022-11-18 09:38:31 +08:00
XiaoQiDigipen c493432f3f
Merge pull request #219 from SHADE-DP/SP3-6-c-scripting
Scripts are now always built on engine launch
2022-11-17 17:38:17 +08:00