Commit graph

51434 commits

Author SHA1 Message Date
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
Stephen Birarda
1cf25e676a Merge pull request #9662 from birarda/master
change build guide to suggest latest available OpenSSL
2017-02-13 14:24:48 -08:00
Howard Stearns
7853899f9f Merge pull request #9663 from davidkelly/dk/2789
Don't allow a ban of any node on same machine as domain-server
2017-02-13 14:23:26 -08:00
David Kelly
156e365eff update version
since new property was added, things will appear broken if this
version is used with old version (server or client).
2017-02-13 15:02:31 -07:00
Anthony J. Thibault
adc50dd30f Added active versions of each tablet image, with black bg. 2017-02-13 13:55:33 -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
David Kelly
45cb11f38a Don't allow a ban of any node on same machine as domain-server 2017-02-13 14:38:21 -07: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
Stephen Birarda
0e9d66a3a6 change build guide to suggest latest of OpenSSL 2017-02-13 13:31:07 -08:00
Atlante45
a1371a4f06 Fix possible race 2017-02-13 13:20:31 -08:00
Brad Hefta-Gaub
ced6f43923 Merge branch 'master' of https://github.com/highfidelity/hifi into avatarMixerLoopImprovements 2017-02-13 13:09:54 -08:00
Brad Hefta-Gaub
d24ed62116 Merge pull request #9660 from zzmp/audio/silent-stats
Add silent_packets stat to audio mixer
2017-02-13 13:07:07 -08:00
Seth Alves
b333126cbe avoid sending localPosition for avatars with no parent 2017-02-13 12:20:07 -08:00
Zach Pomerantz
e1cf04e0f0 add silent_packets stat to audio mixer 2017-02-13 20:18:16 +00:00
Faye Li
f981f21aa4 fix for ozan's domain 2017-02-13 11:47:58 -08:00
Howard Stearns
c25f310721 Merge pull request #9657 from howard-stearns/display-lastEditedBy
add faye's displayLastEditedBy script to script-archive
2017-02-13 11:44:00 -08:00
howard-stearns
bd8ee7505e add faye's displayLastEditedBy script 2017-02-13 11:42:33 -08:00
Atlante45
512bb4765f Add entity clicks capture capabilities 2017-02-13 11:34:30 -08:00
David Kelly
590cf6d798 whitespace 2017-02-13 12:20:47 -07:00
Faye Li
27057190ce display users even if they dont have a domain name 2017-02-13 11:01:37 -08:00
Faye Li
8cc8f2c7fd highlight current visibility option 2017-02-13 10:51:01 -08:00
Faye Li
6e0d7bb3cf make visibility settings into a modal for better readability 2017-02-13 10:42: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
David Kelly
d9319c2c2c Merge branch 'dk/zoneFilters2' of https://github.com/davidkelly/hifi into dk/zoneFilters2 2017-02-13 10:23:48 -07:00
David Kelly
92ee823ef3 Merge branch 'master' of https://github.com/highfidelity/hifi into dk/zoneFilters2 2017-02-13 10:22:42 -07:00
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
Brad Hefta-Gaub
8ed69f62fa adjust stats so avatar list is at bottom 2017-02-10 18:22:02 -08: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
Faye Li
65ca0c7e4a sticky header bar 2017-02-10 17:27:02 -08:00
Faye Li
e28e16ea5e make drop down text a little bit bigger 2017-02-10 16:56:13 -08:00