Seth Alves
d072b1524a
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-01-05 15:27:11 -08:00
Anthony J. Thibault
85de0d3bbf
Added local only spatialized button click sounds to tablet
2017-01-05 13:54:06 -08:00
Zach Fox
b5713656be
Minor language changes on Admin help text
2017-01-05 09:27:12 -08:00
Zach Fox
0c77ff2556
Fix silly quotation bug
2017-01-04 16:28:23 -08:00
Zach Fox
083bf95917
Fix PAL scrollbar; add helper popup to ADMIN tab
2017-01-04 16:25:13 -08:00
Zach Fox
675159be45
Last commit to fix final bugs
2017-01-04 14:33:02 -08:00
Zach Fox
ac41e8abc4
Bugfix re: population; remove user image for now
2017-01-04 14:06:51 -08:00
Zach Fox
c695878025
Clear local ignored list upon domain change
2017-01-04 13:31:16 -08:00
Zach Fox
dde5f69ac9
More CR & simplifications
2017-01-04 12:41:30 -08:00
Faye Li Si Fi
32bc73dad3
added activeText and activeIcon properties in QML
2017-01-04 12:20:41 -08:00
Zach Fox
14def61eb8
More CR comments; 1 bug remaining re: sig slot
2017-01-03 17:32:47 -08:00
Anthony J. Thibault
e4a08709c6
Merge remote-tracking branch 'upstream/tablet-ui' into tablet-ui
2017-01-03 16:23:57 -08:00
Anthony Thibault
9502a8b0c4
Merge pull request #9294 from fayeli/tablet-mic-level
...
Audio level calculation in tabletUI.js
2017-01-03 16:12:04 -08:00
Zach Fox
899dd21328
Lots of CR feedback
2017-01-03 15:43:30 -08:00
Anthony J. Thibault
3c2f9acd39
Hooked up EventBridge to TabletScriptingInterface.
2017-01-03 15:43:21 -08:00
Faye Li
68aacfe544
added "updateAudioBar" function signature in header file
2017-01-03 12:38:23 -08:00
Faye Li
7e1b06efdc
slot function in QML
2017-01-03 11:15:28 -08:00
Anthony Thibault
c201b6a7f9
Merge pull request #9256 from druiz17/moreButtons
...
all hub button now on tablet
2017-01-03 10:44:19 -08:00
Anthony J. Thibault
00980366d6
Merge branch 'master' into tablet-ui
2017-01-03 09:45:23 -08:00
Zach Fox
4a21eaa33f
Cleanup before PR
2016-12-30 15:18:01 -08:00
Zach Fox
951db2e2da
Bugs fixed!
2016-12-30 15:12:17 -08:00
Zach Fox
ea40582afb
Remaining bug: Hover when sort
2016-12-30 12:55:46 -08:00
Zach Fox
f26b7c0134
Checkpoint
2016-12-30 09:51:43 -08:00
Zach Fox
3bd68f5e3e
Checkpoint for removing userData
2016-12-29 16:09:31 -08:00
Zach Fox
be4050aa78
One bug down!
2016-12-29 15:43:42 -08:00
Zach Fox
f96508e197
Gotta fix these bugs...
2016-12-29 14:19:40 -08:00
Zach Fox
10b5b957f2
Ahh...It's beautiful and simple now.
2016-12-29 13:09:40 -08:00
Zach Fox
24eac77115
I'm about to refactor this.
2016-12-29 11:57:51 -08:00
Zach Fox
bb2b48d424
Getting very close.
2016-12-29 11:35:20 -08:00
Zach Fox
af1c67a252
Progress!
2016-12-28 17:23:56 -08:00
Zach Fox
d3700fc922
Fix merge errors
2016-12-28 15:47:28 -08:00
Zach Fox
46e8bf5283
First steps, holding off til Howard finishes
2016-12-28 15:12:21 -08:00
howard-stearns
768b747b3a
Make avatar go away when ignored, even when pal is up. (But currently, it
...
comes back!)
2016-12-27 10:17:39 -08:00
Brad Davis
5b30f5da1b
Merge pull request #9259 from zfox23/FixRunningScripts
...
Fix "Running Scripts" window being inaccessible
2016-12-23 15:37:24 -08:00
Zach Fox
72da05bb30
Merge pull request #9268 from zfox23/PalRefresh
...
Add PAL refresh button
2016-12-23 15:16:51 -08:00
Zach Fox
5490dddbbf
Cool style changes!
2016-12-23 12:22:33 -08:00
David Kelly
9eed430f49
CR feedback
2016-12-22 18:09:19 -08:00
David Kelly
2e897e0cc9
Working first pass
...
Seems roughly same as mic meter. Works for other avatars, though
using agent avatars (crowd-agent.js + summon.js), seems not to work.
I'll investigate that...
2016-12-22 14:01:03 -08:00
Zach Fox
d01500a7bb
Fix the bug?
2016-12-21 17:53:30 -08:00
Dante Ruiz
cad9f66572
removed qml generated buttons
2016-12-21 23:35:46 +00:00
Zach Fox
7c51d47ae4
Better separator
2016-12-21 14:11:14 -08:00
Zach Fox
1eea3ed27d
No more semicolons; tons of improvements
2016-12-21 12:48:26 -08:00
Zach Fox
630fb8696f
Lots of progress today
2016-12-21 12:48:26 -08:00
Zach Fox
0be4db1e68
Checkboxes!
2016-12-21 12:48:26 -08:00
Zach Fox
9b65a72bb5
Popup essentially done
2016-12-21 12:48:25 -08:00
Zach Fox
5b77202c52
Popups wow!
2016-12-21 12:48:25 -08:00
Zach Fox
db2da8f06b
Great cleanup
2016-12-21 12:48:25 -08:00
Zach Fox
7999e14ecf
Kinda screwed things up by changing styles
2016-12-21 12:48:25 -08:00
Zach Fox
feafc16833
Frequent checkpoints are good.
2016-12-21 12:47:38 -08:00
Zach Fox
e7c2229b2c
More progress
2016-12-21 12:46:23 -08:00