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 |
|
Howard Stearns
|
9aad93465d
|
Merge pull request #9227 from howard-stearns/sessionDisplayNames
Session display names
|
2016-12-20 10:07:05 -08:00 |
|
Howard Stearns
|
9ff06e53d4
|
Merge pull request #9235 from davidkelly/dk/fingerprintInPAL
Expose Machine Fingerprint in PAL
|
2016-12-20 10:06:36 -08:00 |
|
Chris Collins
|
61c60fca2d
|
Merge pull request #8968 from ctrlaltdavid/21089
Clara.io marketplace improvements
|
2016-12-19 18:21:45 -08:00 |
|
howard-stearns
|
60cb7acb50
|
Merge branch 'master' of https://github.com/highfidelity/hifi into sessionDisplayNames
|
2016-12-19 15:28:07 -08:00 |
|
David Kelly
|
36792e005a
|
initial commit
|
2016-12-19 14:19:39 -08:00 |
|
Zach Fox
|
e940daf5b4
|
Comments and clarity
|
2016-12-19 10:20:08 -08:00 |
|
Zach Fox
|
aa837d8858
|
It's working! Untested on human avatars.
|
2016-12-19 10:20:08 -08:00 |
|
Zach Fox
|
2c5db54b08
|
Super close
|
2016-12-19 10:20:08 -08:00 |
|
Zach Fox
|
802e283508
|
Another checkpoint, getting closer
|
2016-12-19 10:20:08 -08:00 |
|
Zach Fox
|
c9dc91900f
|
Checkpoint
|
2016-12-19 10:20:08 -08:00 |
|
howard-stearns
|
9d9345cb65
|
Merge branch 'master' of https://github.com/highfidelity/hifi into sessionDisplayNames
|
2016-12-19 09:19:14 -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 |
|
howard-stearns
|
70af96669c
|
update pal
|
2016-12-16 14:59:54 -08:00 |
|
David Rowe
|
9459b967be
|
Merge branch 'master' into 21089
|
2016-12-16 20:02:43 +13:00 |
|
David Rowe
|
3d6fe6efe8
|
Move Clara download button when displaying on tablet
|
2016-12-16 14:58:22 +13:00 |
|
David Rowe
|
18a3555453
|
Fix flash of old desktop window content if reopen after closing with "x"
|
2016-12-16 12:21:32 +13:00 |
|
David Rowe
|
04aef641c5
|
Fix auto-downloads not happening after forced log in
|
2016-12-16 11:45:17 +13:00 |
|
David Rowe
|
a7e0135a6a
|
Continuously update Clara pages because content can change dynamically
|
2016-12-16 11:28:34 +13:00 |
|
Howard Stearns
|
ba8b585368
|
Merge pull request #9202 from howard-stearns/pal-proto
People Action List prototype
|
2016-12-15 13:56:12 -08:00 |
|
Brad Hefta-Gaub
|
0923a79139
|
Merge pull request #9187 from PhilipRosedale/rescale
Rescale yourself or entities using the grip buttons
|
2016-12-15 12:32:04 -08:00 |
|
howard-stearns
|
0e81e71325
|
fix selection and hud-hiding issues
|
2016-12-15 11:00:32 -08:00 |
|
David Rowe
|
861ce2c27b
|
Reduce whitespace in Clara categories
|
2016-12-15 20:33: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 |
|
Zach Fox
|
c53111781b
|
Fix the bug
|
2016-12-14 12:17:00 -08:00 |
|
howard-stearns
|
66e2c651c6
|
clean up avatar nodes properly (and add some logging)
|
2016-12-14 11:26:33 -08:00 |
|
Howard Stearns
|
d5c219a761
|
deal with bubble-bounces (and comment the code a bit)
|
2016-12-13 19:52:27 -08:00 |
|
David Rowe
|
eb7b2dbdcf
|
Improve robustness of navigation footer
|
2016-12-14 15:07:06 +13:00 |
|
David Rowe
|
2b0529bcea
|
Inform user if can't do Clara.io download because can't write to ATP
|
2016-12-14 14:45:33 +13:00 |
|
howard-stearns
|
a50b731faa
|
fix broken search for myself
|
2016-12-13 16:52:18 -08:00 |
|
howard-stearns
|
03d3e0b550
|
Merge branch 'master' of https://github.com/highfidelity/hifi into pal-proto
|
2016-12-13 16:03:00 -08:00 |
|