Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-05-05 10:17:53 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
83223 commits 69 branches 57 tags 1.2 GiB
Commit graph

227 commits

Author SHA1 Message Date
Zach Fox
0a6bcd7fca Massive performance boost 2017-03-14 16:24:06 -07:00
Zach Fox
5da0dfc4ac Merging from Pal_v2_Zach 2017-03-14 14:05:50 -07:00
Zach Fox
e3d0842ddc Implement browser in PAL 2017-03-13 18:39:47 -07:00
Zach Fox
d04b1da1c2 Merging from PAL_v2_Zach 2017-03-13 12:54:01 -07:00
Zach Fox
beb848373b Update from zfox23/PALv2 branch 2017-03-13 10:15:06 -07:00
howard-stearns
cb41b9135b fix broken merge 2017-03-07 12:10:52 -08:00
howard-stearns
8a489f36f4 Merge branch 'master' of https://github.com/highfidelity/hifi into fix-ban-remove-from-pal 2017-03-07 10:49:53 -08:00
David Kelly
b760e86226 rest of cr feedback 2017-03-07 10:17:32 -07:00
David Kelly
c6dbfc85f0 cr feedback 2017-03-07 09:54:00 -07:00
David Kelly
3d39aae35b minor tweak - just in case 2017-03-06 15:52:33 -07:00
David Kelly
e14a1ad1af minor cleanup 2017-03-06 15:26:03 -07:00
David Kelly
db036d997c first pass 2017-03-06 15:18:35 -07:00
howard-stearns
632cdc1b38 semicolons and whitespace per coding standard 2017-03-06 11:04:12 -08:00
howard-stearns
a715a694f0 fix 'banned user doesn't disappear from pal until refresh' 2017-03-03 16:27:38 -08:00
David Kelly
79e440be81 fix unmute when ignoring in PAL (you can't) 2017-03-02 08:36:58 -07:00
howard-stearns
5be952c4e8 persist sort info for tablet re-opening, and start with column 1 2017-03-01 14:51:48 -08:00
David Kelly
45293ab130 Merge branch 'master' of https://github.com/highfidelity/hifi into dk/palVolumeSorting 2017-03-01 12:55:54 -07:00
David Kelly
55d049ff5c style updates 2017-03-01 12:43:45 -07:00
David Kelly
efe44425a6 cr feedback, plus something I missed 2017-03-01 09:26:03 -07:00
David Kelly
678020fed6 now use it (plus a bit of cleanup) 2017-02-28 15:03:45 -07:00
howard-stearns
c04fd0ec66 smaller glyph size 2017-02-27 16:07:05 -08:00
David Kelly
3bf3f16a6a whitespace 2017-02-27 12:56:03 -07:00
David Kelly
e7c8085bc8 switch to using glyph button 2017-02-27 12:44:23 -07:00
David Kelly
baa7f81d79 Merge branch 'master' of https://github.com/highfidelity/hifi into dk/palVolumeSorting 2017-02-24 18:38:57 -08:00
David Kelly
d6f0d8c960 styling changes, first pass 2017-02-24 11:45:03 -08:00
David Kelly
4a4c914ca8 First cut at new styling 2017-02-23 18:53:22 -08:00
howard-stearns
de3a0d3d0c button styling 2017-02-22 13:02:05 -08:00
howard-stearns
023a32563c work around .qml settings issues 2017-02-22 12:59:40 -08:00
howard-stearns
a20590a2f9 fixed myCard width in all cases (admin or not) 2017-02-21 16:03:59 -08:00
howard-stearns
1ddc7de581 remove debugging (and fix missing brace) 2017-02-21 15:41:17 -08:00
howard-stearns
f21e17d512 new buttons 2017-02-21 15:32:41 -08:00
howard-stearns
15d8041683 snapshot working, before button change 2017-02-21 13:14:45 -08:00
David Kelly
d938c70b48 volume goes 0-9 now 2017-02-17 11:11:08 -07:00
David Kelly
51246a2e45 first cut, pretty ugly 2017-02-17 10:24:01 -07:00
howard-stearns
6e3ae1fe4f cleanup some accumulated cruft in pal code 2017-02-16 10:53:02 -08:00
Anthony J. Thibault
090f632189 Pal: Moved keyboard tray to be flush with bottom of window. 2017-02-08 18:16:48 -08:00
Anthony J. Thibault
7cc3079328 Tightened up margins for the tablet. 2017-02-08 17:58:24 -08:00
Anthony J. Thibault
a209d0372a First cut of pal on tablet. 2017-02-08 17:34:03 -08:00
Zach Fox
8b1161b0b0 Fix it 2017-02-01 12:32:30 -08:00
Zach Fox
5cba928540 Do it! 2017-01-27 16:30:59 -08:00
Zach Fox
11a57efafb Fix it! 2017-01-20 13:44:29 -08:00
Zach Fox
8f3c4794c6 Comments 2017-01-20 10:24:52 -08:00
Zach Fox
9c9206acc0 Prevent logspam 2017-01-20 10:24:51 -08:00
Zach Fox
c83cd4a94a Complex checkpoint 2017-01-20 10:24:51 -08:00
Ryan Downe Karpf
03851d4188 Merge pull request #9441 from davidkelly/dk/makeUsSomeAnalytics 
Some initial analytics for PAL usage
 2017-01-20 08:30:46 -08:00
David Kelly
5adc2cc593 Couple improvements 
Only send one message when gain is changed.  Eliminated the bool and
now just sending un-personalMute, etc...
 2017-01-19 17:22:39 -08:00
David Kelly
d9fbf832e2 Some initial analytics for PAL usage 2017-01-19 11:35:17 -08:00
Zach Fox
7f57251a0e Remove logs also removed in Master 2017-01-18 13:38:19 -08:00
Zach Fox
f8dd7f5433 Cleanup 2017-01-18 12:55:25 -08:00
Zach Fox
e9d3c36873 Final commit? 2017-01-18 12:55:25 -08:00
Zach Fox
d067ba7dcc Alan's feedback 2017-01-18 12:55:24 -08:00
Zach Fox
9d19aa3c79 Checkpoint 2017-01-18 12:55:24 -08:00
Zach Fox
202d4e8107 Checkpoint 2017-01-18 12:55:24 -08:00
Zach Fox
346cfbfe02 First checkpoint 2017-01-18 12:55:24 -08:00
David Kelly
f5300d3862 Removing some PAL-related interface log spam 
Probably more, but these _seem_ to be the worst
 2017-01-17 17:06:18 -08:00
Zach Fox
7a568ed8a7 Merge pull request #9401 from zfox23/PAL_DisplayName 
PAL: Editable Display Names & Immediate Update
 2017-01-17 16:00:41 -08:00
David Kelly
6c701bb0f0 remove ignored avatars from PAL when they disconnect 2017-01-16 18:22:53 -08:00
Zach Fox
32e330320e Cleanup after rebase 2017-01-16 11:26:57 -08:00
Zach Fox
2f176f50fa Another checkpoint 2017-01-16 10:44:54 -08:00
Zach Fox
a5343d9aa9 Final tweaks before PR! 2017-01-13 17:20:29 -08:00
Zach Fox
a89868dcad Make sliders appear only when row is selected 2017-01-13 15:41:17 -08:00
Zach Fox
8343769352 NameCard improvements & user feedback 2017-01-13 15:25:07 -08:00
Zach Fox
a69a10b8e4 Cleanup after rebase 2017-01-13 13:15:01 -08:00
Zach Fox
a9226e303c Pull out visual changess & move them to other PR 2017-01-13 13:00:23 -08:00
Zach Fox
b0b6aeac6c Ken's feedback 2017-01-13 13:00:03 -08:00
Zach Fox
b9cddc31a9 Checkpoint before implementing Ken's suggestions 2017-01-13 13:00:03 -08:00
Zach Fox
503468e49b Style changes 2017-01-13 12:59:23 -08:00
Zach Fox
8bb200902f First pass 2017-01-13 12:57:35 -08:00
Zach Fox
b7e95a3486 Updates from Alan 2017-01-12 14:14:28 -08:00
Zach Fox
8e1a70891d Checkpoint after cherry-picking from existing PR 2017-01-12 10:59:28 -08:00
howard-stearns
ef02c84759 further simplification of letterbox, and use for selection failures 2017-01-05 14:46:32 -08:00
howard-stearns
0cdeac8736 abstract out letterbox message 2017-01-05 14:32:31 -08:00
howard-stearns
0670a4689f Merge branch 'master' of https://github.com/highfidelity/hifi into edit-button-to-select-in-pal 2017-01-05 13:57:44 -08:00
Howard Stearns
bbf7d16537 process consistent select message 2017-01-05 13:45:03 -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
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
Zach Fox
14def61eb8 More CR comments; 1 bug remaining re: sig slot 2017-01-03 17:32:47 -08:00
Zach Fox
899dd21328 Lots of CR feedback 2017-01-03 15:43:30 -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
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
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
Zach Fox
deb40f67df Steady progress 2016-12-21 12:46:23 -08:00
Zach Fox
46c787512e Working 2016-12-21 12:46:23 -08:00
Zach Fox
5996228622 Starting off strong. 2016-12-21 12:46:23 -08:00
Zach Fox
a912fec496 PR comments; need particular fix on Master for full QA 2016-12-19 10:20:08 -08:00
Zach Fox
e940daf5b4 Comments and clarity 2016-12-19 10:20:08 -08:00
Zach Fox
aa837d8858 It's working! Untested on human avatars. 2016-12-19 10:20:08 -08:00
Zach Fox
2c5db54b08 Super close 2016-12-19 10:20:08 -08:00
Zach Fox
c9dc91900f Checkpoint 2016-12-19 10:20:08 -08:00
howard-stearns
4503855ae8 don't keep selection while things are disappearing 2016-12-13 17:00:24 -08:00
howard-stearns
a50b731faa fix broken search for myself 2016-12-13 16:52:18 -08:00
howard-stearns
773bbc4ef1 update canKick whenever we get new data, instead of just at first use. 2016-12-13 16:30:16 -08:00
howard-stearns
00653b6b19 missing the ban button 2016-12-13 16:23:43 -08:00
howard-stearns
b0a69468d2 Don't show admin columns if you can't kick. 2016-12-13 15:16:18 -08:00
howard-stearns
adbfa0752a no debug printing 2016-12-13 15:09:46 -08:00
howard-stearns
c9827d1521 checkpoint 2016-12-13 15:05:08 -08:00
howard-stearns
86010af828 checkpoint 2016-12-13 13:01:45 -08:00
howard-stearns
4b5aae3c55 pal prototype 2016-12-12 16:37:16 -08:00