Seth Alves
4aeed2093c
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js
2017-02-15 08:57:30 -08:00
Brad Hefta-Gaub
0cdcee33d8
Merge pull request #9677 from kunalgosar/logFilter
...
Revamped Search Feature on Log Window
2017-02-15 08:56:16 -08:00
Seth Alves
219e569014
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js
2017-02-15 07:25:39 -08:00
Philip Rosedale
01bdac49d0
Merge pull request #9672 from ctrlaltdavid/21121
...
Fix far grabbing making entity jump upon grab
2017-02-14 17:02:42 -08:00
kunalgosar
4579ac4998
Changed button margin
2017-02-14 16:43:55 -08:00
kunalgosar
91a73b2689
Button styling
2017-02-14 16:13:40 -08:00
kunalgosar
5e5d76ead7
Implemented toggle prev search button
2017-02-14 16:13:40 -08:00
kunalgosar
2dd2018d7d
change next button style properties
2017-02-14 16:13:40 -08:00
kunalgosar
c01d0b309e
Toggle next for search on Log
2017-02-14 16:13:40 -08:00
Howard Stearns
3e52091dee
Merge pull request #9676 from birarda/bug/remove-domain-open-hours
...
fix empty descriptors map bug in DS
2017-02-14 16:02:54 -08:00
Stephen Birarda
27412080dd
return an empty descriptors map when empty
2017-02-14 15:39:59 -08:00
Seth Alves
838d7f6f10
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js
2017-02-14 13:58:18 -08:00
Seth Alves
3a23ec86d5
handles etc work better
2017-02-14 13:57:48 -08:00
Seth Alves
d0dc642cd8
Merge pull request #9651 from ctrlaltdavid/21164
...
Make it Easier to Change Audio Settings in the Tablet UI
2017-02-14 13:45:59 -08:00
David Rowe
625f5efdf8
Merge branch 'master' into 21164
...
# Conflicts:
# scripts/system/audio.js
2017-02-15 10:00:52 +13:00
Chris Collins
442e8d68ef
Merge pull request #9650 from kunalgosar/browserFix
...
Added isAway (paused) property to myAvatar
2017-02-14 11:16:07 -08:00
Seth Alves
e323971062
Merge pull request #9671 from druiz17/general
...
Moved general preference settings to the tablet
2017-02-14 10:11:33 -08:00
Seth Alves
b86886667b
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js
2017-02-14 09:20:53 -08: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
Dante Ruiz
968ba1e03d
updated file headers
2017-02-14 16:08:25 +00:00
Dante Ruiz
aa164bbf8f
diff minimize
2017-02-14 15:55:32 +00:00
Dante Ruiz
9d5f392be3
removed more qml log errors
2017-02-14 07:46:34 -08:00
Dante Ruiz
773ade5b61
removing qml errors
2017-02-14 07:46:34 -08:00
Dante Ruiz
8fbcead6d1
removed/renamed some files
2017-02-14 07:46:33 -08:00
Dante Ruiz
948352cdb6
general preferences work on tablet
2017-02-14 07:46:33 -08:00
Dante Ruiz
888d4ff706
basic prefreneces done
2017-02-14 07:46:32 -08:00
Dante Ruiz
46cfa7cf13
saving work
2017-02-14 07:46:31 -08:00
Dante Ruiz
61912b6ff0
saving work
2017-02-14 07:46:31 -08:00
Seth Alves
d40402faae
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js
2017-02-14 06:53:34 -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
Ken Cooke
bf077e6fdb
Merge pull request #9623 from zzmp/audio/should-ignore
...
Optimize ignore zone checks for audio mixer
2017-02-14 06:18:54 -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
David Rowe
2672b8d10a
Fix tabs
2017-02-14 17:30:56 +13:00
David Rowe
61f8631a2b
Fix far grabbing making entity jump upon grab
2017-02-14 17:30:20 +13:00
Anthony Thibault
ab09cc4339
Merge pull request #9658 from Atlante45/feat/capture-entity-clicks
...
Add entity clicks capture capabilities
2017-02-13 19:05:29 -08:00
Brad Hefta-Gaub
0dcf6ebd76
Merge pull request #9664 from howard-stearns/lastEditedBy-without-physics
...
lastEditedBy is set by add/edit, but not by physics packets
2017-02-13 17:17:50 -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
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
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
