Zach Pomerantz
6f2eb27572
rm debug in Deck.cpp
2017-02-14 20:46:27 +00:00
Zach Pomerantz
da5a89f582
move codec negotiation to client data
2017-02-14 20:46:27 +00:00
Brad Hefta-Gaub
f433347362
Merge pull request #9652 from sethalves/avatar-as-child-fixes
...
some fixes for when an avatar is a child of something else
2017-02-14 09:07:47 -08:00
Seth Alves
4393bc3c2e
Merge pull request #9656 from humbletim/21114-part1
...
CR-1 21114 -- ScriptCache/ScriptEngine cleanup, loader states, accessible load errors
2017-02-14 06:49:05 -08:00
Seth Alves
ba025d44e0
Merge pull request #9642 from AndrewMeadows/beware-humbletim
...
fix performance problem for invalid "avatarEntityData"
2017-02-14 06:33:48 -08:00
Seth Alves
2e2a3c60d0
Merge branch 'master' of github.com:highfidelity/hifi into avatar-as-child-fixes
2017-02-14 06:26:20 -08:00
Seth Alves
2e245e9cba
Merge pull request #9667 from huffman/fix/entity-scripts-not-loading
...
Fix entity scripts not loading in certain cases
2017-02-14 06:20:29 -08:00
Seth Alves
30c46b89a0
Merge pull request #9668 from hyperlogic/feature/remove-tablet-color-effect
...
Removed ColorOverlay from TabletButton, added more icon & text states
2017-02-14 06:16:59 -08:00
howard-stearns
487adc7f18
whitespace
2017-02-13 16:35:03 -08:00
Anthony J. Thibault
1c783031b1
Removed ColorOverlay from TabletButton, added more icon & text states
...
Now uses separate images for each state. Now tabletButtonProxy has 4 state properties, one for icon and images.
* icon
* hoverIcon
* activeIcon
* activeHoverIcon
* text
* hoverText
* activeText
* activeHoverText
Updated scripts to set new button states, if necessary.
2017-02-13 15:09:46 -08:00
Ryan Huffman
d0cddd01d7
Fix entity scripts not loading in certain cases
...
This fixes a bug where an entity script would be loaded but immediately
unloaded. This happens when the script property of the entity is changed shortly
after it is added.
Flow of events:
Entity added
=> Entity added event emitted
Entity edited
=> Script changing event emitted
<= Entity added event received
Script loaded
<= Script changing event received
Script stopped
Tries to load script again, but because the script hasn't changed
since it was last loaded, it is not loaded again.
The change here is to modify the behavior when receiving a script
changing event. Instead of always unloading and then conditionally
loading the script, it will either do both (unload + load) or neither.
2017-02-13 14:59:31 -08:00
howard-stearns
6241889e38
lastEditedBy is set by add/edit, but not by physics packets
2017-02-13 13:47:20 -08:00
Seth Alves
3d7633a11f
Merge branch 'master' of github.com:highfidelity/hifi into avatar-as-child-fixes
2017-02-13 13:44:05 -08:00
Seth Alves
5ee484a592
don't send avatar localPosition unless the avatar has a parent, even if sendAll is true
2017-02-13 13:36:07 -08:00
Seth Alves
b333126cbe
avoid sending localPosition for avatars with no parent
2017-02-13 12:20:07 -08:00
samcake
f4ff5cf746
Merge pull request #9647 from samcake/ambient
...
Fix the filtering problem on color and normals
2017-02-13 09:41:57 -08:00
Seth Alves
27d55d6ff0
bump avatar-mixer protocol version
2017-02-13 07:30:33 -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
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
samcake
13d1642ace
Merge branch 'master' of https://github.com/highfidelity/hifi into ambient
2017-02-10 15:46:33 -08:00
samcake
2da1801fbf
Fixing the failing shader
2017-02-10 14:40:39 -08:00
Andrew Meadows
66a315cb9c
cap number of avatar entities
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
0e504e9ec6
make methods private: avoid sanity check logic
2017-02-10 13:14:20 -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
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
Atlante45
3a30de79aa
CR
2017-02-09 13:04:43 -08:00
Atlante45
2962dd6dc2
Factor LogDialog
2017-02-09 13:04:43 -08:00
Atlante45
fcb74bce10
First draft for entity script server log streaming
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
Brad Hefta-Gaub
bc22326ec8
Merge pull request #9640 from ZappoMan/avatarSimulationStats
...
New stats for avatar simulation
2017-02-09 12:58:30 -08:00
Brad Hefta-Gaub
57e0dadd65
CR
2017-02-09 11:35:00 -08:00
samcake
850be620f9
Merge pull request #9606 from samcake/blue
...
More intrumentation, Pixel Format clean up and minor improvments in texture transfers
2017-02-09 11:18:09 -08:00
Seth Alves
b34341b48e
Merge pull request #9631 from AndrewMeadows/workaround-avatar-update-dos
...
Remove avatarEntityData cruft from settings
2017-02-09 10:40:00 -08:00
Ryan Huffman
026c68c7de
Merge pull request #9625 from huffman/fix/server-script-entity-updates
...
Fix Server Entity Script w/ high update rate causing issues
2017-02-09 10:07:32 -08:00
samcake
c62108c3c8
Resolve merging conflict
2017-02-09 09:49:59 -08:00
Seth Alves
2ec4f118fd
Merge pull request #9639 from hyperlogic/feature/tablet-pal
...
Ported PAL to tablet
2017-02-08 21:17:38 -08:00
Anthony J. Thibault
e25ad0f332
Fix debug assert in FBXReader.
2017-02-08 18:56:58 -08:00
Anthony J. Thibault
b3a46c3518
Bug fix for TabletProxy::loadQMLSource()
2017-02-08 18:56:16 -08:00
Anthony J. Thibault
a209d0372a
First cut of pal on tablet.
2017-02-08 17:34:03 -08:00
samcake
e11d10f5d4
Reparing broken normals and also fixing the ambient lighting bug
2017-02-08 16:56:59 -08:00
