Anthony Thibault
fa137f0586
Merge remote-tracking branch 'upstream/master' into feature/improve-eye-look-at-interest-calculation
2019-01-03 13:19:11 -08:00
John Conklin II
3fa1acbf87
Merge pull request #14472 from sethalves/grab-traits
...
use Traits system for grabbing
2019-01-03 11:23:11 -08:00
Seth Alves
b2f25629eb
don't allow scaling of others' equipped entities
2019-01-03 08:19:18 -08:00
Seth Alves
ad1235ce94
also bump entity protocol version
2019-01-03 08:19:13 -08:00
Seth Alves
a7515a4bde
include owningAvatarID in entityPropertyFlagsFromScriptValue
2019-01-03 08:18:34 -08:00
Seth Alves
306c54c060
fix code that allows adjusting of own avatar entities while forbidding adjusting those of others
2019-01-03 08:17:52 -08:00
Seth Alves
3ccbd0bc7b
disable positionand velocity script edits on grabbed entities
2019-01-03 08:17:52 -08:00
Seth Alves
bf46960dc3
fix timing on startNearGrab entity-method call for cloned entities. Don't allow grabbing of other's equipped or worn entities
2019-01-03 08:17:52 -08:00
Seth Alves
3c0243419b
trying again on avatar-entity grab releases
2019-01-03 08:17:52 -08:00
Seth Alves
54a5805b5c
add final edit when dropping an avatar-entity. don't allow grabbing of other's avatar entities
2019-01-03 08:17:52 -08:00
Seth Alves
05a80ae0e4
don't bootstrap with a traits-based grab
2019-01-03 08:17:52 -08:00
Seth Alves
9bf9e379a3
fix far-grab initial rotation and entity-method call
2019-01-03 08:17:52 -08:00
Seth Alves
613f290226
don't attempt to grab other's avatar-entities
2019-01-03 08:17:52 -08:00
Seth Alves
895e8cdba1
fix off-hand adjustment of equipped entities. make traits-based grabbing be enabled by default, again
2019-01-03 08:17:52 -08:00
Seth Alves
bc5079e5d7
fix flawed logic in updateEntityQueryAACubeWorker
2019-01-03 08:17:52 -08:00
Seth Alves
38cc2205ec
dimensions is a simulation restricted change
2019-01-03 08:17:52 -08:00
Seth Alves
0967a94557
get grabbing and scaling to get along better
2019-01-03 08:17:52 -08:00
Seth Alves
905af34564
disable traits-based grabbing by default
2019-01-03 08:17:52 -08:00
Seth Alves
6a547d042c
port over PR-14276
2019-01-03 08:17:52 -08:00
Seth Alves
1c1e648b8b
port over PR-14429
2019-01-03 08:17:52 -08:00
Seth Alves
9900040ece
enable trait-based grabbing by default
2019-01-03 08:17:52 -08:00
Seth Alves
70b68294ff
port over PR-14464
2019-01-03 08:17:52 -08:00
Seth Alves
6f25c59a0c
turn-off nearEntityGrab when scaleEntity is active
2019-01-03 08:17:52 -08:00
Seth Alves
fc128b49de
don't crash when releasing an entity that has expired
2019-01-03 08:17:52 -08:00
Seth Alves
78aff6e95c
grab js api; send grab information through trait system
2019-01-03 08:17:52 -08:00
Sam Gondelman
aeafb3c9a7
Merge pull request #14569 from SamGondelman/NOverlays6
...
Case 20281: Add missing Text Entity properties
2019-01-02 18:07:37 -08:00
Anthony Thibault
006bd8f939
Merge remote-tracking branch 'upstream/master' into feature/improve-eye-look-at-interest-calculation
2019-01-02 16:58:10 -08:00
Antonina Savinova
4838a9107a
Merge pull request #14624 from davidkelly/dk/17207
...
ACs don't need to call into flagtimeForConnecitonStep
2019-01-02 13:41:30 -08:00
Ryan Huffman
f3d2d7c95b
Merge pull request #14638 from huffman/fix/entity-list-text-mb
...
Fix texture MB column not sorting correctly in entity list
2019-01-02 13:32:05 -08:00
Jeff Clinton
d5ef7ba175
Merge pull request #14610 from roxanneskelly/Case20106
...
Case 20106-AC agents spawned with -n don't come back
2019-01-02 11:07:40 -08:00
Anthony Thibault
71991c2e2f
Added max angles and isTalking into the lookAtCostFunction
2019-01-02 11:05:01 -08:00
SamGondelman
32bec57cfe
Merge remote-tracking branch 'upstream/master' into NOverlays6
2019-01-02 09:53:29 -08:00
Jeff Clinton
7143689ddf
Merge pull request #14620 from amantley/hmdSmoothFix
...
VIVE can now auto-detect hmd and desktop modes
2019-01-02 09:15:32 -08:00
Jeff Clinton
bb27acf934
Merge pull request #14530 from SamGondelman/NOverlays4
...
Case 20134: Grid Entities
2019-01-02 09:12:34 -08:00
Jeff Clinton
032178673a
Merge pull request #14634 from SamGondelman/NOverlays5
...
Case 20200: Update EntityScriptingInterface to not find local entities (#2 )
2019-01-02 09:00:56 -08:00
Anthony Thibault
d87bc3e898
Update eye look at interest calculation
...
This now takes distance, your facing toward them, and their facing toward you into the interest calculation.
Also, separate the logic for myAvatar look at from other avatars snapping their gaze toward myAvatar.
Previously these two separate elements where merged together in a single loop.
2018-12-31 13:37:22 -08:00
Adam Smith
833ad936c0
Merge pull request #14630 from jherico/fix/20284_master
...
Fix for Oculus reset view issue
2018-12-28 16:24:40 -08:00
Adam Smith
52980559b8
Merge pull request #14491 from SamGondelman/v3
...
Case 20080: v3 + v4 procedurals and misc shader fixes
2018-12-28 15:17:50 -08:00
Ryan Huffman
e7f7f295b0
Merge pull request #14583 from dback2/unityAvatarExporter2
...
Avatar Exporter - joint rotation offsets and file workflow changes
2018-12-28 15:14:55 -08:00
John Conklin II
4f3dd390b5
Merge pull request #14625 from SamGondelman/deprecateDashed
...
Case 20392: Deprecated 3D Overlay dashed/isDashed
2018-12-28 10:16:27 -08:00
Adam Smith
0d27cb65ca
Merge pull request #14576 from sabrina-shanman/hfm_prep_graphics
...
(case 20297) Move graphics preparation from Serializers to runtime preparation step
2018-12-27 15:46:21 -08:00
Brad Hefta-Gaub
440f517b88
Merge pull request #14602 from samcake/punk
...
Case 20303 : Cleaning up the render view tasks and jobs for better 2ndary camera
2018-12-27 15:43:17 -08:00
Ryan Huffman
9c60b09c6b
Fix texture MB column not sorting correctly in entity list
2018-12-27 14:50:12 -08:00
unknown
b0ae323d52
better extension check
2018-12-27 13:07:33 -08:00
unknown
87026a85f1
CR changes
2018-12-27 12:56:44 -08:00
unknown
65cc683f80
fix case-sensitivity on fbx
2018-12-26 12:16:51 -08:00
SamGondelman
87947a7165
try to fix grid color issue
2018-12-25 02:17:37 -05:00
SamGondelman
a25c9395b3
glsl initializer lists are 4.2
2018-12-25 00:46:42 -05:00
SamGondelman
8dae2502ee
fix overlay picking
2018-12-22 02:21:29 -05:00
SamGondelman
64b461274b
remove new API
...
(cherry picked from commit 5eccaad135
2018-12-22 01:45:56 -05:00
