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
Chris Collins
9bacab07e6
Merge pull request #9254 from PhilipRosedale/ambisonicRotation
...
Ambisonic rotation
2016-12-23 09:25:48 -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
David Kelly
e67d6e347d
Merge pull request #9253 from zfox23/PAL_QML_Updates
...
PAL Visual Style Updates
2016-12-22 10:21:27 -08:00
Philip Rosedale
b02d14fcc2
set right thing initially
2016-12-21 13:17:08 -08:00
Philip Rosedale
632bf997f3
debug off
2016-12-21 13:15:44 -08:00
Philip Rosedale
cf3a260646
added ability to rotate entity and sound direction
2016-12-21 13:13:59 -08: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
Brad Hefta-Gaub
e6a20102d4
debug window enhancements
2016-12-21 11:31:34 -08:00
Chris Collins
9ee1c64573
Merge pull request #9246 from birarda/touch-equip
...
add Oculus Touch friendly grab and equip
2016-12-20 17:12:34 -08:00
Brad Hefta-Gaub
14445c37fe
Merge pull request #9231 from PhilipRosedale/ambisonic
...
Entity script for ambisonic sound emitter
2016-12-20 16:16:37 -08:00
Philip Rosedale
4bade4400f
fixed typo per review
2016-12-20 16:02:26 -08:00
Stephen Birarda
ebd347fc15
only respect release of secondary for hold once pressed
2016-12-20 14:46:55 -08:00
Brad Hefta-Gaub
c2320d317c
Merge branch 'master' of https://github.com/highfidelity/hifi into removeLogSpam
2016-12-20 14:34:57 -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
Brad Hefta-Gaub
0448023a0f
better handle null senders, trim lines after 2000
2016-12-20 14:14:28 -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
Philip Rosedale
632af18c1d
PR feedback - flag for setting color
2016-12-20 12:09:42 -08:00
Philip Rosedale
e2dfbf1b02
Addressed PR feedback - now dynamically reads userdata
2016-12-20 12:02:13 -08:00
Brad Hefta-Gaub
f8bae60361
make debug log autoscroll when you add new content to it
2016-12-20 11:27:18 -08:00
Chris Collins
5cc1cd758f
Merge pull request #9236 from jherico/chrome_tracing
...
Updates to tracing, removing log spam
2016-12-20 11:17:17 -08:00
Brad Hefta-Gaub
9b11c7cc9c
Merge branch 'master' of https://github.com/highfidelity/hifi into removeLogSpam
...
Conflicts:
libraries/networking/src/NodeList.cpp
2016-12-20 10:46:57 -08:00
Brad Hefta-Gaub
2079b1ff7e
cleanup comments
2016-12-20 10:45:36 -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
Brad Hefta-Gaub
6a7fa63327
classify ScriptEngine errors better, and send them as signal to JS
2016-12-20 09:00:01 -08:00
Brad Hefta-Gaub
c65471e880
Merge branch 'master' of https://github.com/highfidelity/hifi into removeLogSpam
...
Conflicts:
libraries/script-engine/src/FileScriptingInterface.cpp
2016-12-19 22:27:24 -08:00
Brad Hefta-Gaub
1e5e6a12db
add support for an HMD script debug log window
2016-12-19 19:34:24 -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
Brad Davis
9b0d0b3e7a
Updates to tracing, removing log spam
2016-12-19 15:12:48 -08:00
David Kelly
36792e005a
initial commit
2016-12-19 14:19:39 -08:00
Philip Rosedale
70942925bc
Entity script for ambisonic sound emitter
2016-12-19 10:32:17 -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