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

1184 commits

Author SHA1 Message Date
Anthony Thibault
c201b6a7f9 Merge pull request #9256 from druiz17/moreButtons 
all hub button now on tablet
 2017-01-03 10:44:19 -08:00
Anthony J. Thibault
00980366d6 Merge branch 'master' into tablet-ui 2017-01-03 09:45:23 -08:00
Zach Fox
72da05bb30 Merge pull request #9268 from zfox23/PalRefresh 
Add PAL refresh button
 2016-12-23 15:16:51 -08:00
David Kelly
68fb81902b Merge pull request #9261 from davidkelly/dk/workingVUMetersInPal 
Working VU meters in PAL
 2016-12-23 13:24:38 -08:00
David Kelly
5065f027e7 whitespace 2016-12-23 13:11:42 -08:00
Zach Fox
5490dddbbf Cool style changes! 2016-12-23 12:22:33 -08:00
David Kelly
9eed430f49 CR feedback 2016-12-22 18:09:19 -08:00
Zach Fox
f2bdbe051c Halve the volume 2016-12-22 16:35:12 -08:00
David Kelly
2e897e0cc9 Working first pass 
Seems roughly same as mic meter.  Works for other avatars, though
using agent avatars (crowd-agent.js + summon.js), seems not to work.

I'll investigate that...
 2016-12-22 14:01:03 -08:00
Dante Ruiz
61277c0605 Stylus now works in edit mode 2016-12-22 17:33:25 +00:00
Dante Ruiz
bf6178f500 diff minimize 2016-12-21 23:48:45 +00:00
Dante Ruiz
1753508f53 diff minimize 2016-12-21 23:31:00 +00:00
Dante Ruiz
5ed8831bee all hud buttons on tablet 2016-12-21 23:25:40 +00:00
Zach Fox
630fb8696f Lots of progress today 2016-12-21 12:48:26 -08:00
Zach Fox
7999e14ecf Kinda screwed things up by changing styles 2016-12-21 12:48:25 -08:00
Zach Fox
feafc16833 Frequent checkpoints are good. 2016-12-21 12:47:38 -08:00
Zach Fox
e7c2229b2c More progress 2016-12-21 12:46:23 -08:00
Dante Ruiz
fa761af1a6 update#2 2016-12-20 15:39:17 -08:00
Dante Ruiz
8698ee61cd commit update 2016-12-20 15:39:17 -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
Anthony J. Thibault
ec38c4e319 Merge remote-tracking branch 'upstream/tablet-ui' into tablet-ui 2016-12-20 13:43:06 -08:00
Anthony Thibault
9d964042c9 Merge pull request #9243 from sethalves/tablet-ui-overlay-stylus-rebase 
use overlays for tablet-ui, use a stylus rather than lasers
 2016-12-20 13:42:22 -08:00
Anthony J. Thibault
84db58dbc6 Make tablet.qml work on Web3DOverlay 2016-12-20 12:16:11 -08:00
Anthony Thibault
bb56701fdb Merge pull request #9241 from druiz17/tabletMenu 
Moved some hud menus to tablet
 2016-12-20 11:13:03 -08:00
Dante Ruiz
bee6e230ae made requested changes 2016-12-20 18:28:07 +00: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
Seth Alves
ab3c833dd5 diff minimization 2016-12-20 09:23:21 -08:00
Seth Alves
36e843178a diff minimization 2016-12-20 09:21:41 -08:00
Seth Alves
d8ee4d86b0 merge from upstream 2016-12-20 08:43:19 -08:00
Seth Alves
dc996bee95 merge from upstream 2016-12-20 08:06:01 -08:00
Dante Ruiz
fe4fa351d1 clean up 3 2016-12-20 16:04:18 +00:00
Dante Ruiz
31decffb31 clean up 2 2016-12-20 15:59:52 +00:00
Dante Ruiz
7251fa6c18 clean up 2016-12-20 15:54:14 +00:00
Dante Ruiz
74092d8714 removed commented code 2016-12-20 15:46:15 +00:00
Zach Fox
ba240854a7 Comments and clarity 2016-12-20 07:45:35 -08:00
Zach Fox
95e2f0687d It's working! Untested on human avatars. 2016-12-20 07:45:35 -08:00
Zach Fox
54774950d2 Super close 2016-12-20 07:45:35 -08:00
Zach Fox
42127e4e0f Another checkpoint, getting closer 2016-12-20 07:45:35 -08:00
Zach Fox
9c09ec6755 Checkpoint 2016-12-20 07:45:35 -08:00
Ryan Huffman
bf7066d4e3 Cleanup tutorial scripts 2016-12-20 07:45:35 -08:00
Ryan Huffman
e12ef0a187 Cleanup variable naming in touch controller config 2016-12-20 07:45:35 -08:00
Ryan Huffman
04efea7293 Cleanup implementation of touch controller config 2016-12-20 07:45:35 -08:00