Skip to content

Adding interface updates to ROS system #11

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
Closed
j-paterson wants to merge 36 commits into from
Closed

Adding interface updates to ROS system #11

j-paterson wants to merge 36 commits into from

Conversation

@j-paterson
Copy link
Member

@j-paterson j-paterson commented Apr 26, 2018

No description provided.

noahytseng and others added 30 commits March 21, 2018 14:18
@noahytseng
Merge pull request #6 from j-paterson/waypoints_Jh
81fb241 
Waypoints jh
@jw-han
Merge pull request #9 from j-paterson/paxtanBranch
a51b4e9 
Merging Paxtan's latest changes to Ji's
@jw-han
Fix grab raycast, start height adjust
1dd8982
@noahtseng
Merge branch 'waypoints_Jh' of https://github.com/j-paterson/vr-drone…
2c4c80b 
…-interface
@noahtseng
Merge branch 'paxtanBranch' of https://github.com/j-paterson/vr-drone…
7606ed8 
…-interface into RayCastGrip_NT
@jw-han
Change height adjustment
238d0c4
@lakerpaxtan
added grab zones / need to figure out how to disable controller colli…
93b6a42 
…der or convert deletion to new grab zone and delete collider altogether
@lakerpaxtan
grab zone with single grab complete (except turning off raycast)
95dfabe
@lakerpaxtan
final grabZone + attempt to change size with thumbStick
0c0cd21
@jw-han
add toggle function
36501ec
@jw-han
Add ghost waypoint, position adjustment
8dc56f4
@noahtseng
Merge branch 'master' of https://github.com/j-paterson/vr-drone-inter…
911885b 
…face into RayCastGrip_NT
@noahtseng
Merge branch 'waypoints_Jh' into RayCastGrip_NT
187f972
@noahtseng
merged with paxtanbranch
c6c624d
@noahtseng
Merge remote-tracking branch 'origin/waypoints_Jh' into RayCastGrip_NT
e89fe95
@jw-han
Fix groundpoint lines for grabbing
ec23851
@noahtseng
Merge remote-tracking branch 'origin/waypoints_Jh' into RayCastGrip_NT
fd30401
@noahtseng
Created drone menu, non-functional
71d117b
@jw-han
begin new menu
1165aeb
@lakerpaxtan
git stuff
9b9a17c
@lakerpaxtan
sphere collider scaling / raycast stopping
5eb1790
@lakerpaxtan
git claims I made changes
cbec459
@jw-han
Merge pull request #10 from j-paterson/paxtanBranch
df17d15 
Paxtan branch
@noahtseng
revert to master scene
7ae1e14
@noahtseng
scene revert to original
1b283b6
@noahtseng
added start/stop button for drone, scene changed
6b5c788
@noahtseng
delete unnecessary objects in scene
fedc41a
@jw-han
Move grabbing to index
39d622e
@noahtseng
fixed conflicts
36e8318
@noahtseng
fixed Ji branch conflict
680564b
@j-paterson j-paterson closed this Jun 4, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

6 participants

@j-paterson @noahytseng @jw-han @noahtseng @lakerpaxtan