Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-23 22:13:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
87497 commits 71 branches 56 tags 1.2 GiB
Commit graph

220 commits

Author SHA1 Message Date
howard-stearns
aff44d682e Merge branch 'master' of https://github.com/highfidelity/hifi into filter-pal-by-view-distance 2017-02-21 13:45:25 -08:00
howard-stearns
15d8041683 snapshot working, before button change 2017-02-21 13:14:45 -08:00
Anthony J. Thibault
7564b6f0f5 More consistent highlights/toggle for toolbar buttons 
When the "app" for a button is visible the button should become active.
Also clicking on a highlighted/active button should close the associated "app".

This should be noticeable on the following tablet apps.

* audio
* menu
* people
* market
* users
 2017-02-21 10:59:36 -08:00
David Kelly
76229905f2 Merge branch 'master' of https://github.com/highfidelity/hifi into dk/palVolumeSorting 2017-02-21 09:24:22 -08:00
David Kelly
51246a2e45 first cut, pretty ugly 2017-02-17 10:24:01 -07:00
Anthony J. Thibault
345f0519ef Removed use of Toolbar API for most default scripts. 2017-02-16 17:29:35 -08:00
Anthony J. Thibault
cffdecbf68 Merge branch 'master' into feature/toolbar-tablet-switcheroo 2017-02-16 16:28:43 -08:00
howard-stearns
6e3ae1fe4f cleanup some accumulated cruft in pal code 2017-02-16 10:53:02 -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
f8055a027e Refactor of pal.js to dynamically switch between toolbar and tablet. 2017-02-14 15:34:24 -08:00
Anthony J. Thibault
c2b832fb9c removed debug prints from pal.js 2017-02-08 18:55:22 -08:00
Anthony J. Thibault
a209d0372a First cut of pal on tablet. 2017-02-08 17:34:03 -08:00
howard-stearns
2e88f1ab1f conserving audio interval 2017-02-07 16:21:14 -08:00
howard-stearns
3bd11978aa low-hanging fruit on pal performance 2017-02-07 15:59:38 -08:00
Anthony J. Thibault
85e01e3922 tablet-ui: Added sortOrder property to buttons 
By default user created buttons will appear after system buttons.
 2017-02-02 17:18:22 -08:00
Seth Alves
4ae163ac60 hook pal audio meter up again 2017-02-01 19:01:55 -08:00
Faye Li
44fc8a5fbf update button name 2017-01-26 11:23:06 -08:00
Seth Alves
ff8d13ecc7 get button-states for toolbar buttons working again 2017-01-25 15:38:54 -08:00
Seth Alves
98f1664a46 use a setting to decide which UI is enabled 2017-01-25 14:17:45 -08:00
Seth Alves
f18094f565 make use of tablet or HUD depend on a single variable. avoid some duplicated code 2017-01-25 12:00:34 -08:00
Seth Alves
be8bc9652b Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-01-23 09:44:04 -08:00
Seth Alves
2d220a557f unmangle merge 2017-01-20 10:29:18 -08:00
Zach Fox
c83cd4a94a Complex checkpoint 2017-01-20 10:24:51 -08:00
Seth Alves
c492319be2 merge from upstream 2017-01-20 10:14:11 -08:00
Ryan Downe Karpf
03851d4188 Merge pull request 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
534fcd9399 Potential fix 2017-01-19 10:20:36 -08:00
Seth Alves
3517daaad2 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-01-18 15:49:12 -08:00
Zach Fox
7f57251a0e Remove logs also removed in Master 2017-01-18 13:38:19 -08:00
Zach Fox
e9d3c36873 Final commit? 2017-01-18 12:55:25 -08:00
Zach Fox
346cfbfe02 First checkpoint 2017-01-18 12:55:24 -08:00
Dante Ruiz
8172329ec3 Fixed pal 2017-01-18 10:33:58 -08:00
Seth Alves
b57803057d Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-01-18 06:38:44 -08:00
Anthony J. Thibault
03f8a310fc Fix for exception on script ending 2017-01-17 18:17:41 -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 from zfox23/PAL_DisplayName 
PAL: Editable Display Names & Immediate Update
 2017-01-17 16:00:41 -08:00
David Kelly
2460e89a57 CR feedback 2017-01-17 09:53:04 -08:00
Seth Alves
1eb7b668bf merge from upstream 2017-01-17 09:33:49 -08:00
Seth Alves
6bace4f451 merge from upstream 2017-01-17 09:29:30 -08:00
David Kelly
6c07a9aece remove debuggng logspam 2017-01-16 19:06:36 -08:00
David Kelly
6c701bb0f0 remove ignored avatars from PAL when they disconnect 2017-01-16 18:22:53 -08:00
David Kelly
95aad3140d Merge pull request from davidkelly/dk/manageAudioIntervalInPal 
Manage audio interval timer in PAL
 2017-01-16 11:29:05 -08:00
Zach Fox
32e330320e Cleanup after rebase 2017-01-16 11:26:57 -08:00
Zach Fox
6e4a4da92a Checkpoint 2017-01-16 10:42:29 -08:00
David Kelly
baed3bc3b3 Manage audio interval timer in PAL 
Now, it is only running when PAL is up.  Was running (but doing nothing
before.  Somewhat more efficient this way.
 2017-01-14 12:57:00 -07:00
Zach Fox
b9cddc31a9 Checkpoint before implementing Ken's suggestions 2017-01-13 13:00:03 -08:00
Zach Fox
8bb200902f First pass 2017-01-13 12:57:35 -08:00
Seth Alves
208c4686c4 merge from upstream 2017-01-12 15:44:27 -08:00
Dante Ruiz
a16b229c65 begining to remove hud items 2017-01-12 10:49:45 -08:00
David Kelly
1e3a00d1fb Enable the LT and RT signals, use them 
A bit cleaner.  Still have to keep track of which hand is the mouse, but
this removes some of the hacky code.
 2017-01-11 14:43:37 -07:00
David Kelly
0a018e133d Blue laser should be enough to hover 2017-01-10 18:23:39 -07:00
David Kelly
4fade3a53e CR feedback 2017-01-10 16:12:02 -07:00
David Kelly
5fd11ade9c minor tweak to hover color for glow effect 2017-01-10 16:00:19 -07:00
David Kelly
2d55ed2658 Fix hover - probably my merge didn't get this line 2017-01-10 15:51:24 -07:00
David Kelly
17333ee307 Merge branch 'master' of github.com:highfidelity/hifi into dk/letsHover 2017-01-10 15:24:31 -07:00
David Kelly
5c6ae6fe95 HMD hover working now 
Had to hack a bit -- the trigger mappings were not firing so instead I
just get the hand that is triggering (when HMD is active) and handle the
hover almost as before, with mouse move events.  Some thought about how
to map a 'mouse move' event into something where 2 triggers can both be
pressed at same time was in order.
 2017-01-10 14:47:34 -07:00
howard-stearns
e67675ac36 color nodes by audio level 2017-01-10 13:24:38 -08:00
howard-stearns
42b2b2154e store audio level in overlay data object (so that they gc properly and we 
have the data to color with).
 2017-01-10 13:08:07 -08:00
David Kelly
fef8c8900f Merge branch 'master' of github.com:highfidelity/hifi into dk/letsHover 2017-01-09 08:51:42 -07:00
David Kelly
409e785aa3 fix un-hover, add some comments 2017-01-09 08:42:43 -07:00
David Kelly
5eff12af34 add hover effect to PAL 2017-01-06 18:09:23 -07:00
howard-stearns
b149fa3d79 Merge branch 'master' of https://github.com/highfidelity/hifi into edit-button-to-select-in-pal 2017-01-06 10:21:22 -08:00
David Kelly
a107b2f06e lost my - sign 2017-01-06 08:44:22 -07:00
David Kelly
88ed96918a Merge branch 'master' of github.com:highfidelity/hifi into dk/prettierPAL 2017-01-05 18:30:28 -07:00
David Kelly
4504b31c1d Bugfix, plus minor cr stuff 
Seems to solve the 'due north' issue - we now have the main overlay as
the sphere, and it is the only thing clickable.  The model is no longer
clickable, so you cannot click clouds to select things.  Prevents some
confusion when opaque objects have ignoreRayIntersection, allowing you
to select a cloud you cannot see (i.e clicking near but not on the
sphere you can see).
 2017-01-05 18:20:40 -07:00
howard-stearns
f5c4535115 Merge branch 'master' of https://github.com/highfidelity/hifi into edit-button-to-select-in-pal 2017-01-05 16:29:34 -08:00
David Kelly
ef92a091b2 node overlay model now an asset 2017-01-05 15:19:09 -07:00
David Kelly
c95e880677 scale offsets to avatar height 2017-01-05 15:04:40 -07:00
Howard Stearns
bbf7d16537 process consistent select message 2017-01-05 13:45:03 -08:00
David Kelly
2949560e90 Corrected lame math error 
so we are centered now, and put the overlay up a bit higher.  Still need
to make that scale properly with avatar size.
 2017-01-05 14:22:35 -07:00
howard-stearns
47aa1e4f8e add pal to defaultScripts 2017-01-05 12:23:17 -08:00
David Kelly
75aa32ac6a remove some debugging crap 2017-01-05 12:01:55 -07:00
David Kelly
d5e6afa15a slightly further forward, a little bigger 2017-01-05 11:54:50 -07:00
David Kelly
f1d6335a24 First stab at making PAL avatar highlighting a bit prettier 
Working around rendering issues with model-based overlays and the
drawInFront, we use 2 overlays.  One is the model, another is
a sphere with drawInFront on.  Still need to dial in colors and sizes
but this should be close enough for iteration.
 2017-01-05 10:18:58 -07:00
Howard Stearns
12fffe8530 messages 2017-01-04 20:37:56 -08:00
howard-stearns
97780ac97e color, infront 2017-01-04 16:09:15 -08:00
howard-stearns
d78b7d9a28 Merge branch 'master' of https://github.com/highfidelity/hifi into pal-show-lastEditedBy 2017-01-04 15:48:45 -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
03fbfc85f9 Short delay before populating PAL when changing domains 2017-01-04 13:50:37 -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
howard-stearns
c79c489002 selecting user in pal shows entities lastEditedBy user this session 2017-01-04 11:19:32 -08:00
Zach Fox
14def61eb8 More CR comments; 1 bug remaining re: sig slot 2017-01-03 17:32:47 -08:00
Zach Fox
f26b7c0134 Checkpoint 2016-12-30 09:51:43 -08:00
Zach Fox
10b5b957f2 Ahh...It's beautiful and simple now. 2016-12-29 13:09:40 -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
e26d347682 It seems to be working, minus removing from list 2016-12-28 15:15:39 -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
howard-stearns
0ad9786f6b requestsDomainsListData 2016-12-27 10:14:20 -08:00
Zach Fox
72da05bb30 Merge pull request from zfox23/PalRefresh 
Add PAL refresh button
 2016-12-23 15:16:51 -08:00
David Kelly
5065f027e7 whitespace 2016-12-23 13:11:42 -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
630fb8696f Lots of progress today 2016-12-21 12:48:26 -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
Howard Stearns
9aad93465d Merge pull request from howard-stearns/sessionDisplayNames 
Session display names
 2016-12-20 10:07:05 -08:00
howard-stearns
60cb7acb50 Merge branch 'master' of https://github.com/highfidelity/hifi into sessionDisplayNames 2016-12-19 15:28:07 -08:00
David Kelly
36792e005a initial commit 2016-12-19 14:19:39 -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
802e283508 Another checkpoint, getting closer 2016-12-19 10:20:08 -08:00
Zach Fox
c9dc91900f Checkpoint 2016-12-19 10:20:08 -08:00
howard-stearns
70af96669c update pal 2016-12-16 14:59:54 -08:00
howard-stearns
0e81e71325 fix selection and hud-hiding issues 2016-12-15 11:00:32 -08:00
howard-stearns
66e2c651c6 clean up avatar nodes properly (and add some logging) 2016-12-14 11:26:33 -08:00
Howard Stearns
d5c219a761 deal with bubble-bounces (and comment the code a bit) 2016-12-13 19:52:27 -08:00
howard-stearns
a50b731faa fix broken search for myself 2016-12-13 16:52: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
7c92ad5ced checkpoint 2016-12-13 09:15:28 -08:00
howard-stearns
4b5aae3c55 pal prototype 2016-12-12 16:37:16 -08:00