Commit graph

49707 commits

Author SHA1 Message Date
David Kelly
c95e880677 scale offsets to avatar height 2017-01-05 15:04:40 -07:00
Brad Hefta-Gaub
86c0d76955 Merge pull request #9314 from jherico/present_priority
Use a higher thread priority for Oculus present
2017-01-05 14:02:50 -08:00
howard-stearns
c4c1ea9578 Merge branch 'master' of https://github.com/highfidelity/hifi into edit-button-to-select-in-pal 2017-01-05 14:02:44 -08:00
Stephen Birarda
46086cdcce set the OCULUS_STORE property with oculus store arg 2017-01-05 14:02:35 -08:00
Howard Stearns
64a706f9e2 Merge pull request #9315 from zfox23/FixModJSAfterPAL
Allow for compatibility with old mod.js script after PAL changes
2017-01-05 14:00:41 -08:00
howard-stearns
0670a4689f Merge branch 'master' of https://github.com/highfidelity/hifi into edit-button-to-select-in-pal 2017-01-05 13:57:44 -08:00
Philip Rosedale
9bd858c1ab no log spam 2017-01-05 13:49:38 -08:00
Philip Rosedale
07ecf60485 remove sit when close 2017-01-05 13:48:31 -08:00
Howard Stearns
bbf7d16537 process consistent select message 2017-01-05 13:45:03 -08:00
Howard Stearns
28326ff47a Merge pull request #9306 from zfox23/PALVisualUpdates
Fix PAL scrollbar; add helper popup to ADMIN tab
2017-01-05 13:29:21 -08:00
Zach Fox
2f503d0bcc Allow for compatibility with old mod.js script 2017-01-05 13:25:27 -08:00
David Kelly
2949560e90 Corrected lame math error
so we are centered now, and put the overlay up a bit higher.  Still need
to make that scale properly with avatar size.
2017-01-05 14:22:35 -07:00
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
howard-stearns
47aa1e4f8e add pal to defaultScripts 2017-01-05 12:23:17 -08:00
Stephen Birarda
2ec9b81aa6 fix passing of OCULUS_APP_ID to platform SDK initialization 2017-01-05 11:38:57 -08:00
Stephen Birarda
f592d8d894 force entitlement check for all builds with OCULUS_APP_ID 2017-01-05 11:38:47 -08:00
Stephen Birarda
b87a1b2b2b only fire the entitlement check if OCULUS_APP_ID is set 2017-01-05 11:38:32 -08:00
Brad Hefta-Gaub
cb69e70781 fix competition between seek mouse and lasers 2017-01-05 11:31:50 -08:00
Stephen Birarda
ea3e5f702a add popping of messages for entitlement check 2017-01-05 11:20:45 -08:00
Stephen Birarda
d0236af334 use select_library_configurations for LibOVRPlatform 2017-01-05 11:20:44 -08:00
Stephen Birarda
1a50a11741 have FindLibOVRPlatform produce LIBOVRPLATFORM_LIBRARY 2017-01-05 11:20:44 -08:00
Stephen Birarda
ac7637f8ff use _LIBRARY_RELEASE for LibOVRPlatform external 2017-01-05 11:20:44 -08:00
Stephen Birarda
4278d7b20d download and link oculus platform for oculus plugin 2017-01-05 11:20:44 -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
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
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
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
Zach Fox
9a44cf1720 Merge pull request #9304 from zfox23/ClearPersonalMute
Also clear personalMutedList upon reset()
2017-01-04 15:07:28 -08:00