Commit Graph

260 Commits

Author SHA1 Message Date
maverickdgg 184155bec1 Merge branch 'main' into SP3-20-UI-System 2023-03-10 19:40:33 +08:00
maverickdgg 715e136b29 Merge branch 'main' into SP3-20-UI-System 2023-03-10 19:32:17 +08:00
maverickdgg d5b50e7de3 Added a scale bounce effect for score and added offset adjustment for score 2023-03-10 19:31:23 +08:00
SHAM-DP f32903f87d Merge branch 'main' into AudioImpl 2023-03-10 19:15:12 +08:00
XiaoQiDigipen 062c11afa0
Merge pull request #418 from SHADE-DP/SP3-22-AnimationController
Added Animator events and fixed Animator pause bug
2023-03-10 19:07:36 +08:00
SHAM-DP 8602a60feb Added cinematic audio 2023-03-10 19:07:10 +08:00
maverickdgg 56cda49ea7 Merge branch 'main' into SP3-20-UI-System 2023-03-10 19:01:20 +08:00
maverickdgg 82a20e49f7 updated buttons 2023-03-10 19:00:58 +08:00
Kah Wei e531a087f6 Added events for play, pause and finished animations 2023-03-10 18:53:40 +08:00
SHAM-DP 3ef6fef289 fix for options slider 2023-03-10 18:07:40 +08:00
SHAM-DP 9a39e52939 Merge branch 'main' into AudioImpl 2023-03-10 17:46:09 +08:00
Glence 3f4674e38f minor fix 2023-03-10 17:25:41 +08:00
Glence a3318d500d change old audio code 2023-03-10 17:21:49 +08:00
Glence 9b9cf1a1bb WIP for animatons 2023-03-10 16:26:52 +08:00
Glence 2cf67a1378 Merge branch 'main' into PlayerController 2023-03-10 14:59:47 +08:00
Kah Wei 8c0ad47921 Added timescale for animation system 2023-03-10 14:55:49 +08:00
Kah Wei 089eb9de26 Fixed bug where C# Asset implicit bool conversion operators were internal 2023-03-10 14:11:59 +08:00
Glence 57d1adb292 animation for raccoon WIP 2023-03-10 00:16:38 +08:00
Glence 2eee1d4ab7 camera offset rotation fix along with ai not hard hard for box collider 2023-03-09 18:47:06 +08:00
Glence ec91bdb687 Merge branch 'main' into PlayerController 2023-03-09 18:38:08 +08:00
Kah Wei 7f170deb27 Fixed animations not playing from the correct start point 2023-03-09 15:46:15 +08:00
Kah Wei bfbca68d50 Added more animation tests 2023-03-09 15:14:30 +08:00
SHAM-DP 6dd503daad updated audio assets, fix scale for sfx & bgm sliders 2023-03-09 14:12:17 +08:00
Kah Wei 5669babc0f Fixed animator components in scripts not being retrievable. Also added script for testing animations 2023-03-09 13:35:49 +08:00
Glence 66026ff926 jumppad done 2023-03-09 00:33:36 +08:00
Glence 10555f646c base for jumppad 2023-03-08 18:49:36 +08:00
Glence 87f7b42ec3 made raccoon use capsule, setting for fov done 2023-03-08 17:00:43 +08:00
Glence 6854c41614 setting up volume 2023-03-08 16:22:05 +08:00
maverickdgg e42a5c68f3 Settings 2023-03-07 10:08:30 +08:00
Glence 8d6ef16625 Hot fix
Pause menu fix
Offing gameplay UI on preview level
clipping of mouse
change some keydown to keyup
2023-03-05 23:48:25 +08:00
Glence c118ec136f Call centering of mouse at the correct place and default DT on awake 2023-03-05 21:23:41 +08:00
Glence 9f57ed1ef1 small scene changes and reenable mouse centering and hiding 2023-03-05 21:11:24 +08:00
Glence bf5472e2c6 stuff dont ask me 2023-03-05 15:35:57 +08:00
Glence 3778ded1be Merge branch 'main' into PlayerController 2023-03-05 14:49:46 +08:00
Glence 7a577ecd6b Merge branch 'main' into PlayerController 2023-03-05 14:42:31 +08:00
maverickdgg f52e5a1394 Changed pause menu to use onRelease instead of onClick 2023-03-05 14:01:30 +08:00
maverickdgg 4bc568899d Fix Button click state not resetting if the release event happen when button is inactive 2023-03-05 13:55:51 +08:00
maverickdgg f10293e2d2 Fixed button sounds 2023-03-05 10:47:16 +08:00
Glence 3f960509f1 scene changes 2023-03-05 02:51:11 +08:00
Glence cc81eed630 Merge branch 'main' into PlayerController 2023-03-04 23:42:20 +08:00
maverickdgg f3908d3afb Merge branch 'main' into SP3-20-UI-System 2023-03-04 13:09:06 +08:00
XiaoQiDigipen 6cf8f03ff1
Merge branch 'main' into AIFixes 2023-03-04 12:50:13 +08:00
XiaoQiDigipen 90c9a0a959
Merge branch 'main' into AudioImplementation 2023-03-04 12:46:59 +08:00
maverickdgg 0a8f90ae80 Added Gameplay Canvas for Level 1 2023-03-04 12:44:58 +08:00
mushgunAX dc54ae92a2 AI gets sent to a waypoint of choice when caught 2023-03-04 04:57:59 +08:00
maverickdgg 3a60eee32f merged 2023-03-04 03:17:20 +08:00
maverickdgg 6d1e179baf UI doine 2023-03-04 02:46:56 +08:00
mushgunAX a5fe4bf0a0 New SFX and (supposedly) spatial SFX 2023-03-04 00:19:35 +08:00
XiaoQiDigipen 421016f4fc
Merge pull request #385 from SHADE-DP/SP3-129-AudioSystem
Add Set audio param with label functionality
2023-03-03 18:30:17 +08:00
SHAM-DP dfc2a68dde Add Set audio param with label functionality 2023-03-03 18:13:35 +08:00
Glence 27b00a6c4a end cutscene done 2023-03-03 14:28:10 +08:00
mushgunAX f7c33bc89a Various null checks 2023-03-03 14:26:36 +08:00
Glence 81da3e501d fix minor preview level bug 2023-03-03 00:40:16 +08:00
mushgunAX 7763a969b2 Merge branch 'main' into SP3-10-input-management 2023-03-02 22:55:29 +08:00
maverickdgg 0984eee6bb Gameplay UI WIP 2023-03-02 17:34:11 +08:00
Glence 8c74ec85d3 Done with level preview 2023-03-02 17:33:02 +08:00
mushgunAX 802924141a Scene Fade In and Out Fixes 2023-03-02 15:47:00 +08:00
mushgunAX 1e734b6006 Merge branch 'main' into SP3-10-input-management 2023-03-02 13:31:13 +08:00
Glence 2834414115 Merge branch 'main' into PlayerController 2023-03-02 13:05:28 +08:00
maverickdgg 381fe476be Game UI WIP 2023-03-02 11:33:21 +08:00
maverickdgg 30923389ae Merge branch 'main' into SP3-20-UI-System 2023-03-02 10:23:09 +08:00
SHAM-DP 4131c58c08 Modified calls to IsCursorVisible 2023-03-02 10:01:52 +08:00
maverickdgg e0ee2a8079 Gameplay UI progress 2023-03-02 09:55:41 +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
Glence 2af19baccd Added the transition back to the scene 2023-03-02 00:02:18 +08:00
Glence b2c702c780 Merge branch 'main' into PlayerController 2023-03-02 00:01:34 +08:00
mushgunAX a04eee0a2f mouse centering and visibility when appropriate 2023-03-01 23:56:40 +08:00
Glence 403df62a0b cleaning up scenes and WIP for previewlevel camera 2023-03-01 18:05:42 +08:00
mushgunAX 1f5cfd36f7 Scene transitions done 2023-03-01 17:36:02 +08:00
mushgunAX 17a7db8a91 Merge branch 'main' into scenetransitions 2023-03-01 12:51:43 +08:00
Glence d5c9010661 Clean up the scenes 2023-03-01 01:16:34 +08:00
Glence ab92d56cf0 disable movement when pop out is in place 2023-03-01 00:51:57 +08:00
Glence bd9349eae7 FRC fix, stealfood popup almost done and reset dt when load 2023-02-28 21:42:05 +08:00
Glence 04c19fb586 Merge branch 'main' into PlayerController 2023-02-28 19:13:11 +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
Glence 2ab4981a43 renamed cutscene to cutsceneIntro and adjusted level 2 2023-02-28 15:06:19 +08:00
mushgunAX d563247ec2 Merge branch 'main' into scenetransitions 2023-02-28 06:49:55 +08:00
mushgunAX b3ec2fb4df implementing in progress 2023-02-28 06:49:40 +08:00
Glence 380de28358 cutscene for intro done 2023-02-28 01:57:00 +08:00
Glence 79cb0f12ae WIP for Alpha, added material name in editor WIP for cutscene 2023-02-27 18:09:05 +08:00
maverickdgg 4f1ecf1b50 multiplierTextFX WIP 2023-02-27 17:01:46 +08:00
maverickdgg cbb334d48e Slider Text Default Value fix 2023-02-27 16:39:31 +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
mushgunAX ba89dcea14 Merge branch 'main' into scenetransitions 2023-02-27 15:30:04 +08:00
mushgunAX f9c90ece7e Scene Transition Script 2023-02-27 15:28:05 +08:00
maverickdgg 08e4db134a Tweaked main menu UI 2023-02-27 15:16:48 +08:00
maverickdgg 984473bdab Slider text fixed 2023-02-27 10:28:20 +08:00
maverickdgg 949ade5775 Options Layout done 2023-02-27 09:55:54 +08:00
maverickdgg 90763ded71 Change Canvas Button Script 2023-02-27 08:08:04 +08:00
maverickdgg f23853c85c Main Menu Canvas Layout with button FX and scalebounce 2023-02-27 07:32:26 +08:00
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 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
Glence 8d10c48645 Bug fixes and WIP for alpha 2023-02-21 19:31:50 +08:00
Glence d7725f4e26 Pause is done 2023-02-21 00:47:20 +08:00