Anthony J. Thibault
|
031f59b7b5
|
Support for adding soft attachments from script.
Also, bug fixes for setting MyAvatar.attachmentData property.
|
2016-01-07 16:12:36 -08:00 |
|
Seth Alves
|
01c9de4f9d
|
Merge pull request #6771 from ericrius1/directDistanceGrab
Squeezing bumper while distance grabbing now brings object to your hand in all cases
|
2016-01-06 15:30:23 -08:00 |
|
ericrius1
|
1f6e45d135
|
Fix for close grab jumping
|
2016-01-06 15:10:53 -08:00 |
|
Philip Rosedale
|
56967972e0
|
Merge pull request #6782 from AndrewMeadows/flying-speed
reduced avatar max fly speed
|
2016-01-06 15:08:08 -08:00 |
|
ericrius1
|
67f4c250fd
|
Search sphere goes away on far to near grab
|
2016-01-06 14:59:31 -08:00 |
|
ericrius1
|
cb03eda6d1
|
Instant far to near grabbing now works by using the bumper, or equip, button
|
2016-01-06 13:37:26 -08:00 |
|
Brad Davis
|
656a7da70a
|
Merge pull request #6779 from ZappoMan/onlyNotifyOwner
only emit collision events if you're the owner
|
2016-01-06 16:14:29 -05:00 |
|
Brad Hefta-Gaub
|
6ac8d081dc
|
include debug log in collision example
|
2016-01-06 13:02:07 -08:00 |
|
Brad Hefta-Gaub
|
d4e039ea7a
|
include debug log in collision example
|
2016-01-06 13:00:50 -08:00 |
|
Brad Hefta-Gaub
|
a5f618ef33
|
include debug log in collision example
|
2016-01-06 12:54:14 -08:00 |
|
Brad Hefta-Gaub
|
edc132efce
|
fix warning
|
2016-01-06 12:53:57 -08:00 |
|
Brad Hefta-Gaub
|
0b43685f1e
|
Merge branch 'master' of https://github.com/highfidelity/hifi into onlyNotifyOwner
|
2016-01-06 11:26:05 -08:00 |
|
Andrew Meadows
|
b8b113844f
|
reduced avatar max fly speed from 300 to 30
|
2016-01-06 11:22:58 -08:00 |
|
Brad Hefta-Gaub
|
a3ceb3a298
|
Merge pull request #6781 from sethalves/fix-network-version-number
fix network version number
|
2016-01-06 11:11:00 -08:00 |
|
Seth Alves
|
096ab44311
|
fix network version number
|
2016-01-06 11:01:31 -08:00 |
|
Brad Hefta-Gaub
|
f3aeaec6a9
|
Merge branch 'master' of https://github.com/highfidelity/hifi into onlyNotifyOwner
|
2016-01-06 10:58:50 -08:00 |
|
Seth Alves
|
8800a74186
|
Merge pull request #6778 from imgntn/mousegrabfix
Only grab/release mouse grab with left button
|
2016-01-06 10:36:36 -08:00 |
|
Anthony Thibault
|
95f821d61a
|
Merge pull request #6732 from sethalves/set-model-entity-joints
hook up a way for scripts to set model-entity joint state
|
2016-01-05 17:31:18 -08:00 |
|
Brad Davis
|
e4913a56ab
|
Merge pull request #6775 from sethalves/fix-polyvox-rendering
update polyvox shader to track changes in packDeferredFragment
|
2016-01-05 20:24:33 -05:00 |
|
Brad Davis
|
4a9c558809
|
Merge pull request #6776 from Atlante45/fix/lambda-crash
Cleanup web entity connections
|
2016-01-05 20:23:51 -05:00 |
|
Seth Alves
|
722fe46a27
|
Merge pull request #6777 from AndrewMeadows/whitespace
nothing but whitespace
|
2016-01-05 17:14:19 -08:00 |
|
Brad Hefta-Gaub
|
2435e160a8
|
only emit collision events if you're the owner
|
2016-01-05 16:56:24 -08:00 |
|
James B. Pollack
|
8c7c436ef2
|
fix
|
2016-01-05 16:54:18 -08:00 |
|
Clément Brisset
|
a2135dfdd2
|
Merge pull request #6720 from ctrlaltdavid/20760
Fix particle radius and rgba start, middle, finish interpolation
|
2016-01-05 16:48:13 -08:00 |
|
Andrew Meadows
|
9ab5ef358a
|
remove dangling whitespace
|
2016-01-05 16:44:36 -08:00 |
|
ericrius1
|
eb44e54d87
|
fixed merge conflicts
|
2016-01-05 16:28:22 -08:00 |
|
ericrius1
|
882ec9fe80
|
Using offset from intersection point to center of object for insta-grab
|
2016-01-05 16:24:15 -08:00 |
|
Seth Alves
|
086ea66c04
|
Merge branch 'master' of github.com:highfidelity/hifi into set-model-entity-joints
|
2016-01-05 16:24:10 -08:00 |
|
David Rowe
|
4d7ed6b68f
|
Whitespace
|
2016-01-06 13:20:44 +13:00 |
|
Brad Hefta-Gaub
|
5fad7aa51b
|
Merge pull request #6774 from imgntn/targetsfix
Fix Wall Targets Collision Callback
|
2016-01-05 16:18:59 -08:00 |
|
James B. Pollack
|
7c18359fba
|
cleanup
|
2016-01-05 16:17:11 -08:00 |
|
Atlante45
|
981c6c7af5
|
Cleanup web entity connections
|
2016-01-05 16:08:25 -08:00 |
|
Seth Alves
|
1e69f695b4
|
update polyvox shader to track changes in packDeferredFragment
|
2016-01-05 16:06:59 -08:00 |
|
James B. Pollack
|
68e03a08c0
|
targets fix
|
2016-01-05 15:43:49 -08:00 |
|
Seth Alves
|
b59934573a
|
Merge branch 'master' of github.com:highfidelity/hifi into set-model-entity-joints
|
2016-01-05 13:50:12 -08:00 |
|
Seth Alves
|
f7041136ff
|
put new property in right place
|
2016-01-05 13:26:16 -08:00 |
|
Brad Hefta-Gaub
|
c2f2f950fb
|
Merge pull request #6673 from hyperlogic/tony/get-palm-thread-safe
Make Avatar palm position/rotation accessors thread safe
|
2016-01-05 13:07:47 -08:00 |
|
Brad Davis
|
908c1072ce
|
Merge pull request #6763 from ZappoMan/scriptMessageBoxesOffscreen
move alert and confirm to use offscreen ui
|
2016-01-05 15:26:48 -05:00 |
|
Seth Alves
|
b222c12857
|
unmangle merge
|
2016-01-05 12:21:50 -08:00 |
|
Howard Stearns
|
95e74318df
|
Merge pull request #6757 from sethalves/improve-grab-action-reliability
be more careful about grab action -- if it somehow expires, reinstate it
|
2016-01-05 12:21:09 -08:00 |
|
Seth Alves
|
719c4562d1
|
Merge branch 'master' of github.com:highfidelity/hifi into set-model-entity-joints
|
2016-01-05 11:59:14 -08:00 |
|
Philip Rosedale
|
f30af27ac8
|
Merge pull request #6770 from birarda/zlib-external
use an s3 link for zlib dependency
|
2016-01-05 11:57:46 -08:00 |
|
Seth Alves
|
cd82383d33
|
Merge branch 'master' of github.com:highfidelity/hifi into improve-grab-action-reliability
|
2016-01-05 11:13:38 -08:00 |
|
Seth Alves
|
942e77166e
|
merge from upstream
|
2016-01-05 11:11:19 -08:00 |
|
Anthony J. Thibault
|
a21b604746
|
Simplified implementation of ThreadSafeValueCache
|
2016-01-05 11:08:08 -08:00 |
|
Andrew Meadows
|
0473891e86
|
Merge pull request #6671 from sethalves/near-grab-via-parenting
queryAACube plumbing
|
2016-01-05 11:01:28 -08:00 |
|
ericrius1
|
a80e77ff80
|
Squeezing bumper while distance grabbing now brings object to your hand
|
2016-01-05 11:01:00 -08:00 |
|
Andrew Meadows
|
62688d5c07
|
Merge pull request #6768 from jherico/vr_keys
Tweaks for supporting the new QML UI
|
2016-01-05 10:31:57 -08:00 |
|
Seth Alves
|
212d2d9e8f
|
merge from upstream
|
2016-01-05 10:27:45 -08:00 |
|
Howard Stearns
|
5f85e0a4c0
|
Merge pull request #6769 from hyperlogic/tony/marketplace-avatar-attachment-support
Interface support for avatar attachments from Marketplace
|
2016-01-05 10:17:33 -08:00 |
|