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

49818 commits

This branch
This branch
All branches
Author SHA1 Message Date
Philip Rosedale
65b9aaed1b one more try 2017-01-05 13:13:50 -08:00
Philip Rosedale
a689d52004 wrap far trigger too with seated check 2017-01-05 13:08:50 -08:00
Philip Rosedale
0ad9a8625b Added far trigger 2017-01-05 12:58:26 -08:00
Seth Alves
5e9c37777c Merge branch 'fixMouseLasers' of github.com:ZappoMan/hifi into tablet-ui-reenable-web-lasers 2017-01-05 12:50:07 -08:00
Seth Alves
52ef22770b make showing of stylus be proximity based rather than raypick based 2017-01-05 12:49:50 -08:00
howard-stearns
47aa1e4f8e add pal to defaultScripts 2017-01-05 12:23:17 -08:00
Brad Hefta-Gaub
cb69e70781 fix competition between seek mouse and lasers 2017-01-05 11:31:50 -08:00
Brad Davis
9bf4804d3d Use a higher thread priority for Oculus present 2017-01-05 11:04:50 -08:00
David Kelly
75aa32ac6a remove some debugging crap 2017-01-05 12:01:55 -07:00
David Kelly
d5e6afa15a slightly further forward, a little bigger 2017-01-05 11:54:50 -07:00
Anthony Thibault
c972e9ac51 Merge pull request #9301 from fayeli/tablet-button-states 
Tablet Button Active State's Text and Icon
 2017-01-05 10:00:10 -08:00
Zach Fox
b5713656be Minor language changes on Admin help text 2017-01-05 09:27:12 -08:00
David Kelly
f1d6335a24 First stab at making PAL avatar highlighting a bit prettier 
Working around rendering issues with model-based overlays and the
drawInFront, we use 2 overlays.  One is the model, another is
a sphere with drawInFront on.  Still need to dial in colors and sizes
but this should be close enough for iteration.
 2017-01-05 10:18:58 -07:00
Brad Hefta-Gaub
825fc1cfa1 Merge pull request #9309 from kencooke/audio-hdr-volume 
High Dynamic Range Audio injectors
 2017-01-05 08:10:54 -08:00
Brad Hefta-Gaub
e78582ebae Merge pull request #9285 from PhilipRosedale/springAway 
script to push things with your hands
 2017-01-05 08:02:10 -08:00
Philip Rosedale
88429c4033 wrong file 2017-01-04 23:51:05 -08:00
Philip Rosedale
3fd255a7a7 Merge branch 'master' of https://github.com/highfidelity/hifi into chair 2017-01-04 23:49:07 -08:00
Philip Rosedale
ba43a18529 simple chair entity script 2017-01-04 23:48:24 -08:00
Howard Stearns
12fffe8530 messages 2017-01-04 20:37:56 -08:00
Ken Cooke
719c89e800 Shared implementation of fastLog2f() and fastExp2f() moved to AudioHelpers.h 2017-01-04 20:06:46 -08:00
Ken Cooke
84af90ad96 Bump the audio packet version 2017-01-04 19:59:50 -08:00
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
Clément Brisset
e34ecac843 Merge pull request #9299 from Atlante45/settings 
Fix settings hitch
 2017-01-04 17:19:44 -08:00
howard-stearns
9709bedca7 checkpoint 2017-01-04 16:55:58 -08:00
Seth Alves
a585d43a5e attempt to get laser-based web scrolling to work, again 2017-01-04 16:51:47 -08:00
Zach Fox
0c77ff2556 Fix silly quotation bug 2017-01-04 16:28:23 -08:00
Zach Fox
083bf95917 Fix PAL scrollbar; add helper popup to ADMIN tab 2017-01-04 16:25:13 -08:00
Brad Hefta-Gaub
f9ca41e89c Merge pull request #9302 from jherico/expose_dropped_count 
Expose dropped frames count to stats UI
 2017-01-04 16:12:35 -08:00
Howard Stearns
90cc9c565a Merge pull request #9298 from howard-stearns/pal-show-lastEditedBy 
selecting user in pal shows entities lastEditedBy user this session
 2017-01-04 16:10:55 -08:00
howard-stearns
97780ac97e color, infront 2017-01-04 16:09:15 -08:00
Seth Alves
fb4263de93 Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui-reenable-web-lasers 2017-01-04 16:01:06 -08:00
howard-stearns
d78b7d9a28 Merge branch 'master' of https://github.com/highfidelity/hifi into pal-show-lastEditedBy 2017-01-04 15:48:45 -08:00
Ken Cooke
9a81a076e8 Merge branch 'master' of https://github.com/highfidelity/hifi into audio-hdr-volume 2017-01-04 15:40:12 -08:00
Ken Cooke
afacb59999 Use logarithmic quantization of injector "volume" over the wire. 
Allow gains > 1.0 (up to +30dB)
Better quantization at low levels (uniform steps in dB)
 2017-01-04 15:38:26 -08:00
Seth Alves
ed934c37ae put code that allows lasers vs web entities or overlays back in 2017-01-04 15:23:55 -08:00
Zach Fox
9a44cf1720 Merge pull request #9304 from zfox23/ClearPersonalMute 
Also clear personalMutedList upon reset()
 2017-01-04 15:07:28 -08:00
Zach Fox
e80ae92327 Also clear personalmutedlist upon reset() 2017-01-04 15:06:18 -08:00
Howard Stearns
3d8da683db Merge pull request #9290 from zfox23/PersonalMute 
Personal mute; Quasi-ignore; Reversible PAL actions
 2017-01-04 14:37:09 -08:00
Zach Fox
675159be45 Last commit to fix final bugs 2017-01-04 14:33:02 -08:00
Zach Fox
ac41e8abc4 Bugfix re: population; remove user image for now 2017-01-04 14:06:51 -08:00
Zach Fox
03fbfc85f9 Short delay before populating PAL when changing domains 2017-01-04 13:50:37 -08:00
Zach Fox
c695878025 Clear local ignored list upon domain change 2017-01-04 13:31:16 -08:00
Brad Davis
3f2fdd1915 Expose dropped frames count to stats UI 2017-01-04 13:20:58 -08:00
Faye Li Si Fi
934b56bd50 replace redundant toggle logic 2017-01-04 12:41:49 -08:00
Zach Fox
dde5f69ac9 More CR & simplifications 2017-01-04 12:41:30 -08:00
Faye Li Si Fi
475430c1e0 testing new active state with mute.js 2017-01-04 12:25:27 -08:00
Faye Li Si Fi
32bc73dad3 added activeText and activeIcon properties in QML 2017-01-04 12:20:41 -08:00
Atlante45
56a25dfdee Check setting value changed 2017-01-04 11:56:24 -08:00
Seth Alves
d85ecc2b79 Merge pull request #9297 from druiz17/homeBug 
home button fix and tablet updates
 2017-01-04 11:34:55 -08:00
Dante Ruiz
8327df55e4 removed commented out code 2017-01-04 19:21:03 +00:00