Brad Hefta-Gaub
a526db1779
Merge branch 'master' of https://github.com/highfidelity/hifi into avatarMixerLoopImprovements
2017-02-21 14:18:36 -08:00
Stephen Birarda
78301fd947
call getParentPointer when parent ID changes to update children
2017-02-16 16:46:09 -08:00
Brad Hefta-Gaub
faa8e629a0
checkpoint
2017-02-15 20:28:32 -08:00
Seth Alves
bc5f563f57
make _parentID and _parentJointIndex private to avoid accidental direct access
2017-02-12 11:37:29 -08:00
Atlante45
2962dd6dc2
Factor LogDialog
2017-02-09 13:04:43 -08:00
Brad Hefta-Gaub
74f10a1e7f
Merge pull request #9603 from huffman/feat/trace-thread-script
...
Add thread names and scripts to chrome traces
2017-02-09 13:00:05 -08:00
Andrew Meadows
a871613f84
make Settings::remove() work for groups
2017-02-08 11:49:40 -08:00
Anthony Thibault
caefb6c711
Merge pull request #9620 from hyperlogic/bug-fix/find-entity-bug
...
Fix for findEntities not returning some entities that are within range.
2017-02-06 20:22:34 -08:00
Anthony J. Thibault
a14dcbd513
Fix for findEntities not returning some entities that are within range.
...
This bug has been around a long time... introduced by commit 39ed7f7b
2017-02-06 15:13:25 -08:00
Seth Alves
ad83f20199
make findAncestorOfType understand AVATAR_SELF_ID
2017-02-03 16:43:36 -08:00
Seth Alves
c7200d2d3a
make hasAncestorOfType understand AVATAR_SELF_ID
2017-02-03 16:14:15 -08:00
Ryan Huffman
55df6f8f76
Add tracing to ScriptEngine and EntitiesScriptingInterface
2017-02-03 09:45:33 -08:00
Ryan Huffman
a5e61184bf
Add support for adding thread names to a trace
2017-02-03 09:18:51 -08:00
Brad Hefta-Gaub
3bbb57599b
Merge pull request #9565 from kencooke/cpudetect-gcc-bugfix
...
Fix bug that causes GCC not to detect AVX2
2017-01-31 11:11:35 -08:00
Brad Hefta-Gaub
cff49ea5f3
Merge pull request #9556 from samcake/blue
...
Adding support for disabling texturing from the material
2017-01-31 10:39:44 -08:00
Seth Alves
7c2957cfa7
merge from upstream
2017-01-31 08:57:36 -08:00
Ken Cooke
2ce357db3a
Fix bug that causes GCC not to detect AVX2
2017-01-30 17:11:48 -08:00
samcake
3c56bd2960
Adding support for disabling texturing from the material
2017-01-30 15:03:04 -08:00
Andrew Meadows
8cf7aee009
fix bug: second collision event with bad data
2017-01-30 13:21:23 -08:00
Seth Alves
fa61bbe2a6
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-01-26 18:21:39 -08:00
ZappoMan
4c80422a73
Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo
2017-01-26 14:34:58 -08:00
Seth Alves
db38503d57
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-01-26 13:48:59 -08:00
samcake
19858bda78
Merge pull request #9493 from AndrewMeadows/otherAvatars
...
optimize, prioritize, and timebox processing of avatar updates
2017-01-26 13:30:51 -08:00
Seth Alves
0b51b1d566
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-01-26 11:00:02 -08:00
Brad Hefta-Gaub
0c9e42e2d9
Merge pull request #9486 from huffman/fix/overlay-parent-reg-point
...
Fix Overlay-as-child of model entity with reg point
2017-01-26 10:59:01 -08:00
Andrew Meadows
d8a10320d1
fix warning about implicit cast
2017-01-26 08:35:25 -08:00
ZappoMan
3c3dcbbbaa
Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo
2017-01-26 08:20:03 -08:00
Seth Alves
c317ba8054
merge from upstream
2017-01-25 15:57:53 -08:00
Atlante45
f540c94113
Merge branch 'master' of https://github.com/highfidelity/hifi into ess-pr
2017-01-25 13:06:49 -08:00
ZappoMan
cb812ca506
CR feedback
2017-01-24 12:06:31 -08:00
Ryan Huffman
f0f5f8871c
Fix Overlay-as-child of model entity with reg point
...
This fixes as issue where when you set the parent of an overlay to be a
model entity with a non-(0.5, 0.5, 0.5) registration point, the overlay would
still be positioned relative to the center of the model. The issue is
that the default parent joint index was 0, which is the center of the
model.
Entities had a default parent joint index of -1 (technically 65535
because it is a uint16). Avatars previously defaulted to 0, and that is
maintained here.
2017-01-23 16:08:01 -08:00
ZappoMan
6801099cd9
more cleanup
2017-01-23 16:03:07 -08:00
ZappoMan
29fff2e556
Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo
2017-01-23 13:09:59 -08:00
Seth Alves
be8bc9652b
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-01-23 09:44:04 -08:00
Stephen Birarda
5c5c69fff3
setup the repeated message flusher on LogHandler thread
2017-01-20 11:20:48 -08:00
Andrew Meadows
10cdea9cd8
cleanup model fade logic
2017-01-19 14:17:50 -08:00
Seth Alves
b57803057d
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-01-18 06:38:44 -08:00
Brad Davis
a593a2116a
Removing magic numbers
2017-01-17 18:15:40 -08:00
Brad Davis
cbc89e77ab
Consume fewer resources in AssetServer when interface is running locally
2017-01-17 18:15:39 -08:00
Seth Alves
6bace4f451
merge from upstream
2017-01-17 09:29:30 -08:00
Stephen Birarda
1993e358d6
Merge pull request #9318 from birarda/ovr-platform-entitlement
...
handle OVR Platform entitlement checks
2017-01-16 11:16:31 -08:00
ZappoMan
fe06dfdca7
tweak audioLoudness packing
2017-01-11 18:58:43 -08:00
ZappoMan
0661531e3a
try another version of an 8bit audio loudness
2017-01-11 17:51:12 -08:00
ZappoMan
5b76eaaf52
Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo
2017-01-11 10:22:14 -08:00
Seth Alves
bacc796730
Merge branch 'master' of github.com:highfidelity/hifi into update-tablet-ui-again
2017-01-11 09:54:26 -08:00
Brad Davis
1dd2747ef9
Push some tracing into 'detail' categories for easy filtering. Add new tracing categories, add counter change tracking.
2017-01-10 10:44:04 -08:00
Seth Alves
eb4a2b0af5
Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui-grab-no-patch
2017-01-10 09:13:34 -08:00
Seth Alves
4a29cce584
adjust when USER_COLLISION_GROUP_MY_AVATAR is auto-disabled
2017-01-10 06:17:40 -08:00
samcake
8c7ec8b0c5
Add profiling in COntext batch execution and shortcuts for trace names
2017-01-09 18:05:02 -08:00
Seth Alves
45a26d599f
if something is a child of the local avatar, never let it collide with MY_AVATAR
2017-01-09 16:40:28 -08:00
