Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature/32 lock picking - v1 #121

Merged
merged 28 commits into from
Sep 29, 2024
Merged

Feature/32 lock picking - v1 #121

merged 28 commits into from
Sep 29, 2024

Conversation

JaXt0r
Copy link
Contributor

@JaXt0r JaXt0r commented Sep 12, 2024 •
edited
Loading

Description

Initial implementation of a lock picking solution. Can be tested inside Lab.

To test

  • Start lab
  • Walk to the door - left of Ladder
  • Grab the lockpick
  • Try to open the door

image

Feedback about haptics and feeling of the mini game is very much appreciated.

Boundary

JaXt0r added 23 commits September 5, 2024 17:57
@JaXt0r
update(UZENity.Lab.asmdef): Exclude Lab from release build.
d57adf9
@JaXt0r
update(Lab.unity): Added DoorLockTool - skeleton.
d64f756
@JaXt0r
move(ILabHandler): Altered to an abstract class to provide common fun…
3890a4d 
…ctionality.
@JaXt0r
add(LabLockHandler): Initial setup of Locked door and Lockpick
7ff5ecc
@JaXt0r
Merge branch 'main' into feature/32-lock-picking
f88541d 
# Conflicts:
#	Assets/UnZENity-Lab/Scenes/Lab.unity
#	Assets/UnZENity-Lab/Scripts/LabBootstrapper.cs
@JaXt0r
update(Lab.unity): move LockTool to separate space.
5a924bb
@JaXt0r
add(LockPick.prefab): ocItem for LockPick is now new prefab variant +…
61bfebf 
… dragging element into/out of lock area is recognized.
@JaXt0r
fix(VRVobItem): OnDrawGizmos threw exceptions. Added isPlaying check …
bbd07e1 
…to remove issue.
@JaXt0r
add(VRLockPickInteraction): skeleton to check for hand rotation of lo…
9b68aa6 
…ckpick later on.
@JaXt0r
move(Adapter+Manager): Put into sub folders.
4e8dd5b
@JaXt0r
add(VRPlayerManager): Initial "rotation tracking" of grabbed LockPick…
44933f0 
… implemented. Rotation isn't calculated correctly though.
@JaXt0r
fix(VRPlayerManager): Added missing pragma
533b1fd
@JaXt0r
update(VRDoorLockInteraction): Exchange information about hand rotati…
01dfc6f 
…on with a lock pick and play sounds if correct/incorrect. Also check where player is in L+R combination right now. Bug: Broken sound not playable as of now.
@JaXt0r
Merge branch 'main' into feature/32-lock-picking
13936de
@JaXt0r
fix(VRDoorLockInteraction): Load clip via new API.
caa8f22
@JaXt0r
fix(LabBootstrapper): Added logger to start and log initialization al…
6275ac6 
…ready.
@JaXt0r
fix(LabBootstrapper): Added logger to start and log initialization al…
c9584a9 
…ready.
@JaXt0r
fix(VRPlayerController): Missing base.Start() call added.
e050581
@JaXt0r
update(VRDoorLockInteraction): Blocking door from movement if locked …
7800087 
…and re-enable rotation once unlocked.
@JaXt0r
fix(#pragma):
166f2f6
@JaXt0r
fix(VRLockPickInteraction): Add Left and Right hand usage.
a324998
@JaXt0r
fix(#pragma):
d8079d2
@JaXt0r
fix(#pragma):
f88a817
@JaXt0r JaXt0r changed the title Feature/32 lock picking Feature/32 lock picking - b1 Sep 17, 2024
@JaXt0r JaXt0r changed the title Feature/32 lock picking - b1 Feature/32 lock picking - v1 Sep 17, 2024
@JaXt0r JaXt0r linked an issue Sep 17, 2024 that may be closed by this pull request
Lock picking - v1 #32
Closed
4 tasks
@JaXt0r JaXt0r marked this pull request as ready for review September 17, 2024 11:52
@JaXt0r
Merge branch 'main' into feature/32-lock-picking
5ceb27a 
# Conflicts:
#	Assets/UnZENity-Core/Scripts/Globals/Constants.cs
#	Assets/UnZENity-Lab/Scenes/Lab.unity
#	Assets/UnZENity-Lab/Scripts/Handler/LabInteractableHandler.cs
#	Assets/UnZENity-Lab/Scripts/LabBootstrapper.cs
#	Assets/UnZENity-VR/Scripts/Adapter/VRInteractionAdapter.cs
#	Assets/UnZENity-VR/Scripts/Components/VRCanvasManager.cs
#	Assets/UnZENity-VR/Scripts/Components/VRCanvasManager.cs.meta
#	Assets/UnZENity-VR/Scripts/Components/VRPlayerController.cs
#	Assets/UnZENity-VR/Scripts/VRContextBootstrap.cs
@JaXt0r
fix: Comilation without HVR
382cff6
@JaXt0r
candy: Format of lines and remove of unused WAV elements with comment.
52a8baa
@JaXt0r JaXt0r merged commit a1318c5 into main Sep 29, 2024
2 checks passed
@JaXt0r JaXt0r deleted the feature/32-lock-picking branch September 29, 2024 14:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@JucanAndreiDaniel JucanAndreiDaniel JucanAndreiDaniel approved these changes

@BoroBongo BoroBongo Awaiting requested review from BoroBongo

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Lock picking - v1
2 participants
@JaXt0r @JucanAndreiDaniel