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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
mushgunAX
|
6e8b2bc460
|
Merge branch 'main' into AudioImplementation
|
2023-02-04 02:11:41 +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 |
|
Glence
|
9d73806573
|
Merge branch 'main' into PlayerController
|
2023-02-04 01:11:56 +08:00 |
|
Glence
|
436846d03c
|
Fix level1 and fix ontrigger calling twice
|
2023-02-04 01:11:47 +08:00 |
|
mushgunAX
|
c7b99df2f6
|
Merge branch 'main' into AudioImplementation
|
2023-02-04 00:31:23 +08:00 |
|
mushgunAX
|
49fadfed74
|
Dynamic BGM
|
2023-02-04 00:23:05 +08:00 |
|
Kah Wei
|
3cd1778d08
|
Fixed SHUIComponent serialization
|
2023-02-04 00:04:25 +08:00 |
|
maverickdgg
|
21695fd4f3
|
Merge branch 'main' into SP3-20-UI-System
|
2023-02-03 23:28:17 +08:00 |
|
maverickdgg
|
fdacaf5036
|
Added reminaing buttons for win and lose screens
|
2023-02-03 23:28:08 +08:00 |
|
mushgunAX
|
136d86dce3
|
Fix Item Score SFX
|
2023-02-03 23:19:12 +08:00 |
|
mushgunAX
|
d71790022f
|
Merge branch 'main' into AudioImplementation
|
2023-02-03 23:16:47 +08:00 |
|
maverickdgg
|
b15b5eadbc
|
Merge branch 'main' into SP3-20-UI-System
|
2023-02-03 22:59:56 +08:00 |
|
maverickdgg
|
ebf1ab39cf
|
Added some buttons to lose screen
|
2023-02-03 22:59:49 +08:00 |
|
Diren D Bharwani
|
c61be35da0
|
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
|
2023-02-03 22:44:58 +08:00 |
|
maverickdgg
|
382a2d0f6a
|
Added start game button. Texture changing for buttons now only change when necessary
|
2023-02-03 22:44:02 +08:00 |
|
Glence
|
2ee46f33df
|
update collision tag to have a save button and clamp raycast draw
|
2023-02-03 21:28:50 +08:00 |
|
mushgunAX
|
a6bc9ed2b4
|
Updates on audio
|
2023-02-03 19:37:18 +08:00 |
|
Diren D Bharwani
|
36de32447d
|
Fixed some bugs with serialisation
|
2023-02-03 18:40:45 +08:00 |
|
Kah Wei
|
929bfa8a54
|
Merge branch 'SP3-6-c-scripting' into SP3-6-CSharpStaticReset
|
2023-02-03 17:05:56 +08:00 |
|
mushgunAX
|
60fa4335a0
|
Merge branch 'main' into AudioImplementation
|
2023-02-03 17:01:11 +08:00 |