Commit graph

51247 commits

Author SHA1 Message Date
Menithal
9b8503eba5 Initial Grab Clone 2017-02-19 18:18:38 +02:00
Chris Collins
ec07969c0b Merge pull request #9703 from kunalgosar/logDisplayMode
Logging HMD/Desktop Transitions
2017-02-17 17:07:02 -08:00
Seth Alves
f6bd21c483 Merge pull request #9694 from hyperlogic/feature/toolbar-tablet-switcheroo
By default, tablet icons will display on the toolbar in desktop mode.
2017-02-17 15:07:17 -08:00
kunalgosar
b8b5927351 Logging display mode changes 2017-02-17 13:21:01 -08:00
Anthony J. Thibault
5963c6ddc3 Fix for toolbar visibility after snapshots. 2017-02-17 11:04:04 -08:00
Anthony J. Thibault
e4076e6244 warning fixes 2017-02-17 09:45:13 -08:00
Howard Stearns
5bef6ea029 Merge pull request #9687 from davidkelly/dk/3177
Ban only by machine fingerprint, when possible
2017-02-16 18:50:38 -08:00
Anthony J. Thibault
47e87e1ad4 Bug fix for clara.io marketplace 2017-02-16 17:41:36 -08:00
Anthony J. Thibault
2ea88012f9 Remove toolbar from tablet-goto.js 2017-02-16 17:36:16 -08:00
Anthony J. Thibault
345f0519ef Removed use of Toolbar API for most default scripts. 2017-02-16 17:29:35 -08:00
Howard Stearns
7afd13d2cb Merge pull request #9693 from howard-stearns/fix-requestsDomainListData
fix rquestsDomainListData
2017-02-16 17:06:29 -08:00
Anthony J. Thibault
0b9f4d4f11 updated eslint to include Tablet global 2017-02-16 16:53:51 -08:00
Stephen Birarda
24591ee82b Merge pull request #9691 from zzmp/fix/audio-packet-queue
Fix audio packet queue behavior
2017-02-16 16:45:51 -08:00
howard-stearns
04712e3744 fix rquestsDomainListData 2017-02-16 16:43:16 -08:00
Anthony J. Thibault
cffdecbf68 Merge branch 'master' into feature/toolbar-tablet-switcheroo 2017-02-16 16:28:43 -08:00
Anthony J. Thibault
7f95753a1e Prevent tablet from being open while in toolbarMode 2017-02-16 16:18:51 -08:00
Anthony J. Thibault
8ccca86dee Settings for Tablet Becomes Toolbar 2017-02-16 15:57:36 -08:00
Zach Pomerantz
07e97a0cab unqueue from front for audio packets 2017-02-16 21:40:53 +00:00
Anthony J. Thibault
5b1f150171 Fix for race condition when switching between Main Menu and Audio Menu 2017-02-16 12:52:46 -08:00
David Kelly
821c01eeca Merge pull request #9689 from howard-stearns/pal-mini-code-cleanup
cleaner living for pal
2017-02-16 13:51:26 -07:00
howard-stearns
6e3ae1fe4f cleanup some accumulated cruft in pal code 2017-02-16 10:53:02 -08:00
David Kelly
a8831e89ff Ban only by machine fingerprint, when possible 2017-02-16 09:50:56 -07:00
Stephen Birarda
a3c123818d Merge pull request #9661 from Atlante45/fix/possible-race
Fix possible race condition
2017-02-15 18:38:01 -08:00
Anthony J. Thibault
03b6280ed0 Fix for empty toolbar issue 2017-02-15 16:50:08 -08:00
Anthony J. Thibault
67302cbd2b toolbar work to better support tablet buttons 2017-02-15 15:53:08 -08:00
Howard Stearns
34a4770ffa Merge pull request #9669 from davidkelly/dk/2656
inform gatekeeper immediately when kicking someone
2017-02-15 15:13:10 -08:00
Zach Pomerantz
a976d191ad Merge pull request #9679 from zzmp/fix/audio-assert-ignore-memoization
Loosen audio memoization precondition
2017-02-15 17:50:33 -05:00
Anthony J. Thibault
ed11edad56 EventBridge support 2017-02-15 13:59:04 -08:00
David Kelly
5ec3bbde52 Merge pull request #9648 from davidkelly/dk/zoneFilters2
Zone Filters
2017-02-15 13:36:11 -07:00
David Kelly
f0e87360c1 don't capture a temporary by reference. Ugh 2017-02-15 12:37:00 -07:00
Clément Brisset
eba6a8f028 Merge pull request #9674 from Atlante45/fix/mac-macro
Fix SSE2 macros for Macs
2017-02-15 11:29:55 -08:00
David Kelly
5184cbe615 Merge branch 'master' of https://github.com/highfidelity/hifi into dk/zoneFilters2 2017-02-15 12:08:55 -07:00
Zach Pomerantz
2e9217fb47 loosen audio memoization precondition 2017-02-15 13:36:03 -05:00
Zach Pomerantz
ed4f96eadd Merge pull request #9646 from zzmp/load/audio/packets-in
log full i/o stats
2017-02-15 13:32:48 -05:00
Faye Li
2388ec65fe Merge pull request #9659 from fayeli/users-fix
Tablet Users Fixes
2017-02-15 10:25:06 -08:00
Faye Li
8aae2aa5f0 simpler filter code 2017-02-15 10:23:36 -08:00
Faye Li
5ece3f1e1a use new users icon 2017-02-15 10:16:20 -08:00
Chris Collins
d1a236954b Merge pull request #9673 from zzmp/audio/threaded-decode
Parallelize audio packet decoding in mixer
2017-02-15 09:44:42 -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
David Kelly
e6969321ca fix for not properly filtering entity adds 2017-02-15 09:15:35 -07: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
Anthony J. Thibault
912e8aa04a Tablet buttons now work in toolbar.
Switching between tablet and toolbar is not as dynamic as I'd like but it's a start.
2017-02-14 15:37:24 -08:00
Anthony J. Thibault
4503923665 Initial version of TabletProxy.toolbarMode boolean
Copies all tablet buttons between the tablet and the system toolbar.

To test type this in the console:

    Tablet.getTablet("com.highfidelity.interface.tablet.system").toolbarMode = true;
2017-02-14 15:36:03 -08:00