Commit Graph

51 Commits

Author SHA1 Message Date
Glence 82fd4e2149 dont ask me 2023-03-25 15:52:22 +08:00
Glence ff6a49e0a7 dont ask me 2023-03-24 20:30:01 +08:00
maverickdgg cb791b6390 Merge branch 'main' into SP3-20-UI-System 2023-03-21 14:41:14 +08:00
Xiao Qi c73209ef62 Imported new homeowner texture
Replaced homeowner gltf file and recompiled
2023-03-21 14:29:13 +08:00
maverickdgg 221e6bde85 Textures update 2023-03-20 15:55:50 +08:00
Xiao Qi ea3b851ed0 Merge branch 'main' into SP3-13-Assets-Manager 2023-03-07 23:01:21 +08:00
Xiao Qi 5e6b68915b Working Animations 2023-03-07 01:25:32 +08:00
Glence 7a577ecd6b Merge branch 'main' into PlayerController 2023-03-05 14:42:31 +08:00
maverickdgg f10293e2d2 Fixed button sounds 2023-03-05 10:47:16 +08:00
Glence cc81eed630 Merge branch 'main' into PlayerController 2023-03-04 23:42:20 +08:00
Xiao Qi 56693565f4 WIP Load and test animations 2023-03-04 00:43:31 +08:00
Glence 27b00a6c4a end cutscene done 2023-03-03 14:28:10 +08:00
mushgunAX 802924141a Scene Fade In and Out Fixes 2023-03-02 15:47:00 +08:00
maverickdgg 30923389ae Merge branch 'main' into SP3-20-UI-System 2023-03-02 10:23:09 +08:00
maverickdgg e0ee2a8079 Gameplay UI progress 2023-03-02 09:55:41 +08:00
maverickdgg 9dd01f5fa1 Replaced How to play screen and credits placeholder 2023-03-02 03:01:24 +08:00
maverickdgg e4345d4937 Changed all button textures and update win and lose screen to use buttonFX 2023-03-02 02:30:59 +08:00
mushgunAX a65735e0b3 progress 2023-03-01 16:37:33 +08:00
mushgunAX 17a7db8a91 Merge branch 'main' into scenetransitions 2023-03-01 12:51:43 +08:00
Glence 0bdab3b079 WIP for steal food pop up 2023-02-28 18:35:43 +08:00
Glence 52ba54a82a Fix ShinyHighlight issue and updated level 3 2023-02-28 15:42:28 +08:00
mushgunAX d563247ec2 Merge branch 'main' into scenetransitions 2023-02-28 06:49:55 +08:00
Glence 79cb0f12ae WIP for Alpha, added material name in editor WIP for cutscene 2023-02-27 18:09:05 +08:00
mushgunAX c328672286 black shader 2023-02-27 16:22:54 +08:00
Glence 75295b5d6e Merge branch 'main' into PlayerController 2023-02-27 15:58:37 +08:00
Glence c912dd2e4b WIP for cutscene and added test for KW 2023-02-27 15:33:58 +08:00
maverickdgg 08e4db134a Tweaked main menu UI 2023-02-27 15:16:48 +08:00
maverickdgg eb7c0e749e Added a slider_textured fs 2023-02-27 09:59:58 +08:00
maverickdgg 949ade5775 Options Layout done 2023-02-27 09:55:54 +08:00
maverickdgg f23853c85c Main Menu Canvas Layout with button FX and scalebounce 2023-02-27 07:32:26 +08:00
maverickdgg eb3d8b6b8b Slider done, Slider Shader bugged 2023-02-27 05:42:54 +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
Brandon Mak 7eac238226 Accounted for subpass input descriptors
Silhouette shader is working
2023-02-24 11:47:58 +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
maverickdgg a6290d9c8f Added texture, modifiable material fix 2023-02-03 20:12:48 +08:00
Brandon Mak 109f35f297 Merge remote-tracking branch 'origin/main' into SP3-1-Rendering 2023-01-31 19:02:11 +08:00
Brandon Mak e9452093f0 Fixed UI 2023-01-31 15:17:40 +08:00
Xiao Qi 6872bae151 Updated compiled shmodel file for racoon with fixed rig node order and build format
Fixed bug when building histogram for vertex weights
2023-01-18 04:00:48 +08:00
Kah Wei d1a41ea194 Fixed raccoon not rendering for animated material 2023-01-13 20:33:25 +08:00
Kah Wei 19ba71e51c Added animated raccoon material and deleted unused skinned vertex shader 2023-01-09 17:05:10 +08:00
Glence 5356cd0800 added item model and setting the main game scene 2022-11-23 13:44:03 +08:00
Glence 4cacbb3300 adding main/lose/win scene 2022-11-23 00:44:27 +08:00
Glence 71e8ba6044 doing up the main menu 2022-11-22 16:18:16 +08:00
Glence 219d5025f3 adding in the env and world 2022-11-22 14:14:55 +08:00
Brandon Mak 798803cf81 UI WIP 2022-11-18 22:03:21 +08:00
Sri Sham Haran ab17d57756 Asset browser now recurses down subassets 2022-11-04 23:32:29 +08:00
Sri Sham Haran b30da7e495 Fixes 2022-11-04 19:16:32 +08:00
Sri Sham Haran 4ee0294977 Scene loads correctly now 2022-11-04 14:44:18 +08:00