Zach Fox
4cf6f2d8b8
Merge pull request #11188 from davidkelly/dk/makeMeSomeKeys
...
Wallet needs some keys
2017-08-16 10:56:34 -07:00
David Kelly
73e943daaf
Merge branch 'master' of https://github.com/highfidelity/hifi into dk/makeMeSomeKeys
2017-08-16 10:13:08 -07:00
Brad Hefta-Gaub
714027d2e2
Merge pull request #11196 from hyperlogic/bug-fix/avatar-capsule-issues
...
Fix for incorrectly sized avatar capsule collision
2017-08-16 09:58:39 -07:00
Zach Fox
c024bd2d83
Merge pull request #11195 from zfox23/commerce_securityImage1
...
Commerce: First pass at security images (NOT FINAL)
2017-08-16 09:57:55 -07:00
SamGondelman
86cc938a47
Merge remote-tracking branch 'upstream/master' into sharks
2017-08-16 09:54:12 -07:00
Olivier Prat
9691c957e4
Merge branch 'master' of git://github.com/highfidelity/hifi into fadeinvertfix
2017-08-16 09:41:49 +02:00
Liv
36ff82db6b
Merge pull request #11056 from misslivirose/feat/domain-setup
...
[Protocol Change] Allow specified users/groups to replace domain content from within Interface
2017-08-15 20:29:25 -07:00
SamGondelman
a641fb7a7f
rename qvector findRayIntersection to avoid script conflicts
2017-08-15 18:03:52 -07:00
Anthony J. Thibault
e9b8e5431d
Fix for incorrectly scaled bounding volumes when switching avatars
...
Make sure to explicitly set the _geometryToRigTransform in Rig::initJointStates().
This should fix small bounding volume when switching from the Gamebot avatar (which has 0.008 scaling)
to another avatar (which ususally have 0.01 scaling).
2017-08-15 17:26:51 -07:00
Zach Fox
2fa1bd25a8
Clipping and mipping!
2017-08-15 16:45:46 -07:00
Zach Fox
984a5aea2c
You can now spawn infinite copies of items you've previously purchased
2017-08-15 16:32:23 -07:00
Zach Fox
5c157a7397
Move security image to top left
2017-08-15 16:24:14 -07:00
Zach Fox
ccf2d71036
V1 done
2017-08-15 16:11:34 -07:00
Zach Fox
29a9ae28e9
Fixes
2017-08-15 15:36:28 -07:00
Liv
1ae4a5c019
remove class from function call
2017-08-15 15:30:43 -07:00
Zach Fox
d376630bde
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_securityImage1
2017-08-15 15:03:02 -07:00
Zach Fox
768eb7f91c
Getting closer
2017-08-15 15:02:28 -07:00
Liv
aea5f170f2
Merge branch 'master' of https://github.com/highfidelity/hifi into feat/domain-setup
2017-08-15 13:58:22 -07:00
Liv
49eab847fd
Refactor handleOctreeFileReplacement, style changes, align with handler for other file types
2017-08-15 13:58:02 -07:00
Liv
c0fa446b75
Remove domain management scripting interface
2017-08-15 13:49:13 -07:00
Anthony J. Thibault
f46198c2fd
Simplified/Improved avatar capsule calculation
...
IK is no longer performed during capsule calculation, This fixes an issue with the mannequin avatar in the marketplace.
Specifically, it was causing the hips to rise during IK which would result in an incorrectly sized and offset capsule.
2017-08-15 13:48:10 -07:00
Zach Fox
b7282cc776
Lots of fixes
2017-08-15 13:46:20 -07:00
Anthony Thibault
342f8acff5
Merge pull request #11176 from hyperlogic/feature/improve-hand-body-collision
...
Improve avatar hand vs body collision
2017-08-15 13:43:21 -07:00
SamGondelman
9bb7e66859
separate raypickscriptinginterface, cleanup
2017-08-15 13:36:41 -07:00
Zach Fox
528d2072f9
Bugfixes and improvements
2017-08-15 12:14:32 -07:00
Anthony J. Thibault
6e0ddadb29
Fix for array size.
2017-08-15 11:45:22 -07:00
David Kelly
0f7db74ef1
missed a couple warnings
2017-08-15 11:44:15 -07:00
Dante Ruiz
84738f51c2
fixed tab issue
2017-08-15 11:21:43 -07:00
Dante Ruiz
3a8856fae6
fix selection issue for TreeView.qml
2017-08-15 11:21:34 -07:00
Anthony J. Thibault
04006a9f76
code review feedback
2017-08-15 11:19:41 -07:00
Zach Fox
bddce9328b
V1
2017-08-15 11:08:03 -07:00
Elisa Lupin-Jimenez
072f3dfb03
removed commented out code, removed blocks from default scripts
2017-08-15 10:25:14 -07:00
David Kelly
a6390edf46
ugh
2017-08-15 10:10:48 -07:00
Elisa Lupin-Jimenez
3d7995da34
Merge branch 'master' of https://github.com/highfidelity/hifi into blocks
2017-08-15 10:01:24 -07:00
Sam Gateau
2a75cde48a
Merge pull request #11185 from samcake/blue
...
Fixing the graphics setting for Ambient Occlusion
2017-08-15 09:26:45 -07:00
Sam Gateau
d624413c14
Merge pull request #11189 from SamGondelman/line3DFix
...
Fix drawInFront overlays only rendering in left eye
2017-08-15 09:26:18 -07:00
David Kelly
c08fce967f
forgot a warning
2017-08-15 08:58:16 -07:00
SamGondelman
1c27335193
a couple logging fixes
2017-08-14 17:34:32 -07:00
Seth Alves
21cef482a5
Merge pull request #11190 from druiz17/fix-table-dialog
...
Fixed unable to select items in a TreeView
2017-08-14 17:05:42 -07:00
David Kelly
ef5863d169
warnings squashed
2017-08-14 16:24:50 -07:00
SamGondelman
194b7d6655
warning
2017-08-14 16:08:07 -07:00
Dante Ruiz
459f2c5cdc
fixed tab issue
2017-08-14 16:03:12 -07:00
Dante Ruiz
99617600c4
fix selection issue for TreeView.qml
2017-08-14 15:58:28 -07:00
Zach Fox
823f2fb252
Merge pull request #11181 from cain-kilgore/skybox-changer
...
WL 21447 - Create a Skybox Changer
2017-08-14 15:08:03 -07:00
Zach Fox
ee4a07b10d
Merge pull request #11187 from zfox23/context_removeWhenDeleting
...
Remove context overlay (if present) when removing entity
2017-08-14 15:06:20 -07:00
SamGondelman
8163430282
fix depth buffer issue that was messing with drawInFront, plus some small fixes to line3ds
2017-08-14 15:03:14 -07:00
Cain Kilgore
e7a4bff705
Made Changes per Review, added js
2017-08-14 22:47:18 +01:00
Anthony Thibault
9af6f2683a
Merge pull request #11083 from Menithal/experimental-face-expressions
...
Opened up setForceFaceTrackerConnected
2017-08-14 14:19:08 -07:00
druiz17
97aa92bc44
Merge pull request #11170 from cain-kilgore/web-browser-assets
...
Added Assets for Web Browser MP Script
2017-08-14 13:50:11 -07:00
David Kelly
170d2b186b
url encode the base64 signature/key
2017-08-14 13:48:09 -07:00
