Commit Graph

415 Commits

Author SHA1 Message Date
Glence efcca56c99 WIP foir silhouette, renamed scene files and fix breakable bug 2023-02-27 00:41:25 +08:00
Glence 027a2c490b Added elapsedTime and shiny Highlight along with Level 3 asset and scene 2023-02-25 21:56:49 +08:00
Glence acc548678e Merge branch 'main' into PlayerController 2023-02-24 21:10:10 +08:00
Glence dfbd1d027c Merge branch 'main' into PlayerController 2023-02-24 18:04:26 +08:00
XiaoQiDigipen d85382a06d
Merge pull request #363 from SHADE-DP/SP3-1-Rendering
Implemented scanline and silhouette effect
2023-02-24 17:20:45 +08:00
Brandon Mak 18f6720055 Merge branch 'main' into SP3-1-Rendering 2023-02-24 17:18:40 +08:00
maverickdgg 6045214b13 Camera width to resize with view port 2023-02-24 15:35:02 +08:00
Brandon Mak 7eac238226 Accounted for subpass input descriptors
Silhouette shader is working
2023-02-24 11:47:58 +08:00
Brandon Mak 6faa4e676b Updated shader for scanline (needs refining)
Shader hot reloading is working
2023-02-24 08:27:04 +08:00
Glence 86b662c7dc Merge branch 'main' into PlayerController 2023-02-23 19:45:38 +08:00
maverickdgg c4db16bb95 Merge branch 'main' into SP3-20-UI-System 2023-02-23 13:44:12 +08:00
maverickdgg 69f2e678df re-enabled scene change and disabled debug logs 2023-02-23 13:42:22 +08:00
maverickdgg 1b865b129b Added finalizeChanges call and debug logs for hover enter 2023-02-23 12:50:42 +08:00
Brandon Mak f7bb8606be Shader, text, asset manager events and generic data desc sets
- Made shader for shiniy effect (half done)
- Text objects in scene now use a UI component for better scaling
- Asset manager now creates an event for compilation of assets
- Descriptor for generic data is implemented
2023-02-22 16:39:21 +08:00
Glence 8d10c48645 Bug fixes and WIP for alpha 2023-02-21 19:31:50 +08:00
XiaoQiDigipen 269d5ffc15
Merge pull request #356 from SHADE-DP/SP3-20-UI-System
Added 3 button event. Changed hovered and clicked boolean to be stored in UIComponent instead. Fixed Canvas Scaling matrix.
2023-02-21 15:49:27 +08:00
maverickdgg a3112f9c60 Fixed Canvas Scaler to keep AR of the UI Elements 2023-02-21 10:48:07 +08:00
maverickdgg febe22e487 Added new button events 2023-02-21 09:52:23 +08:00
Glence d7725f4e26 Pause is done 2023-02-21 00:47:20 +08:00
Glence 09d88b5a70 small bug fixes for text and serialization and added game pause 2023-02-20 19:53:22 +08:00
Glence f2e9d3b349 Merge branch 'main' into PlayerController 2023-02-20 19:07:56 +08:00
Brandon Mak 7b500d0cac Merge branch 'main' into SP3-1-Rendering 2023-02-20 14:28:54 +08:00
Glence dfe4d047e9 added a jumppad to the game 2023-02-18 22:21:23 +08:00
Kah Wei 916a7315da Merge branch 'main' into SP3-6-CSharpStaticReset 2023-02-18 12:24:17 +08:00
Brandon Mak f1217cc20b Trajectory Rendering WIP
- Trajectory rendering system is all in place. Just requires testing through the component. 
- Component needs to be reflected in editor
- Shaders for trajectory rendering is also in place
2023-02-17 13:48:14 +08:00
Brandon Mak cee45863fa Trajectory rendering WIP 2023-02-17 00:53:45 +08:00
Brandon Mak 5acca02363 Implemented different shadow mapping technique 2023-02-15 21:34:22 +08:00
Glence 670ddee65a Added rayheight for pickandthrow 2023-02-04 16:02:59 +08:00
Glence a97dfe7049 remove watermelon debug 2023-02-04 15:56:37 +08:00
Diren D Bharwani ccd1d883d9 Merge remote-tracking branch 'origin/main' into SP3-2-Physics 2023-02-04 15:18:22 +08:00
Diren D Bharwani c0249531d3 Potential fix to physics collision states being incorrect 2023-02-04 15:18:15 +08:00
Glence a594df5a4d added physics fix and raycast change
called clear container in physicsSystem
move raycast of player higher
2023-02-04 15:17:58 +08:00
Diren D Bharwani 7cf5ef4b81 Solved merge conflicts from main 2023-02-04 14:21:40 +08:00
Glence a4ceffcfad Small changes for publish build
Level1 ai fix
Ai speed fix
item vel reset back when return
player hard set rotation
can go to nesxt scene correctly now
scoring now checks for trigger
2023-02-04 14:11:16 +08:00
Sri Sham Haran e41c161202 Adjusted lighting a bit cuz it looked janky at one portion
Hide and clip mouse cursor for builds without editor (only when window is active)
2023-02-04 11:21:25 +08:00
mushgunAX d1bad74791 Merge branch 'main' into AudioImplementation 2023-02-04 02:45:09 +08:00
Glence d1ae9b3756 Fix camera arm and win scene issue 2023-02-04 02:42:30 +08:00
XiaoQiDigipen f617a1a984
Merge pull request #345 from SHADE-DP/SP3-141-Camera-System
Camera Collision fix. Still have some minor bugs
2023-02-04 02:39:55 +08:00
Xiao Qi 1f7f86dd01 Merge remote-tracking branch 'origin/main' into main 2023-02-04 02:39:37 +08:00
Xiao Qi 33807de93d Pushed scene change and animator component bug fix for models without rigs 2023-02-04 02:32:35 +08:00
maverickdgg c5296db6f6 Camera Collision fix 2023-02-04 02:20:42 +08:00
mushgunAX 6e8b2bc460 Merge branch 'main' into AudioImplementation 2023-02-04 02:11:41 +08:00
maverickdgg 5b6217f923 Merge branch 'main' into SP3-141-Camera-System 2023-02-04 02:10:16 +08:00
maverickdgg 94fe055aa9 fixed collision 2023-02-04 02:10:08 +08:00
Glence 0c455c55f6 correct collision tag issue and fix player controller keypress 2023-02-04 02:05:32 +08:00
mushgunAX 1866d4ba40 SFX for item scoring 2023-02-04 01:45:34 +08:00
mushgunAX a7238c6eba Merge branch 'main' into AudioImplementation 2023-02-04 01:45:09 +08:00
mushgunAX 23f7812a70 Fix StopAllSounds 2023-02-04 01:44:00 +08:00
maverickdgg 44e28f0d3f Merge branch 'main' into SP3-141-Camera-System 2023-02-04 01:20:45 +08:00
Glence 9d73806573 Merge branch 'main' into PlayerController 2023-02-04 01:11:56 +08:00