Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-05-07 15:19:22 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
50244 commits 70 branches 57 tags 1.2 GiB
Commit graph

1347 commits

Author SHA1 Message Date
Brad Hefta-Gaub
f9ca41e89c Merge pull request #9302 from jherico/expose_dropped_count 
Expose dropped frames count to stats UI
 2017-01-04 16:12:35 -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
Brad Davis
3f2fdd1915 Expose dropped frames count to stats UI 2017-01-04 13:20:58 -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
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
Anthony J. Thibault
ec38c4e319 Merge remote-tracking branch 'upstream/tablet-ui' into tablet-ui 2016-12-20 13:43:06 -08:00
Anthony J. Thibault
84db58dbc6 Make tablet.qml work on Web3DOverlay 2016-12-20 12:16:11 -08:00
Zach Fox
a18f9dbe90 PR comments; need particular fix on Master for full QA 2016-12-20 07:45:35 -08:00
Zach Fox
ba240854a7 Comments and clarity 2016-12-20 07:45:35 -08:00
Zach Fox
95e2f0687d It's working! Untested on human avatars. 2016-12-20 07:45:35 -08:00
Zach Fox
54774950d2 Super close 2016-12-20 07:45:35 -08:00
Zach Fox
9c09ec6755 Checkpoint 2016-12-20 07:45:35 -08:00
howard-stearns
641f98589a don't keep selection while things are disappearing 2016-12-20 07:43:48 -08:00
howard-stearns
db68a6adcd fix broken search for myself 2016-12-20 07:43:48 -08:00
howard-stearns
07ab771c2b update canKick whenever we get new data, instead of just at first use. 2016-12-20 07:43:48 -08:00
howard-stearns
d0cdd4d5c1 missing the ban button 2016-12-20 07:43:48 -08:00
howard-stearns
0e9b1b45f4 Don't show admin columns if you can't kick. 2016-12-20 07:43:48 -08:00
howard-stearns
5a97156151 no debug printing 2016-12-20 07:43:48 -08:00
howard-stearns
946d9aa346 checkpoint 2016-12-20 07:43:48 -08:00
howard-stearns
7e7ce0c103 checkpoint 2016-12-20 07:43:48 -08:00
Howard Stearns
b6b80fb9c1 checkpoint 2016-12-20 07:43:48 -08:00
howard-stearns
8d300eac76 pal prototype 2016-12-20 07:43:48 -08:00
David Rowe
2216ab6def Delete redundant code 2016-12-20 07:40:28 -08:00
David Rowe
5fbdd64fff Handle Clara marketplace downloads 2016-12-20 07:40:28 -08:00
David Rowe
767b3ea8e9 Add script injection to Web 3D overlay 2016-12-20 07:40:28 -08:00
David Rowe
ef488ec036 Get script injection working in new marketplaces window 2016-12-20 07:33:55 -08:00
David Rowe
5690bc30ea Automatically continue once Zip file is ready 2016-12-20 07:33:55 -08:00
David Rowe
e40b71b3dd Customize Clara item menu 2016-12-20 07:33:55 -08:00
David Rowe
c7c3dfef3e Fix up library link from Clara item page 2016-12-20 07:33:55 -08:00
David Rowe
f7503ba46c Display "image" option for each Clara marketplace item 2016-12-20 07:33:55 -08:00
David Rowe
1987719cfd Display Clara.io download information 2016-12-20 07:33:55 -08:00
David Rowe
bf2bcc0b80 Add user feedback on download process 2016-12-20 07:33:55 -08:00
David Rowe
b672b7e177 Fix Clara download failing if move mouse after initiating download 2016-12-20 07:33:55 -08:00
David Rowe
196473f9fa Provide keyboard in marketplaces window 2016-12-20 07:33:55 -08:00
David Rowe
b3cc69d608 Inject keyboard raising and lowering script into marketplaces window 2016-12-20 07:33:55 -08:00
David Rowe
420f65b1aa Add keyboard control to marketplaces window 2016-12-20 07:33:55 -08:00
David Rowe
7f809083dc Use Clara.io API for FBX downloads 2016-12-20 07:33:55 -08:00
David Rowe
e1a135591f Code tidying 2016-12-20 07:33:55 -08:00
David Rowe
09ee7b1bd4 Hide brief flash of browser window used for download 2016-12-20 07:33:55 -08:00
David Rowe
a4b2077d5a Set auto adding for Clara downloads 2016-12-20 07:33:55 -08:00
David Rowe
467741f348 Add parameter that enables automatically adding download model to world 2016-12-20 07:33:55 -08:00
David Rowe
5f7a2f3b3c Canonical default browser URL 2016-12-20 07:33:55 -08:00
David Rowe
211cf7a81a Make Clara.io download more robust 2016-12-20 07:33:55 -08:00
Chris Collins
61c60fca2d Merge pull request #8968 from ctrlaltdavid/21089 
Clara.io marketplace improvements
 2016-12-19 18:21:45 -08:00
Anthony J. Thibault
a791ddcc22 Tablet can switch to a web url. 
Help button has been updated to switch to the help.html.  It doesn't look good because
the content was authored expecting landscape window, not portrait.

The API is by no means final.  But it exposes two methods to JS.

* Tablet.gotoHomeScreen() - Used to forcefully go back to the home tablet "springboard", eventually this will
  hooked up to the tablet button.
* Tablet.gotoWebScreen(url) - Causes the tablet to switch from the home "springboard" and load a web url.

tabletTest.js and help.js have been updated to use this functionality.
 2016-12-19 17:52:19 -08:00
Anthony J. Thibault
856791c11d Made TabletRoot.qml the main tablet qml file. 
This file uses a Loader node to load, Tablet.qml.
 2016-12-19 15:15:16 -08:00
Anthony J. Thibault
10f9233c90 Fixed js interface after recent Tablet.qml changes 
* TabletButton.inDebugMode defaults to false
* TabletButton now listens to onIsActiveChanged event to flip state of button.
* Fixed help.js and tabletTest.js to compensate for the removal of the TabletButton.color property
 2016-12-19 12:20:56 -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
Faye Li Si Fi
edd1a02aa1 added debug mode 2016-12-19 09:19:36 -08:00
Faye Li Si Fi
434e7dfbbd reduce testing buttons number to 6 2016-12-19 09:13:12 -08:00
Faye Li Si Fi
01c5c2745d remove commented out code, added uuid property 2016-12-16 16:29:02 -08:00
Faye Li Si Fi
4d98f6979c hover state glow 2016-12-16 13:43:47 -08:00
Faye Li Si Fi
5200dd9581 New color scheme and button state styling 2016-12-16 11:50:04 -08:00
Anthony J. Thibault
3610beb2cd bug-fix found in code review 2016-12-16 09:57:12 -08:00
David Rowe
9459b967be Merge branch 'master' into 21089 2016-12-16 20:02:43 +13:00
Anthony J. Thibault
5441d33a25 Support for the ablity to change button properties from js. 2016-12-15 18:17:14 -08:00
Anthony J. Thibault
5d1ccfbccc Tablet#removeButton now works properly 2016-12-15 15:49:37 -08:00
Anthony J. Thibault
8b99fa90e8 Merge branch 'master' into tablet-ui 2016-12-15 13:28:23 -08:00
Anthony J. Thibault
d2c4417b24 Hook up Help button to the new Tablet interface 2016-12-14 17:05:47 -08:00
howard-stearns
ae4064f445 Merge branch 'master' of https://github.com/highfidelity/hifi into pal-proto 2016-12-14 17:04:52 -08:00
Anthony J. Thibault
d4f9d21ce8 Pass tablet QQuickItem to TabletScriptingInterface 
Also, moved TabletScriptingInterface to script-engine library for easy access, baby.
 2016-12-14 14:04:48 -08:00
Faye Li Si Fi
a651e19bdd audio gradient bar length as a function of 0 to 1 2016-12-14 11:38:36 -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
Brad Hefta-Gaub
e3bc49c302 drop avatar data rate to 45hz 2016-12-13 16:51:59 -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
Faye Li
53263789a0 fix relative path 2016-12-13 16:04:25 -08:00
howard-stearns
03d3e0b550 Merge branch 'master' of https://github.com/highfidelity/hifi into pal-proto 2016-12-13 16:03:00 -08:00
Faye Li
5b8e80654d button glow on hover 2016-12-13 16:01:50 -08:00
Faye Li
ad905ac6dc drop shadow on tablet buttons + set text at instantiation 2016-12-13 15:32:21 -08:00
Brad Hefta-Gaub
a2ba03284e Merge pull request #9186 from ZappoMan/kinectPlugin 
Kinect Plugin
 2016-12-13 15:29:41 -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
Faye Li
8fcc42e537 overriding colors at tablet buttons instantiation 2016-12-13 12:34:38 -08:00
Howard Stearns
7c92ad5ced checkpoint 2016-12-13 09:15:28 -08:00
David Rowe
1f3045ad30 Merge branch 'master' into 21089 
Conflicts:
	interface/src/Application.cpp
 2016-12-13 14:05:24 +13:00
howard-stearns
712543a39a Merge branch 'master' of https://github.com/highfidelity/hifi into pal-proto 2016-12-12 16:37:41 -08:00
howard-stearns
4b5aae3c55 pal prototype 2016-12-12 16:37:16 -08:00
Seth Alves
d97be52542 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2016-12-12 16:24:17 -08:00
Zach Fox
7030c7b0a6 Space bubble improvements (#9142) 
* The space bubble around a player's avatar is now visualized. When another avatar enters a player's bubble, The bubble visualization will appear, a soft tone will play, and the "Bubble" HUD button will flash.
* The space bubble radius setting has been removed. Space bubble size now scales based on avatar scale.
* Space bubble collision detection is now more accurate and reliable.
* CTRL + N toggles the bubble.
* The "Bubble" HUD button has been moved to the proper location.
 2016-12-12 14:22:54 -08:00
Stephen Birarda
5111256a9e resize the sign up dialog when showing errors 2016-12-12 13:04:14 -08:00
Stephen Birarda
a0663bdf31 fix resizing of LoginDialog and friends 2016-12-12 11:32:19 -08:00
Stephen Birarda
691ce4312e fix resizing for keyboard changes in body loaded qml 2016-12-09 16:49:53 -08:00
Stephen Birarda
f0f10d837c fix indents, fix resize for keyboard changes 2016-12-09 16:04:42 -08:00
Brad Hefta-Gaub
4959a88581 first cut at kinect input plugin 2016-12-08 22:13:56 -08:00
Stephen Birarda
673e03aae4 add a spinner to sign up 2016-12-08 17:29:29 -08:00
Stephen Birarda
370de667d5 add a spinner to the login dialog 2016-12-08 17:23:39 -08:00
Stephen Birarda
396c2bc28f add error for login after signup, fix link style 2016-12-08 17:00:47 -08:00
Stephen Birarda
9445fc2898 fix for display of multiple sign up errors 2016-12-08 16:28:16 -08:00
Stephen Birarda
b66ddbdbdb add email field, error handling for sign up inputs 2016-12-08 16:16:37 -08:00
Anthony J. Thibault
319bb9ce78 Prototype of Tablet.qml hacked to appear on ALL web entities. 2016-12-08 15:31:00 -08:00
Stephen Birarda
556ccb90f7 make a SignUpBody loaded by LoginDialog 2016-12-08 14:35:41 -08:00
Stephen Birarda
801a384607 a simple signup dialog copied from login dialog 2016-12-07 16:14:20 -08:00
David Rowe
460d332c6f Delete redundant code 2016-12-07 10:06:32 +13:00
David Rowe
d857f943f8 Handle Clara marketplace downloads 2016-12-07 09:16:59 +13:00
David Rowe
a8a04cfbba Add script injection to Web 3D overlay 2016-12-05 12:19:49 +13:00
David Rowe
a75d0b3fe8 Merge branch 'master' into 21089 2016-11-30 14:50:51 +13:00
Anthony J. Thibault
cbf514a738 PreferenceDialogs now preserve the sort order of their showCategories. 
Specifically, this was to fix the issue with the Neuron plugin preferences being
the top section in the General Preferences dialog, now it is the last.
 2016-11-23 10:11:28 -08:00