Commit graph

51159 commits

Author SHA1 Message Date
Brad Hefta-Gaub
5914cbe1a1 Merge pull request #9654 from ZappoMan/binaryDataOverMessages
allow larger sized messages
2017-02-13 09:20:35 -08:00
Seth Alves
27d55d6ff0 bump avatar-mixer protocol version 2017-02-13 07:30:33 -08:00
Brad Hefta-Gaub
83638d3cd9 Merge branch 'master' of https://github.com/highfidelity/hifi into binaryDataOverMessages 2017-02-12 13:33:21 -08:00
Brad Hefta-Gaub
d82edaa36e implement support for larger message payloads 2017-02-12 13:33:07 -08:00
Seth Alves
107442eea0 avoid extra sends to localPosition 2017-02-12 11:56:38 -08:00
Seth Alves
bc5f563f57 make _parentID and _parentJointIndex private to avoid accidental direct access 2017-02-12 11:37:29 -08:00
Seth Alves
0c2abc9883 fix handling of an avatar's parent changing 2017-02-12 10:01:30 -08:00
Seth Alves
1164a1b3bf some fixes for when an avatar is a child of something else 2017-02-12 08:27:39 -08:00
Kunal Gosar
c3f2f5779a fix if else syntax 2017-02-11 15:46:49 -08:00
Kunal Gosar
975d844eee syntax fix 2017-02-11 15:01:02 -08:00
Kunal Gosar
18e776bd29 emit signal only on change 2017-02-11 13:58:23 -08:00
humbletim
9b0bee92d1 add executeOnScriptThread 2017-02-11 06:21:11 -05:00
humbletim
0f7652e173 * integrate with latest master
* consolidate emit entityScriptDetailsUpdated calls
* limit maxRetries to 1 when isEntityServerScript()
2017-02-11 06:00:31 -05:00
humbletim
831bf93500 * refactor ScriptCache per FIXMEs
* include error details in BatchLoader results
* update EntityServerScript properties in edtior to reflect more granular statuses
* ScriptEngine plumbing in prep for require/module integration
2017-02-11 04:47:31 -05:00
David Rowe
77f0fb1491 Change the "Mute" tablet button to "Audio" 2017-02-11 22:40:19 +13:00
David Rowe
98c1a18326 Fix accumulating signal connections 2017-02-11 21:02:23 +13:00
kunalgosar
9c537726e5 Fix stuck in pause error with browsers 2017-02-10 18:13:09 -08:00
David Rowe
a08347936e Make clicking the tablet mic icon or audio bar toggle the mute state 2017-02-11 15:11:27 +13:00
kunalgosar
a8f223518c modified away script to use MyAvatar.isAway property 2017-02-10 17:28:12 -08:00
kunalgosar
691f61983a added isAway property to MyAvatar 2017-02-10 17:28:12 -08:00
samcake
13d1642ace Merge branch 'master' of https://github.com/highfidelity/hifi into ambient 2017-02-10 15:46:33 -08:00
Brad Hefta-Gaub
e6142d9719 Merge pull request #9645 from ZappoMan/binaryDataOverMessages
implement support for binary data over messages
2017-02-10 15:12:56 -08:00
samcake
2da1801fbf Fixing the failing shader 2017-02-10 14:40:39 -08:00
David Rowe
acaf8c69c6 Better tablet mic muted and unmuted iconography 2017-02-11 11:07:31 +13:00
Andrew Meadows
66a315cb9c cap number of avatar entities 2017-02-10 13:14:20 -08:00
Andrew Meadows
d2315c15a1 avoid duplicate parse of AvatarEntityData entries 2017-02-10 13:14:20 -08:00
Andrew Meadows
c551a41e0a restore exposure of setAvatarEntityData() to JS 2017-02-10 13:14:20 -08:00
Andrew Meadows
563bf65e89 fix bug: performance problem for avatarEntities 2017-02-10 13:14:20 -08:00
Andrew Meadows
ee702f945f cleanup around when to send identityPacket 2017-02-10 13:14:20 -08:00
Andrew Meadows
0e504e9ec6 make methods private: avoid sanity check logic 2017-02-10 13:14:20 -08:00
David Rowe
b5b92c1508 Make the tablet's mic icon reflect the current mute state 2017-02-11 09:53:02 +13:00
samcake
c4364e0f61 Merge branch 'master' of https://github.com/highfidelity/hifi into ambient 2017-02-10 11:41:07 -08:00
samcake
b9102204ea FIx the filtering problem on color and normals introduced since we generate mips with QImage 2017-02-10 11:40:39 -08:00
Brad Hefta-Gaub
765500ebce remove debug and fix bug in test script 2017-02-10 10:09:03 -08:00
Brad Hefta-Gaub
f6d4dbb7a4 some debugging 2017-02-10 09:18:04 -08:00
Ken Cooke
542a668723 Merge pull request #9641 from zzmp/load/test
log AVX2 support in audio-mixer
2017-02-10 08:13:20 -08:00
David Rowe
8a995cc1d2 Display list of audio input devices before list of audio output devices 2017-02-10 20:14:52 +13:00
David Rowe
9e3d8b0b6d Move the audio devices list into the root audio dialog 2017-02-10 20:11:20 +13:00
Brad Hefta-Gaub
7fba30f0dd add a test script to show binary message passing 2017-02-09 22:21:51 -08:00
Brad Hefta-Gaub
6a4f66677e Merge branch 'master' of https://github.com/highfidelity/hifi into binaryDataOverMessages 2017-02-09 21:10:10 -08:00
Brad Hefta-Gaub
987f147ed4 implement support for binary data over messages 2017-02-09 20:41:34 -08:00
Clément Brisset
20c8c8c278 Merge pull request #9636 from huffman/feat/stopwatch-updates
Stopwatch updates
2017-02-09 14:11:45 -08:00
Brad Hefta-Gaub
e329696cc8 Merge pull request #9581 from Atlante45/ess-pr
Add log window for the EntityScriptServer in interface.
2017-02-09 13:31:15 -08:00
Atlante45
3a30de79aa CR 2017-02-09 13:04:43 -08:00
Atlante45
72ed1add94 CR log spam cleanup 2017-02-09 13:04:43 -08:00
Atlante45
6fbe3c9187 Windows specific changes 2017-02-09 13:04:43 -08:00
Atlante45
43d2501993 Add HMD friendly window for the ESS log 2017-02-09 13:04:43 -08:00
Atlante45
0f39356e94 Only users with perm rez can see the log 2017-02-09 13:04:43 -08:00
Atlante45
35f8afe456 Handle domain reconnections 2017-02-09 13:04:43 -08:00
Atlante45
191121888c Add log window to the ESS log 2017-02-09 13:04:43 -08:00