Commit graph

126 commits

Author SHA1 Message Date
SamGondelman
84cd0e1529 wip live material swapping on model entities, model overlays, avatars,
and albedo swap on shape entities
2018-02-09 12:00:08 -08:00
Elisa Lupin-Jimenez
d7a847930d added image icon 2018-02-02 10:27:44 -08:00
Alexander Ivash
a0c41f26d1 FB11855 - Change bubble icon on tablet 2018-02-01 01:25:29 +03:00
Gabriel Calero
999e3a39fa Add mode selector (my view / radar), not finished 2018-01-30 14:48:37 -03:00
Gabriel Calero
7fb28f4296 Add audio bar to mute/unmute the mic 2018-01-30 14:48:37 -03:00
Gabriel Calero
07a542e35d Add bottom bar and address dialog (Android) 2018-01-30 14:48:37 -03:00
ZappoMan
f6062ebfcc new icon and button layout 2018-01-19 16:00:08 -08:00
Menithal
ca2d22a192 Updated Scripts 2017-09-12 21:22:40 +03:00
Menithal
30c979bd31 Added Clap App to Repository
Addede Clap App Icons to tablet icons (there needs to be another way to
do this than link directly to link or use this method!)
Added module as valid global to eslintrc
2017-09-11 23:48:30 +03:00
Hisham Qayum
6f1bb6abe2 wallet icon now has white background, diff design 2017-08-31 14:29:03 -08:00
Zach Fox
9636fad679 Updates from wireframes 2017-08-18 13:45:30 -07:00
Andrew Meadows
9584035aa4 Merge pull request #10886 from 1P-Cusack/21420
[Worklist #21420] Implement Create button disabled state (details below).
2017-07-14 10:06:45 -07:00
Zach Fox
dc1b4b5324 New icons 2017-07-12 16:48:04 -07:00
Zach Fox
1afa2d3775 Spectator camera icon 2017-07-06 16:24:50 -07:00
LaShonda Hopper
9cae868492 [Worklist #21420] Implement Create button disabled state (details below).
* The create button icon is set to its disabled resource when the user
enters a domain where they have _neither_ Rez or TempRez permissions.
** If the user has either of the Rez permission levels then the normal edit-i.svg
icon is used and the user is able to create items as before.

* When the user clicks the button in this state, the INSUFFICIENT_PERMISSIONS_ERROR_MSG
is shown and creation menu is not shown.

* The disabled icon, edit-disabled.svg, is based on the edit-i.svg and is set to 33% opacity.

Item Ticket Link: https://worklist.net/21420

Changes to be committed:
	new file:   interface/resources/icons/tablet-icons/edit-disabled.svg
	modified:   scripts/system/edit.js
2017-07-06 10:53:46 -04:00
Brad Hefta-Gaub
a32f7b2395 Merge pull request #10743 from humbletim/21383
CR 21383: Integrate attachments into doppleganger mirror
2017-06-26 09:54:04 -07:00
Zach Pomerantz
7512332104 replace mic-mute icons with red variants 2017-06-19 15:07:28 -07:00
humbletim
89ebf4998f relocate/archive original doppleganger mirror into unpublishedScripts/marketplace/doppleganger-mirror 2017-06-19 10:28:56 -04:00
David Rowe
bc4af86b57 Display spinner in Web controls when they're loading an HTTP page 2017-05-23 15:40:35 +12:00
Anthony Thibault
c40e3d6ac9 Merge pull request #10272 from Triplelexx/21292
21292 - Implement a script to hand-raise while in desktop mode
2017-05-11 17:38:27 -07:00
Howard Stearns
88c3b4d9d3 Merge pull request #10258 from howard-stearns/watch-for-announcements
watch for announcements
2017-04-27 14:00:39 -07:00
humbletim
f8bbd9174c Merge remote-tracking branch 'upstream/master' into 21281 2017-04-26 18:26:15 -04:00
humbletim
760113f9c9 add doppleganger example/placeholder icons 2017-04-25 16:29:34 -04:00
Triplelexx
9b5f19399c create tablet-raiseHand.js 2017-04-25 00:45:06 +01:00
howard-stearns
fac40f51d9 message waiting art 2017-04-21 16:00:23 -07:00
David Rowe
477237cca2 Red "recording" ring animation with countdown numbers inside 2017-04-21 16:07:50 +12:00
David Rowe
aaf9b40bb3 New app icon 2017-04-21 15:20:08 +12:00
Zach Fox
c724c2e50b New loading icon 2017-04-12 14:45:57 -07:00
Zach Fox
87b2d5bf8a New loading icon 2017-04-12 14:45:57 -07:00
Zach Fox
6a4c2c5e12 Fix issues; checkpoint on new ComboDialog 2017-03-31 14:56:42 -07:00
Zach Fox
a6ff3fcdb7 Tablet PAL bugfix; Connections help text v1 2017-03-29 15:47:19 -07:00
Zach Fox
b776f25b3b Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2 2017-03-28 18:09:17 -07:00
Zach Fox
81264c998b Revert "Merge from upstream/master"
This reverts commit b5ba4a109d.
2017-03-28 17:39:45 -07:00
Zach Fox
b5ba4a109d Merge from upstream/master 2017-03-28 17:37:34 -07:00
Zach Fox
e48123b5bb Merge from Master 2017-03-23 09:54:14 -07:00
Seth Alves
cc4ddd1387 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-03-21 08:43:35 -08:00
Mohammed Nafees
c460523980 Remove related icon files for Scripts Editor 2017-03-20 00:25:50 -04:00
Seth Alves
b5919d89a5 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-03-15 08:26:10 -08:00
howard-stearns
db06c2650f Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2 2017-03-13 11:53:48 -07:00
Zach Fox
beb848373b Update from zfox23/PALv2 branch 2017-03-13 10:15:06 -07:00
Brad Hefta-Gaub
23e47f2fdc added icons to the audioScope app 2017-03-10 18:13:35 -08:00
Seth Alves
57ab2ba7ca Merge pull request #7 from fayeli/edit-js-create-tab
Create Tab and Tab Bar QML Styling
2017-02-23 17:40:48 -08:00
Faye Li
3850bc35a9 icons on new entity buttons 2017-02-23 13:31:03 -08:00
David Rowe
2c02b42c96 Finger paint button icon files 2017-02-18 14:21:54 +13:00
David Rowe
784009a9fa Merge branch 'master' into 21168 2017-02-18 13:20:39 +13:00
David Rowe
585691f71c Add finger painting button to tablet 2017-02-17 19:29:11 +13:00
Anthony J. Thibault
67302cbd2b toolbar work to better support tablet buttons 2017-02-15 15:53:08 -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
David Rowe
625f5efdf8 Merge branch 'master' into 21164
# Conflicts:
#	scripts/system/audio.js
2017-02-15 10:00:52 +13:00
Anthony J. Thibault
adc50dd30f Added active versions of each tablet image, with black bg. 2017-02-13 13:55:33 -08:00
David Rowe
acaf8c69c6 Better tablet mic muted and unmuted iconography 2017-02-11 11:07:31 +13:00
Faye Li
49a8964c4e reference new users icon art 2017-01-25 14:43:39 -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
Dante Ruiz
5ed8831bee all hud buttons on tablet 2016-12-21 23:25:40 +00:00
Zach Fox
1eea3ed27d No more semicolons; tons of improvements 2016-12-21 12:48:26 -08:00
Zach Fox
5b77202c52 Popups wow! 2016-12-21 12:48:25 -08:00
Dante Ruiz
fa761af1a6 update#2 2016-12-20 15:39:17 -08:00
Dante Ruiz
8698ee61cd commit update 2016-12-20 15:39:17 -08:00
Faye Li
dc72a0fd2f tablet mic mute and unmute icons 2016-12-13 12:18:19 -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
howard-stearns
43c7fd1e27 New art. 2016-07-01 10:34:13 -07:00
howard-stearns
f03f5f3e68 new icons 2016-06-30 16:47:10 -07:00
Brad Davis
b9ee0c087e Add a constant hud toggle button to the UI 2016-06-07 13:45:23 -07:00
Seth Alves
073d845bb5 show with debug icons when someone else is the simulation owner 2016-05-05 18:33:01 -07:00
Seth Alves
715a46ee82 show actions in status icons 2015-11-11 16:35:04 -08:00
Seth Alves
b38c1cb30f add icons 2015-11-11 08:01:21 -08:00
Thijs Wenker
9d2ae661e1 removed some XML from start-script button which possible caused an error before 2015-10-14 21:10:52 +02:00
Thijs Wenker
c585647f10 ScriptEditor Improvements:
- fixed run icon
2015-10-14 21:00:50 +02:00
Kai Ludwig
0de598586c removed id "g3322" in start-script.svg because it is no longer used and causes a "link rect899 hasn't been detected!" message on script editor open. 2015-02-17 18:37:23 +01:00
Thijs Wenker
c016d6557e - few Adjustments in Application class for Script editor
- Shortkey for script editor (Alt+S)
- highlighter: bold true/false , single line comments
- Run scripts from the editor works
- More icons from Maximillian, Thanks
- Run on the fly checkbox, works if the script is running.
- Load/save features
2014-04-21 05:25:28 +02:00
Thijs Wenker
af47510b05 Initial script editor widget / icons made by MaximillianMerlin ty 2014-04-15 00:30:01 +02:00
Atlante45
64031701e1 Added icons for import dialog buttons 2014-02-19 12:33:05 -08:00
stojce
80561b6861 removed size hint from sag icons 2014-01-10 23:47:18 +01:00
stojce
d5e07a5c75 Add import configuration
remove unused icons
remove redundant QLabels
2014-01-10 23:26:58 +01:00
stojce
cc543f4313 Added custom icons (QFileIconProvider) 2014-01-07 00:41:11 +01:00