Ardadev#8
Open
ardagltkn96 wants to merge 21 commits into
Open
Conversation
*Set up initial file system structure *Created a Main scene for FingerBlasters *Installed XR Plugin Manager *Installed Oculus Integration Package *Modified the Full Synthetic OVR Rig to be a passthrough rig and created a prefab for it
pull request dev_max to dev
* started shield shader, created shield * Squashed commit of the following: commit aba6a7f Merge: 741a874 6e35274 Author: Arda Gültekin <36036396+ardagltkn96@users.noreply.github.com> Date: Tue Jun 6 16:53:58 2023 +0300 Merge pull request #3 from XRBootcamp/Ardadev Ardadev commit 6e35274 Author: Arda Gultekin <arda.gultekin@bites.com.tr> Date: Tue Jun 6 16:50:43 2023 +0300 Gesture Detection and a sample shooting scene added. commit 0544fdd Merge: efb6064 741a874 Author: Arda Gultekin <arda.gultekin@bites.com.tr> Date: Thu Jun 1 14:27:18 2023 +0300 Merge branch 'dev' of https://github.com/XRBootcamp/Finger-Blasters into Ardadev commit efb6064 Author: Arda Gultekin <arda.gultekin@bites.com.tr> Date: Thu Jun 1 14:24:32 2023 +0300 Pulled remote repo * Failed to get Collisions Working - Complete for now
commit 72167d9 Author: Max-Manausa <maxmanausa@gmail.com> Date: Tue Jun 6 15:55:42 2023 -0400 Squashed commit of the following: commit 0e55c59 Author: simonswartout <121693487+simonswartout@users.noreply.github.com> Date: Tue Jun 6 13:55:33 2023 -0400 Shield (#4) * started shield shader, created shield * Squashed commit of the following: commit aba6a7f Merge: 741a874 6e35274 Author: Arda Gültekin <36036396+ardagltkn96@users.noreply.github.com> Date: Tue Jun 6 16:53:58 2023 +0300 Merge pull request #3 from XRBootcamp/Ardadev Ardadev commit 6e35274 Author: Arda Gultekin <arda.gultekin@bites.com.tr> Date: Tue Jun 6 16:50:43 2023 +0300 Gesture Detection and a sample shooting scene added. commit 0544fdd Merge: efb6064 741a874 Author: Arda Gultekin <arda.gultekin@bites.com.tr> Date: Thu Jun 1 14:27:18 2023 +0300 Merge branch 'dev' of https://github.com/XRBootcamp/Finger-Blasters into Ardadev commit efb6064 Author: Arda Gultekin <arda.gultekin@bites.com.tr> Date: Thu Jun 1 14:24:32 2023 +0300 Pulled remote repo * Failed to get Collisions Working - Complete for now commit aba6a7f Merge: 741a874 6e35274 Author: Arda Gültekin <36036396+ardagltkn96@users.noreply.github.com> Date: Tue Jun 6 16:53:58 2023 +0300 Merge pull request #3 from XRBootcamp/Ardadev Ardadev commit 6e35274 Author: Arda Gultekin <arda.gultekin@bites.com.tr> Date: Tue Jun 6 16:50:43 2023 +0300 Gesture Detection and a sample shooting scene added. commit 0544fdd Merge: efb6064 741a874 Author: Arda Gultekin <arda.gultekin@bites.com.tr> Date: Thu Jun 1 14:27:18 2023 +0300 Merge branch 'dev' of https://github.com/XRBootcamp/Finger-Blasters into Ardadev commit efb6064 Author: Arda Gultekin <arda.gultekin@bites.com.tr> Date: Thu Jun 1 14:24:32 2023 +0300 Pulled remote repo commit bc4d241 Author: Max-Manausa <maxmanausa@gmail.com> Date: Mon Jun 5 23:17:02 2023 -0400 added crossbow to scene and now have three weapon choices at least commit b172066 Author: Max-Manausa <maxmanausa@gmail.com> Date: Mon Jun 5 23:09:28 2023 -0400 Added BitGun to project and left hand commit c62c5cc Author: Max-Manausa <maxmanausa@gmail.com> Date: Mon Jun 5 23:00:15 2023 -0400 set up right and left fun (in the handgrabinteractor in the ovr hands) and added space blaster commit a6c1466 Author: Max-Manausa <maxmanausa@gmail.com> Date: Mon Jun 5 12:32:46 2023 -0400 put gun on the hand interactors in the ovrhands/right hand commit e041ff9 Author: Max-Manausa <maxmanausa@gmail.com> Date: Tue May 30 12:49:20 2023 -0400 updated build settings + added a cube in scene test build works successfully
…hemed Levels Select, Weapon Select
* Set up a new scene * Imported new assets, finished some particle systems * Set up simple scene and weapons particle systems * Implemented a new weapons system to smoothly integrate with hand gestures * Changes to Rocket --- it is all messed up
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Final merge for the 2 week MVP