Commit graph

104 commits

Author SHA1 Message Date
SamGondelman
9b07880aab migrate materials from userData to materialData 2018-04-09 12:49:03 -07:00
tapalisa
1f958c247f
Merge pull request #12391 from 1P-Cusack/FogBugz/Case_4315_colorpreview_final
[Case 4315] Fixes ColorPicker Color Preview functionality
2018-02-21 16:09:47 -08:00
SamGondelman
4500ed17e7 merge from master 2018-02-13 13:58:39 -08:00
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
LaShonda Hopper
6c5961820c [Case 4315] Fixes Color Picker preview restore functionality (details below).
* The original color preview is now visually retained when the user
  changes the color via the picker when using the Non-Submit configuration (No OK button).
* Clicking the initial old color preview section restores the original/initial color of
  the object.

Tested Desktop & HMD Modes.

Changes Committed:
    modified:   scripts/system/html/css/colpick.css
    modified:   scripts/system/html/js/colpick.js
2018-02-09 14:56:52 -05:00
SamGondelman
4d4294dd6a Merge remote-tracking branch 'upstream/master' into decals 2018-02-02 16:50:01 -08:00
SamGondelman
d7f4b033e8 wip finish adding material entity 2018-02-02 16:49:33 -08:00
Elisa Lupin-Jimenez
ecb53192ad edit properties reflect image members 2018-02-02 10:08:40 -08:00
LaShonda Hopper
180be18178 [Case 4315] Fixes color picker issue in HMD mode (details below).
Previously when in HMD mode, using the color picker to select a color via the
gradient or hue areas would result in the page scrolling making it difficult to
select the color or hue desired.

This resolves the issue by turning off touch actions for the elements
of the color picker that should have it when using the color picker.

Tested in HMD & Desktop mode.

Changes Committed:
    modified:   scripts/system/html/css/colpick.css
2018-01-23 14:02:31 -05:00
LaShonda Hopper
82dd13a82c [Case 7049] Fixes superfluous fields issue with Particle Effects (details below).
When creating or selecting an object entityProperties.html's properties-list is
updated to have and entity type specific class.  This class is used within
edit-style.css to specify rules for the Properties Tab when a certain type of
entity is currently selected.

This resolves the issue with duplicate/misleading color fields for Particle
Effects by adding .ParticleEffectMenu rules to edit-style.css to control the
visible sections.

When the Properties Tab is in the ParticleEffectMenu mode only the following
sections are shown (listed as ordered):
    General Section
    Collision Section
    Physical Section
    Spatial Section
    Behavior Section

Changes Committed:
    modified:   scripts/system/html/css/edit-style.css
    modified:   scripts/system/html/js/entityProperties.js
2017-12-01 15:59:52 -05:00
LaShonda Hopper
b7a959255d [Case 7049] Remove basic color section from non-shape Properties tab.
Changes Committed:
    modified:   scripts/system/html/css/edit-style.css
2017-11-30 15:14:47 -05:00
Andrew Meadows
71ba6ba10a Merge pull request #10807 from jmo7/21356
21356 - Reorder Edit.js
2017-08-08 15:15:37 -07:00
Dante Ruiz
38db4a6f47 fixed create spinner not appearing 2017-08-07 20:03:55 +01:00
VRCat\VRKitten
e4e4ead4af 'Untabified' files 2017-08-02 16:56:02 -06:00
jmo
a2b1b2e0f9 21356 - Reorder Edit.js
Made changes to the 3 sub files for the properties tabs. Although
visually the exiting menu looked like it was in different sections,
structurally it was all just one run of item after item, with a fair
amount of div-itis. I added in fieldsets to provide true groups and
replaced much of the div-ities with aditional feidlsets as they are the
smeantic element to use here.
2017-07-10 15:49:26 -06:00
Anthony Thibault
0d46b78bff Merge pull request #10541 from Menithal/21324
Reworked Particle Editor UI
2017-06-13 13:00:54 -07:00
Menithal
00701eb5c7 Merge remote-tracking branch 'origin/master' into 21324 2017-06-13 19:08:37 +03:00
Seth Alves
eb049c8c6e Merge pull request #10624 from misslivirose/feat/add-primitive-shapes
Add additional primitive shapes
2017-06-09 19:02:54 -07:00
seefo
8d5b90afe7 Merge pull request #10600 from seefo/snapshot
Added Polaroid Feature to Snapshot
2017-06-07 17:05:29 -07:00
Liv Erickson
6e5cb63d4f Add z-index fix for dropped down list 2017-06-06 09:15:41 -07:00
Liv
9248715b21 Fixing z-index for Shape drop down 2017-06-05 17:37:32 -07:00
seefo
655a411865 Cleaned up Polaroid code 2017-06-02 11:02:01 -07:00
seefo
4e190434d1 Added polaroids to snapshots 2017-06-01 16:53:48 -07:00
David Rowe
d891c834ba Move record script files to unpublishedScripts directory 2017-05-31 09:06:11 +12:00
Menithal
4269fcf69c Lots of Groundwork for UI Building
- Changed underscore to lodash for smaller file size / faster loading
- Removed dat.gui dependency, as we now have a completely custom
solution
- Started to use some more modern convensions which Qt Supports
2017-05-21 19:42:14 +03:00
Zach Fox
2ad3346697 Are there bugs? 2017-05-04 16:05:20 -07:00
Zach Fox
946c5e7662 Almost finished with not-logged-in and not-shareable 2017-05-04 15:24:51 -07:00
Zach Fox
c7f5115e26 Move help text to above buttons 2017-05-04 10:06:52 -07:00
Zach Fox
c82a07016d New Preparing text; Better disabled behavior 2017-05-03 11:30:44 -07:00
Zach Fox
09488c4987 Disabled state for share butotns 2017-05-03 11:02:44 -07:00
Zach Fox
68fa8e06ef Super amped about this. Only need to add disabled state? 2017-05-02 16:38:16 -07:00
Zach Fox
7817c72ea1 Another checkpoint 2017-05-02 15:58:43 -07:00
Zach Fox
0beceae59b Checkpoint 2017-05-02 15:19:20 -07:00
Zach Fox
d1dff7606c Lint cleanup; Immediate share button visibility; 2017-05-02 14:10:24 -07:00
Zach Fox
0ead9e5a24 Visual fixes; Select only 1 image at a time 2017-05-02 10:11:53 -07:00
Zach Fox
d295b5a69d ShareBarHeight-= 5px; Remove test call 2017-05-02 10:11:53 -07:00
Zach Fox
5b168301bc Update some typefaces; Add margins to pics 2017-05-02 10:11:53 -07:00
Zach Fox
3f146fca9d Fix announcement audience; Fix disabled buttons 2017-04-27 15:36:59 -07:00
Zach Fox
832e16ef86 Visual tweaks; fix active share buttons; comment out tests 2017-04-27 14:01:07 -07:00
Zach Fox
0ac660d4ab Cleanup 2017-04-27 14:01:07 -07:00
Zach Fox
b6601feb1d It's 5 already? 2017-04-27 14:01:07 -07:00
Zach Fox
a24a48843f Checkpoint 2017-04-27 14:01:07 -07:00
Zach Fox
3221214283 New Snap FTUE flow 2017-04-27 14:01:07 -07:00
Zach Fox
92187e2424 Making progress towards file chooser dialog 2017-04-27 14:01:07 -07:00
Zach Fox
8c9cd0fad0 Custom social buttons; better testing functionality 2017-04-27 14:01:07 -07:00
Zach Fox
f838e87f48 Pretty stable... 2017-04-27 14:01:06 -07:00
Zach Fox
01e78612c7 Soooo much progress today 2017-04-27 14:01:06 -07:00
Zach Fox
16b4af8a9d Rearchitecture 2017-04-27 14:01:06 -07:00
Zach Fox
2880b22f9f External share buttons! 2017-04-27 14:01:06 -07:00
Zach Fox
4270086a22 Support 1 and 2 images 2017-04-27 14:01:06 -07:00