Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-05-06 17:58:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
49391 commits 25 branches 0 tags 1.1 GiB
Commit graph

491 commits

Author SHA1 Message Date
Brad Hefta-Gaub
368f48f0a7 Merge pull request #9247 from huffman/feat/tutorial-touch-grip 
Add support for new Touch grip mappings to tutorial
 2017-01-04 17:58:05 -08:00
Brad Hefta-Gaub
d440532cff make sure RPC is timely 2017-01-03 11:10:07 -08:00
Brad Hefta-Gaub
82ab8635d7 debugging 2016-12-30 12:02:48 -08:00
Brad Hefta-Gaub
7c7d239e00 first cut at using wait signals to improve RPC timing 2016-12-30 09:13:21 -08:00
Ryan Huffman
8b5a05c409 Fix right touch controller tip labels not showing up 2016-12-20 18:01:53 -08:00
Ryan Huffman
df0dfc761d Add ability to disable avatar and object scaling in handController grab 2016-12-20 18:01:53 -08:00
Ryan Huffman
0b2f60fb27 Update tutorial to use new trigger configuration for touch 2016-12-20 18:01:53 -08:00
Stephen Birarda
ebd347fc15 only respect release of secondary for hold once pressed 2016-12-20 14:46:55 -08:00
Stephen Birarda
4fcccb5455 check for release of equip in this.nearGrabbing 2016-12-20 14:32:47 -08:00
Stephen Birarda
c3d736dd16 return after release, duh 2016-12-20 14:30:08 -08:00
Stephen Birarda
8cd13eaedf always unequip on secondary release 2016-12-20 14:25:26 -08:00
Stephen Birarda
0a024616cc add special equip for oculus style grab 2016-12-20 14:21:23 -08:00
Philip Rosedale
13e03b35cc removed initial delay for seek beams 2016-12-20 14:11:52 -08:00
Philip Rosedale
250d071788 grip squeezes fingers too 2016-12-20 14:11:45 -08:00
Philip Rosedale
938734d3fc Grip controllers can grab objects, slight delay on search beam 2016-12-20 14:11:33 -08:00
Chris Collins
61c60fca2d Merge pull request #8968 from ctrlaltdavid/21089 
Clara.io marketplace improvements
 2016-12-19 18:21:45 -08:00
Ryan Huffman
9730d07f59 Cleanup tutorial scripts 2016-12-16 16:01:44 -08:00
Ryan Huffman
46d8130782 Cleanup variable naming in touch controller config 2016-12-16 16:01:26 -08:00
Ryan Huffman
009c982cdf Cleanup implementation of touch controller config 2016-12-16 15:05:17 -08:00
Ryan Huffman
19a3fdcc01 Update Touch controller configuration 2016-12-16 15:05:17 -08:00
Ryan Huffman
f7ebda6931 Fix positioning of Oculus Touch controller visual 2016-12-16 15:05:17 -08:00
Ryan Huffman
b599ccea9e Remove cache buster from touchControllerConfiguration 2016-12-16 15:05:17 -08:00
Ryan Huffman
188bf600d1 Fix oculus touch labels in tutorial 2016-12-16 15:05:17 -08:00
Ryan Huffman
46251e805a Update oculus touch labels to be emissive 2016-12-16 15:05:17 -08:00
Ryan Huffman
46f5494af8 Fix emissive channel on touch models 2016-12-16 15:05:17 -08:00
Ryan Huffman
3df1819086 Fix right touch joystick 2016-12-16 15:05:17 -08:00
Ryan Huffman
2b88935812 Reenable disabling of hand controllers 2016-12-16 15:05:17 -08:00
Ryan Huffman
6fb39080e2 Update controller display to support non-string hardware resolution 2016-12-16 15:05:17 -08:00
Ryan Huffman
674bbe7de5 Add touch controller support to ControllerDisplay 2016-12-16 15:05:17 -08:00
David Rowe
9459b967be Merge branch 'master' into 21089 2016-12-16 20:02:43 +13:00
Philip Rosedale
14c867fdbd Can't resize if objects in both hands, avatar resize is seek + grips 2016-12-14 13:38:37 -08:00
David Rowe
efb784f703 Code review 2016-12-13 13:11:21 +13:00
Philip Rosedale
9370c8af6b Added ability to rescale avatar 2016-12-12 15:26:53 -08:00
Philip Rosedale
a142c830fa Merge branch 'master' of git://github.com/highfidelity/hifi into rescale 2016-12-12 09:41:34 -08:00
Philip Rosedale
8572950a09 Both grip buttons enable rescale for a held object 2016-12-12 09:39:32 -08:00
David Rowe
e956608fa4 Fix keyboard focus when switch highlight between overlays and entities 2016-12-09 18:31:52 +13:00
David Rowe
7d8926c802 Fix Web overlay x, y coordinate calcs 2016-12-09 17:00:00 +13:00
David Rowe
4c236b293e First pass at controller interaction with 3D Web overlay 2016-12-09 01:47:40 +13:00
Anthony J. Thibault
89ae3b3d6e Revert "Merge pull request #8691 from highfidelity/out-of-body-experience" 
This reverts commit efe9571ab8, reversing
changes made to 333e9ec7f4.
 2016-12-05 15:18:03 -08:00
Ryan Huffman
996d3f5875 Merge pull request #9135 from druiz17/nearGrab 
Fixed pressing the grip button causes a near grabbed object to drop
 2016-12-05 11:07:15 -08:00
Dante Ruiz
08301d488d clean up 2016-12-05 18:10:54 +00:00
Dante Ruiz
09d5dc382f better solution 2016-12-05 18:08:36 +00:00
Seth Alves
24e54f25bf Merge pull request #9108 from PhilipRosedale/drifting 
Grab.js weaker at a distance
 2016-12-01 12:59:28 -08:00
Philip Rosedale
c60b0c7ef5 Fix indents 2016-12-01 12:54:38 -08:00
Seth Alves
efe9571ab8 Merge pull request #8691 from highfidelity/out-of-body-experience 
Room Scale HMD comfort features.
 2016-12-01 11:09:39 -08:00
Dante Ruiz
1b24d373d2 fixed near grab issue 2016-12-01 10:18:34 -08:00
Dante Ruiz
dc7bb5b083 grip button fix 2016-12-01 10:17:54 -08:00
Chris Collins
19b5e7cd86 Merge pull request #9054 from howard-stearns/third-person-lasers 
make hand-controller ui work in third person
 2016-12-01 10:11:12 -08:00
Anthony J. Thibault
7f840d3a08 Can use 'xboxLaser' in third person camera 2016-11-30 10:01:11 -08:00
Ryan Huffman
aa1e813d72 Fix 'releaseGrab' not being called when using grip buttons 2016-11-29 15:04:14 -08:00