xiaoqi
/
SHADE_Y3
1
0
Fork 0
Code Issues 12 Pull Requests Packages Projects Releases 9 Wiki Activity
2,626 Commits 81 Branches 9 Tags 86 MiB
Commit Graph

2626 Commits

Author SHA1 Message Date
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
mushgunAX bc87fa3ae0 Merge branch 'main' into SP3-10-input-management 2023-02-22 15:16:05 +08:00
mushgunAX 0e572d7f89 progress 2023-02-22 15:15:38 +08:00
XiaoQiDigipen 5d025b0f9e
Merge pull request #357 from SHADE-DP/SP3-6-c-scripting 
Added SharedMaterial for Renderable
 2023-02-22 14:53:47 +08:00
Sri Sham Haran fbd0035ade Merge branch 'main' into SP3-4-Editor 2023-02-21 22:17:20 +08:00
maverickdgg 06ad2a4c0c moved the UI routines 2023-02-21 21:20:31 +08:00
Glence 8d10c48645 Bug fixes and WIP for alpha 2023-02-21 19:31:50 +08:00
Kah Wei 9a7c0d0bf6 Added SharedMaterial for Renderable 2023-02-21 17:30:43 +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
XiaoQiDigipen ded5a87cf4
Merge pull request #354 from SHADE-DP/PlayerController 
Bug fixes for textrenderable and sterilization, added base for game pause
 2023-02-21 15:49:09 +08:00
maverickdgg 6b6bbc6ac5 Camera AR now stored in system instead of camera component. 2023-02-21 11:37:09 +08:00
Brandon Mak 49692e5c37 Text Rendering now checks for UI Component 2023-02-21 11:16:44 +08:00
maverickdgg a3112f9c60 Fixed Canvas Scaler to keep AR of the UI Elements 2023-02-21 10:48:07 +08:00
maverickdgg 51909071e6 Change isHovered and isClicked to be stored in UIComponent instead and made a helper function to check for clicks and hovered 2023-02-21 10:09:58 +08:00
mushgunAX 9cc318cf27 Merge branch 'main' into SP3-10-input-management 2023-02-21 09:55:28 +08:00
mushgunAX fe64844c4e Mouse Centering 2023-02-21 09:55:14 +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
Kah Wei c85298db88 Added initial stubs for SHAnimationController 2023-02-20 16:55:08 +08:00
Brandon Mak f2101243e7 Merge branch 'main' into SP3-1-Rendering 2023-02-20 15:47:13 +08:00
XiaoQiDigipen 098e373318
Merge pull request #353 from SHADE-DP/SP3-141-Camera-System 
Adjust AR for game camera. Expose FOV to inspector
 2023-02-20 14:54:04 +08:00
maverickdgg c9e9a30c3f Exposed FOV to editor. Adjust AR for game camera 2023-02-20 14:52:01 +08:00
maverickdgg 33a6fac7c9 Merge branch 'main' into SP3-141-Camera-System 2023-02-20 14:39:14 +08:00
maverickdgg debdba183e removed some debug code 2023-02-20 14:39:10 +08:00
XiaoQiDigipen f4a6810fd9
Merge pull request #352 from SHADE-DP/SP3-1-Rendering 
Implemented improved shadows (still abit whack), trajectory system (untested), and window resize event
 2023-02-20 14:35:25 +08:00
Brandon Mak 7b500d0cac Merge branch 'main' into SP3-1-Rendering 2023-02-20 14:28:54 +08:00
Brandon Mak 15df08ef67 Implemented events for screen resize 2023-02-20 14:28:23 +08:00
XiaoQiDigipen 17a84bb2c8
Merge pull request #351 from SHADE-DP/SP3-6-CSharpStaticReset 
Static variables in scripts are now reset when leaving play mode
 2023-02-20 11:12:09 +08:00
Glence d754a0b5c3 added targetOffSet to camera position 2023-02-18 23:43:43 +08:00
Glence dfe4d047e9 added a jumppad to the game 2023-02-18 22:21:23 +08:00
Kah Wei 7d7ffc56fd Disabled script undo and redo temporarily 2023-02-18 12:35:47 +08:00
Kah Wei 916a7315da Merge branch 'main' into SP3-6-CSharpStaticReset 2023-02-18 12:24:17 +08:00
Brandon Mak 19d81b80f6 Base files for particles 2023-02-17 18:29:44 +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
Brandon Mak 3a28873496 Merge branch 'main' into SP3-1-Rendering 2023-02-15 12:56:17 +08:00
Xiao Qi 7afbc33861 Uncommented line to hide console in publish 2023-02-06 15:58:57 +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
XiaoQiDigipen e07a741c11
Merge pull request #350 from SHADE-DP/SP3-2-Physics 
Potential fix for incorrect collision states
 2023-02-04 15:20:14 +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
Diren D Bharwani 385b34fea4 Merge remote-tracking branch 'origin/main' into SP3-2-Physics 2023-02-04 14:20:25 +08:00
XiaoQiDigipen f2602207aa
Merge pull request #349 from SHADE-DP/PlayerController 
Small changes for publish build
 2023-02-04 14:12:08 +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