SamGondelman
6ca02dcad2
expose Controller.triggerHapticPulse to javascript (currently does nothing)
2016-06-02 12:11:13 -07:00
Zach Pomerantz
a8228d42ee
Improve max users explanation
2016-06-02 11:57:24 -07:00
SamGondelman
c9ea85e659
fixed left hand rotation
2016-06-02 10:50:22 -07:00
samcake
25eb569433
Merge branch 'master' of https://github.com/highfidelity/hifi into color
2016-06-02 10:38:40 -07:00
SamGondelman
9984667742
touch properly sets pose.valid and further corrected hand rotation
2016-06-02 10:09:41 -07:00
Anthony J. Thibault
0035774eb2
Fix for models exported from Daz3D.
...
The way post rotations were being applied was incorrect.
I guess we've never tried a model that used the Maya Rotate Axis property before...
2016-06-02 10:07:09 -07:00
SamGondelman
7bd29c13b0
corrected oculus touch rotation and converted hand pose to avatar coordinate system
2016-06-02 09:09:25 -07:00
David Rowe
44fe7c1144
Add Entities.getChildrenIDs() method
2016-06-02 21:26:33 +12:00
David Rowe
7a8954d851
Merge branch 'master' into clipboard-dimensions
2016-06-02 12:55:23 +12:00
samcake
7de5b80179
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2016-06-01 17:52:36 -07:00
samcake
1dca62f752
Introducing a new technique for normal packing and fixing a bug on the normal buffer format
2016-06-01 17:51:53 -07:00
James B. Pollack
b171b5e9eb
update blocky
2016-06-01 13:40:46 -07:00
James B. Pollack
3bc2725844
Merge remote-tracking branch 'upstream/master' into moreshelfstuff
2016-06-01 10:37:03 -07:00
Peter Clemenko III
036fd0c4af
Update the build docs for a better OpenSSL security posture. There are around 19 CVEs in the current recommended version.
2016-06-01 10:35:36 -04:00
David Rowe
b65938b631
Adjust default and minimum sizes
2016-06-01 16:23:26 +12:00
Brad Hefta-Gaub
35b80ba066
Merge pull request #7990 from ZappoMan/revert7943
...
Revert PR-7943
2016-05-31 21:21:12 -07:00
David Rowe
c4aed1ce06
Remove "Open Folder" button
2016-06-01 16:16:08 +12:00
Brad Hefta-Gaub
3119b654dc
additional revert related change
2016-05-31 20:50:12 -07:00
Brad Hefta-Gaub
b8c80e2222
Revert "refresh API info during re-connect - case 570"
...
This reverts commit e8d7f9614a
2016-05-31 20:39:16 -07:00
David Rowe
4da1c0ac4d
Click on blank part of dialog to deselect item
2016-06-01 14:25:07 +12:00
David Rowe
eddfe4847a
Select nothing by default when navigate up/down directory structure
2016-06-01 14:22:54 +12:00
samcake
ae7d817705
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2016-05-31 15:38:07 -07:00
Andrew Meadows
1eb0b6a231
apply FBXGeometry.scaleOffset to mesh vertices
2016-05-31 11:38:58 -07:00
David Rowe
437607998f
Adjust minimum size of file browser dialog to keep all buttons visible
2016-05-30 14:20:13 +12:00
David Rowe
fd467caf86
Add "Open Folder" button to file browser dialog
2016-05-30 14:19:25 +12:00
Brad Hefta-Gaub
b3a43c40a9
remove audio test file
2016-05-29 14:16:30 -07:00
Brad Hefta-Gaub
2ed95542a9
use sound file from S3
2016-05-29 13:56:09 -07:00
Brad Hefta-Gaub
1fb8f659a7
add test content
2016-05-29 13:33:24 -07:00
Brad Hefta-Gaub
f65f99a3e0
fix warning
2016-05-29 12:34:57 -07:00
Brad Hefta-Gaub
7fd531541c
simplify
2016-05-29 12:08:10 -07:00
Brad Hefta-Gaub
1e7cd06d0e
add audio peak limiter to audio mixer
2016-05-28 20:34:27 -07:00
samcake
3fe9b67e45
FIxing the reflection jittering by moving the normal into world space
2016-05-27 19:24:56 -07:00
Brad Hefta-Gaub
cb3dfa0457
Merge pull request #7983 from ZappoMan/fixShapes
...
fix shapes to property polymorph and persist
2016-05-27 17:56:25 -07:00
Brad Hefta-Gaub
0ec7eae58c
fix shapes to property polymorph and persist
2016-05-27 16:59:42 -07:00
Zach Pomerantz
b280eebd03
Only count users against max capacity
2016-05-27 15:51:41 -07:00
Brad Davis
ac5912df01
Fix crash on shutdown of SteamVR
2016-05-27 13:40:47 -07:00
Brad Hefta-Gaub
76940bad34
Merge pull request #7897 from howard-stearns/reset-hud-on-driving
...
reset hud on driving
2016-05-27 10:40:12 -07:00
Howard Stearns
5b6660e7ea
Default preference to false.
2016-05-27 10:35:46 -07:00
Howard Stearns
e4d36cc2c2
Merge branch 'master' of https://github.com/highfidelity/hifi into reset-hud-on-driving
2016-05-27 10:32:01 -07:00
Howard Stearns
abd2b150f5
Merge branch 'reset-hud-on-driving' of https://github.com/howard-stearns/hifi into reset-hud-on-driving
2016-05-27 10:31:42 -07:00
Chris Collins
3e79b67612
Merge pull request #7977 from hyperlogic/bug-fix/avatar-lod
...
Bugfix for avatar LOD
2016-05-27 10:15:26 -07:00
Andrew Meadows
1132b4666a
Merge pull request #7975 from jherico/shared_shapes
...
Moving shape definition to a shared location
2016-05-27 07:28:11 -07:00
Chris Collins
8ad572a269
Merge pull request #7976 from birarda/session-id-with-place-request
...
send session ID in AccountManager without curly braces
2016-05-26 15:59:18 -07:00
Brad Davis
6a962d7aab
Unix build fix
2016-05-26 15:51:36 -07:00
Stephen Birarda
1ec421350d
send the UUID session ID without curly braces
2016-05-26 14:56:51 -07:00
Anthony J. Thibault
b4d14f06d8
Bugfix for avatar LOD
...
If an avatar was LOD'ed out, it would never become visible again, because the bounds of the skeleton model were never again.
This ensures that the model bound is updated, even when the avatar is LOD'ed away.
2016-05-26 14:35:17 -07:00
howard-stearns
9ff1a695f0
Merge branch 'master' of https://github.com/highfidelity/hifi into reset-hud-on-driving
2016-05-26 13:52:23 -07:00
Chris Collins
4120ed9f0b
Merge pull request #7964 from ZappoMan/protocolVersionCheck
...
check for all protocols matching when connecting to a domain
2016-05-26 13:02:18 -07:00
Brad Davis
2c02c963d4
Moving shape definition to a shared location
2016-05-26 12:22:39 -07:00
Brad Hefta-Gaub
88813c47f0
Merge pull request #7960 from howard-stearns/fix-hand-controllers-after-input-changes
...
Fix hand controller pointer after input changes.
2016-05-26 12:16:23 -07:00
