Commit graph

39313 commits

Author SHA1 Message Date
Stephen Birarda
6e4ecffb09 expose generated public key and private key from generator 2016-02-19 16:48:58 -08:00
Stephen Birarda
5de8601b43 simpler cleanup of result from RSAKeypairGenerator 2016-02-19 16:41:56 -08:00
Stephen Birarda
fa5f2571d7 cleanup migrations from previous account file system 2016-02-19 16:31:31 -08:00
Stephen Birarda
f553becabe data-server name tweak and isAgent behaviour change 2016-02-19 16:04:45 -08:00
Stephen Birarda
98b06112bd handle persistence of AccountManager info to sep file 2016-02-19 15:45:20 -08:00
Stephen Birarda
af181e00b1 allow for creation of domain-server keypair in AccountManager 2016-02-19 14:34:19 -08:00
Chris Collins
75429e39bc Merge pull request #7139 from hyperlogic/tony/better-vive-tracking
OpenVRDisplayPlugin: predict poses for better tracking
2016-02-19 11:36:06 -08:00
Chris Collins
1fe9bb2c6c Merge pull request #7142 from howard-stearns/null-audio-injector
null audio injector
2016-02-19 11:32:01 -08:00
Howard Stearns
fcdc6dd6fa When we don't make an audo injector (because we're at a limit), make sure the value returned to scripts is null. 2016-02-19 10:54:53 -08:00
Andrew Meadows
c53e583bf4 Merge pull request #7129 from hyperlogic/tony/no-hands-in-body
Prevent avatar's wrists from entering torso
2016-02-19 10:53:12 -08:00
samcake
04543e7b0e Merge pull request #7138 from zzmp/fix/render-debug
Update render/debug.js
2016-02-19 10:10:43 -08:00
Ryan Huffman
69a953725e Merge pull request #7132 from imgntn/edit-precision-things
Revert step size change in edit.js
2016-02-19 08:20:04 -08:00
Brad Hefta-Gaub
3a5ee1db8c Merge pull request #7140 from jherico/qml_mm
Add a QML document referencing the QML multimedia types
2016-02-18 19:08:24 -08:00
Brad Davis
6f364de062 Add a QML document referencing the QML multimedia types to force inclusion in the build 2016-02-18 18:39:25 -08:00
Zach Pomerantz
2dd1cf2f15 Update Render.fromJSON to Render.load 2016-02-18 18:21:26 -08:00
Anthony Thibault
93f61fce7a OpenVRDisplayPlugin: predict poses for better tracking
Extrapolate the next set of poses for HMD and hand controllers.
Currently we predict 44ms into the future, this seems too high, however
it was discovered by inspection to be the best value.
Obviously there is a source of latency that we need to track down,
however even with this latency, it is a much improved experience.
2016-02-18 18:00:04 -08:00
Zach Pomerantz
981d4d37ca Update render/debug.js
- Add a toggle for the entire UI
- Set items sliders minimums to -1
- Fix off-by-one with debug buffer radios
2016-02-18 17:45:55 -08:00
Anthony J. Thibault
613b60658e Rig: prevent normalization of a zero vector 2016-02-18 10:24:36 -08:00
Chris Collins
e3ae2baa7b Merge pull request #7123 from ericrius1/editProps
added collidesWith property to entities list
2016-02-18 09:11:18 -08:00
James B. Pollack
acaa824cb5 but only position 2016-02-18 09:00:39 -08:00
James B. Pollack
e6662edcb4 revert step size change 2016-02-18 08:57:06 -08:00
Brad Hefta-Gaub
a3766a93ea Merge pull request #7128 from sethalves/fix-energy
minor adjustments to avatar-energy code
2016-02-17 20:04:35 -08:00
Brad Hefta-Gaub
39592a583f Merge pull request #7130 from ericrius1/editFix
fixed edit bug
2016-02-17 20:02:36 -08:00
ericrius1
5f5af9c6a0 fixed edit bug 2016-02-17 17:45:57 -08:00
James B. Pollack
5aa2979a86 Merge pull request #7127 from sethalves/BUGS
fix far-trigger
2016-02-17 16:29:44 -08:00
Anthony J. Thibault
73ac47724a Rig: Prevent the hand IK targets from entering the body.
Use a 2d circle/circle intersection test to keep the hands outside of the body.
2016-02-17 16:23:18 -08:00
James B. Pollack
89039747a2 Update entityProperties.html
lowercase 'static' like other props
2016-02-17 16:22:14 -08:00
Anthony Thibault
e863da5a68 Merge pull request #7118 from jherico/hmd_mono
Remove distortion on HMD previews, both mono and stereo
2016-02-17 15:39:48 -08:00
Brad Davis
8289c39a2a Removing flicker from OpenVR mirror 2016-02-17 14:48:24 -08:00
Seth Alves
af1640ac4e adjust avatar-energy code to avoid editing local tree and then not telling the entity-server about it 2016-02-17 14:36:18 -08:00
ericrius1
19cd3ec152 checkboxes working 2016-02-17 13:12:17 -08:00
Seth Alves
64e50c5329 keep search-line from freezing during a far-trigger 2016-02-17 12:35:23 -08:00
Seth Alves
784dc2b538 Merge pull request #7124 from samcake/red
Fixing the disappearing avatars maybe ?
2016-02-17 12:05:04 -08:00
Seth Alves
69caf1df4d fix far-trigger 2016-02-17 12:04:25 -08:00
ericrius1
94fdf6b091 checkboxes working 2016-02-17 11:59:14 -08:00
Anthony J. Thibault
3426173d1d AnimInverseKinematics: open up shoulder swing constraint. 2016-02-17 11:44:11 -08:00
ericrius1
f85916e808 checkbox keeps getting checked... 2016-02-17 10:27:53 -08:00
Brad Hefta-Gaub
38430d8d2c Merge pull request #7112 from howard-stearns/snap-turn-preference
Snap turn preference
2016-02-17 09:19:38 -08:00
Brad Hefta-Gaub
d5c349abec Merge pull request #7114 from samcake/hdr
Adding Ambient lighting to transparent surfaces
2016-02-17 09:08:38 -08:00
Andrew Meadows
07df96b6b3 Merge pull request #7125 from hyperlogic/tony/ik-bugfix
AnimInverseKinematics: fix for extra twist in lowerSpine joints.
2016-02-17 08:56:16 -08:00
ericrius1
0f8f67ef0b removing dynamic. need to add others 2016-02-16 19:34:32 -08:00
James B. Pollack
f2445e81e0 Merge pull request #7110 from ericrius1/particlesInEdit2
Particles in edit
2016-02-16 18:33:01 -08:00
ericrius1
168fb67d67 making collidesWith a checkbox 2016-02-16 18:19:12 -08:00
Howard Stearns
6d70584b5a Change name and use only when in HMD. 2016-02-16 18:09:56 -08:00
Anthony J. Thibault
2d1304e070 AnimInverseKinematics: use glm::clamp for clarity. 2016-02-16 18:00:45 -08:00
ericrius1
ce2d76d3f3 made export settings a text area 2016-02-16 17:57:09 -08:00
Anthony J. Thibault
b5a72225db AnimInverseKinematics: renamed variable for extra style points 2016-02-16 17:42:51 -08:00
Anthony J. Thibault
df21fffa4a AnimInverseKinematics: fix for extra twist in lowerSpine joints.
* When computing tipPosition, for the next iteration of the CCD,
  use the leverArm before it's projected onto the lowerSpine twist axis.
* fix for acos() that was going outside of valid domain. (-1.0, 1.0)
2016-02-16 17:31:39 -08:00
samcake
640bf81339 Forcing an update from teh avatar manager to the avatar renderItems when beeing updated 2016-02-16 17:19:31 -08:00
Brad Davis
d1583e8cbe Fixing warnings 2016-02-16 17:00:00 -08:00