Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-17 00:07:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
85900 commits 24 branches 28 tags 1.2 GiB
Commit graph

799 commits

Author SHA1 Message Date
David Back
a88678fb70 fix bad css merge, add particle property debounce 2018-10-24 15:07:47 -07:00
David Back
5c1972e3f4 fix fallback properties 2018-10-24 12:40:44 -07:00
Howard Stearns
e1e9b78427 filter priced items from marketplace 2018-10-24 12:22:03 -07:00
David Back
b3e0d51260 Merge branch 'master' of https://github.com/highfidelity/hifi into entityPropertiesRefactor 2018-10-24 11:48:56 -07:00
Howard Stearns
8ee6a0ceff disable priced items 2018-10-24 11:37:02 -07:00
David Back
073040d1fc
Merge branch 'master' into entityListTypeFilter 2018-10-24 10:39:30 -07:00
Ryan Huffman
6221b9ee59
Merge pull request #14149 from thoys/feat/create/entityList-autoScroll 
MS19054: [CreateApp/EntityList] auto scroll
 2018-10-24 10:36:21 -07:00
Thijs Wenker
5f35a32480 remove duplicate calls to refresh footer 2018-10-24 17:58:07 +02:00
Thijs Wenker
8e1cfb5a06 fix double click selection 2018-10-24 17:58:07 +02:00
Thijs Wenker
776b8b8fc7 CR and style fixes 2018-10-24 17:58:06 +02:00
Thijs Wenker
27e0c85b01 entity list auto scroll 2018-10-24 17:58:06 +02:00
David Back
2b9dcd0875 fix particle properties and keylight direction, remove columns, fix orderings, fix sliders 2018-10-23 18:38:05 -07:00
Thijs Wenker
3fa4ee0e1d enable duplicate copy cut paste functionality of context menu 2018-10-23 22:42:55 +02:00
Thijs Wenker
4069ca2e0c CR feedback 2018-10-23 22:42:55 +02:00
Thijs Wenker
e5ef589a3c style 2018-10-23 22:42:54 +02:00
Thijs Wenker
4c3f5b3bbc Entity List Context Menu 2018-10-23 22:42:54 +02:00
Howard Stearns
95b86bf5b7 initial limited commerce for oculus store prototype 2018-10-23 13:08:39 -07:00
David Back
9afb111fbe add link, fix group order 2018-10-22 18:42:06 -07:00
David Back
d5dc93e800 QA fixes and reset server script status 2018-10-22 18:31:21 -07:00
David Back
e5caf01681 CR change for body click event 2018-10-22 14:51:54 -07:00
David Back
ddbe02dd4e CR changes and fix extra info toggle 2018-10-22 11:56:47 -07:00
David Back
76dbee265e Merge branch 'master' of https://github.com/highfidelity/hifi into entityListTypeFilter 2018-10-19 16:05:04 -07:00
David Back
e59f1516ef CR changes 2018-10-19 16:01:53 -07:00
David Back
11add70ef2 style tweaks 2018-10-18 14:58:51 -07:00
Seth Alves
7f150e6ed3 Move grab pseudo-properties (userData) into first-class EntityItemProperties. 2018-10-18 09:53:18 -07:00
David Back
6b5e616d2a
Merge branch 'master' into entityPropertiesRefactor 2018-10-17 20:01:15 -07:00
David Back
ad920ddc86 fix double min, unique collides subproperty ids 2018-10-17 19:44:38 -07:00
Thijs Wenker
b9cfa28c08 style fixes 2018-10-17 19:42:47 -07:00
Thijs Wenker
684f7d5689 move export selection button to bottom of the list 2018-10-17 19:37:56 -07:00
David Back
9cd3c35cc6 style changes and fix hidden top row 2018-10-17 18:18:51 -07:00
Brad Hefta-Gaub
0e0542ec6e
Merge pull request #13890 from sethalves/grab-properties-1 
move grab pseudo-properties (userData) into first-class EntityItemProperties
 2018-10-17 13:29:20 -07:00
David Back
001601d28f Merge branch 'master' of https://github.com/highfidelity/hifi into entityListTypeFilter 2018-10-17 11:30:10 -07:00
David Back
a2aa63e9ed adjust no entities message 2018-10-16 14:28:52 -07:00
David Back
50becb5c37 merge particle explorer into properties, resurrect sliders, other tidying/fixes 2018-10-16 12:39:34 -07:00
Thijs Wenker
f1885159d2 style fixes 2018-10-15 21:17:41 +02:00
unknown
978cd4bb77 styling tweaks, fix X clear search not refreshing 2018-10-12 18:57:26 -07:00
unknown
6320f9bab7 tweaks 2018-10-12 11:39:54 -07:00
unknown
97438a08d9 styling fixes, add icon, adjust Types text, click outside to close 2018-10-11 23:04:33 -07:00
David Back
4883a60afc entity list type filter WIP - still some style issues 2018-10-11 18:55:14 -07:00
David Back
62c5fb8e2e tweaks / dropdown fix 2018-10-11 14:25:06 -07:00
David Back
3f08400741 comment 2018-10-11 12:48:08 -07:00
David Back
5528050898 CR changes - propertyName vs propertyID, store name/elementID, return property element 2018-10-11 12:44:07 -07:00
David Back
ac0e999629 fix colors 2018-10-10 17:31:06 -07:00
David Back
31e665ab8b CR changes - runtime property data rework 2018-10-10 16:49:20 -07:00
David Back
60d102c9bf styling fixes 2018-10-09 12:42:57 -07:00
David Back
7aba0a9082 cleanup 2018-10-09 10:17:39 -07:00
David Back
27d9e8bd23 initial pass refactored re-ordered data-driver entity properties 2018-10-09 10:11:30 -07:00
Thijs Wenker
66c533b557 move export selection button to bottom of the list 2018-10-03 19:35:03 +02:00
John Conklin II
9a614d7523
Merge pull request #13977 from dback2/newEntityListView 
New optimized entity list view
 2018-10-03 09:23:11 -07:00
Seth Alves
834699fa12 Move grab pseudo-properties (userData) into first-class EntityItemProperties. 2018-10-02 08:54:12 -07:00
John Conklin II
9cbd819a39
Merge pull request #13965 from ctrlaltdavid/M17428-f 
Mini tablet in palm
 2018-10-01 16:56:36 -07:00
John Conklin II
3bbc01477e
Merge pull request #14055 from davidkelly/dk/18147 
Do not have active buy button on invalidated items
 2018-10-01 16:50:53 -07:00
David Back
215e7e6da7 remove unneeded variable 2018-09-27 17:04:43 -07:00
David Back
b7c098c260 remove unneeded variable 2018-09-27 17:02:54 -07:00
David Back
4204adf60f fix deselecting entity when re-clicking row, fix ctrl/shift selections 2018-09-27 16:59:23 -07:00
David Rowe
fc78d0582e Tidying 2018-09-28 10:18:00 +12:00
David Rowe
2456fd0e99 Merge branch 'master' into M17428-f 2018-09-28 08:41:57 +12:00
David Back
046a4e4041 ordering/comment tweak 2018-09-26 18:02:15 -07:00
David Back
7e7dc33acd more CR changes + fix resizing 2018-09-26 17:57:44 -07:00
Howard Stearns
940db4f112 fix recently introduced bug 2018-09-26 15:01:30 -07:00
John Conklin II
9916496118
Merge pull request #14041 from huffman/fix/entity-list-no-highlight-74 
Fix entity list selection failing when selecting entities not in list
 2018-09-24 11:02:36 -07:00
David Back
df48c60a8f further improvements/fixes 2018-09-24 10:28:37 -07:00
David Kelly
fe9b972c80 Do not have active buy button on invalidated items 2018-09-21 15:46:57 -07:00
David Back
506b9d8645 more fixes for deleting/selecting, potential optimizations 2018-09-21 10:02:41 -07:00
David Rowe
5719b7020d Merge branch 'master' into M17428-f 2018-09-21 10:47:56 +12:00
Ryan Huffman
1ee655c8f8 Fix sorting of entity list not working as expected 2018-09-20 13:51:00 -07:00
Ryan Huffman
72adfb7ff0 Fix entity list selection failing when selecting entities not in list 2018-09-20 13:46:22 -07:00
David Back
e1758c7974 CR changes 2018-09-20 11:08:01 -07:00
David Back
e701c79984 Merge branch 'master' of https://github.com/highfidelity/hifi into newEntityListView 2018-09-19 14:06:28 -07:00
Zach Fox
9e50904376 Merge branch 'master' of github.com:highfidelity/hifi into discovery_appUi 2018-09-14 14:36:22 -07:00
David Back
86972cf4fb
Merge pull request #13992 from dback2/entityListSearchCase 
Fix entity list search case-sensitivity and allow id search
 2018-09-14 10:58:44 -07:00
David Back
296e2ba488 lowercase search term at start 2018-09-14 09:57:27 -07:00
howard-stearns
685b2978ce Text tuning for wallet setup call to action 2018-09-14 08:26:25 -07:00
unknown
f9480c24a5 store search term lower 2018-09-13 20:07:49 -07:00
David Back
b65bd6736f also allow search using entity id 2018-09-13 18:20:11 -07:00
David Back
4bc046187a fix searching case-sensitivity 2018-09-13 15:06:14 -07:00
David Back
34afe7a69a remove fixing search cases (for separate PR) 2018-09-13 15:01:49 -07:00
David Back
56ddafed26 fix deleting scroll-away items, fix searching case sensitivity, comments 2018-09-13 14:56:12 -07:00
Zach Fox
01073ca18d Lots of changes; marketplaces.js working now 2018-09-12 15:46:17 -07:00
David Back
70d427f852 more fixes for resizing, deleting, selecting etc 2018-09-12 09:43:14 -07:00
Zach Fox
6d345e506b Marketplaces.js WIP 2018-09-11 19:42:12 -07:00
David Back
7eb05a3cc8 merge changes, fix various issues 2018-09-11 16:34:21 -07:00
David Rowe
a1c49bd2b6 Hide mini tablet if lasering or grabbing something else 2018-09-12 11:18:26 +12:00
David Rowe
de95ee0a18 Merge branch 'master' into M17428-f 2018-09-12 09:49:29 +12:00
Ryan Huffman
4b8f5ea6b9 Fix syntax and duplicate event handlers in entityList.js 2018-09-10 16:44:13 -07:00
Ryan Huffman
5aa5552727 Fix PROFILE not forwarding calls when disabled 2018-09-10 14:07:25 -07:00
David Rowe
66f75e856e Fix goto and expand displaying as hovered when redisplay mini tablet 2018-09-08 16:41:36 +12:00
Ryan Huffman
9b9785d250 Fix entity list not handling deleted entities 2018-09-07 12:04:14 -07:00
David Rowe
f3cbca6cee Change "bubble" button to "goto" 2018-09-07 16:43:21 +12:00
David Back
b82f6d0bad lines/spacing 2018-09-06 16:54:58 -07:00
David Back
0a67c49ef9 remove separate new entity list with option, fix row clicking 2018-09-06 16:50:36 -07:00
David Back
82ed57e41f triple list structure, added columns, sorting 2018-09-05 17:59:03 -07:00
Ryan Huffman
335f66d165 Add filtering support to entity list 2018-09-05 14:30:48 -07:00
Ryan Huffman
a9a5bf1e97 Replace entity list UI with custom, brute-force solution 2018-09-05 14:30:19 -07:00
Ryan Huffman
f2cc2f1485 Update entity list UI to be updated in a single batch 2018-09-05 14:30:19 -07:00
Ryan Huffman
f6ac755bae Add profiling to edit.js fof the entity list 2018-09-05 14:30:19 -07:00
David Back
40d4f581f5 working scrolling 2018-09-05 13:16:23 -07:00
unknown
f941026a62 new entity list view wip 2018-09-04 19:11:09 -07:00
David Rowe
e5c733e7f2 Merge branch 'master' into M17428-c 2018-08-29 08:20:00 +12:00
John Conklin II
fcdbc6c6d2
Merge pull request #13778 from SamGondelman/bloom 
Enable bloom in zone properties
 2018-08-24 14:46:31 -07:00
David Rowe
f4a8dc49e9 Add button sounds 2018-08-21 10:28:23 +12:00
David Rowe
4268297769 Mini tablet button actions 2018-08-21 09:17:53 +12:00
David Rowe
6791d3f1b6 Mini tablet button icons and states 2018-08-21 08:36:04 +12:00
David Back
1d0da4042a
Merge pull request #13771 from dback2/entityListCtrlReselection 
Reselecting same entity in list will unselect it
 2018-08-10 10:41:57 -07:00
John Conklin II
6c647c8185
Merge pull request #13768 from thoys/fix/create/triggerable-reset 
MS17413 Triggerable value does not reset on entity deselect
 2018-08-09 17:13:34 -07:00
David Back
a04ffd969e deselect when reselecting same entity, fix indents 2018-08-08 13:32:38 -07:00
SamGondelman
fb75b42059 working on enabling bloom 2018-08-07 22:26:30 -07:00
David Back
d88615219c CR changes 2018-08-07 10:19:48 -07:00
David Back
174519e86e fix reselecting same entity in list 2018-08-07 09:56:51 -07:00
Thijs Wenker
95c32c8e45 fix reset triggerable checkbox 2018-08-07 17:23:49 +02:00
David Back
f9e25d36e7 use wrapper emitScriptEvent, change to Fetching 2018-08-06 17:52:27 -07:00
David Back
e5abd9d57d fix server script status event, use [ Getting status ] 2018-08-06 17:03:32 -07:00
Ryan Huffman
431cbf2694
Merge pull request #13699 from thoys/fix/create/triggerable 
MS16809: handle both triggerable and wantsTrigger in CreateApp
 2018-07-31 10:34:31 -07:00
David Back
ff6ed971d8 comments, re-org, submesh number 2018-07-26 15:40:27 -07:00
Thijs Wenker
6e23caca0d handle both wantsTrigger and triggerable in CreateApp 2018-07-26 20:25:42 +02:00
David Back
cb8e9f218b reset all property fields when no selection 2018-07-26 11:23:28 -07:00
Wayne Chen
aefa52b4c9 fixing still only snap in snap app 2018-07-02 17:00:31 -07:00
John Conklin II
a38859e4da
Merge pull request #13397 from ctrlaltdavid/21893 
Fix Create app selection updating when entities are deleted
 2018-06-26 17:06:43 -07:00
David Back
39b3e5a711 tabs 2018-06-22 18:15:16 -07:00
David Back
09ccd3acf0 fix multi-selection color setting visible/locked to false 2018-06-22 18:13:40 -07:00
David Rowe
d43be5ce19 Code review 2018-06-21 16:35:37 +12:00
David Rowe
064f4ca204 Remove deleted entities from list without scrolling to top 2018-06-19 16:22:59 +12:00
David Rowe
5de451e8e0 Update entity list upon entity deletion 2018-06-19 14:52:49 +12:00
Zach Fox
a5ef3fa729 Fix MS14129: Prevent Marketplace buttons from getting stuck on hover state 2018-06-11 12:00:51 -07:00
howard-stearns
a84829392f Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll 2018-05-29 16:14:22 -07:00
Zach Fox
0021af8714 Merge in in-progress changes from old commerce_paginationAndFiltering branch 2018-05-16 12:28:52 -07:00
David Back
1e2d2819d5 tweaks 2018-05-15 17:36:39 -07:00
David Back
f8fc7bedd7 Merge branch 'master' of https://github.com/highfidelity/hifi into cloneables 2018-05-15 17:31:43 -07:00
David Back
f74e219029 rename properties, add clone avatar entity, remove worldEntityProps arg, fix clone ID cleanup on delete 2018-05-15 17:24:14 -07:00
David Back
1aa653c5db tabs 2018-05-09 18:20:07 -07:00
David Back
3241c18271 first pass cloneables WIP 2018-05-09 18:10:40 -07:00
David Rowe
3c2bee757a Remove calls to function that's been removed 2018-05-05 12:14:40 +12:00
David Rowe
dd8eac8cb2 Remove superfluous keyboardControl.js file and references 
The raiseAndLowerKeyboard.js script is automatically injected into these pages, instead.
 2018-05-04 16:14:42 +12:00
Zach Fox
4e48008ba1 Don't allow users to spam Still Only snapshot capture 2018-04-17 12:39:46 -07:00
SamGondelman
9b07880aab migrate materials from userData to materialData 2018-04-09 12:49:03 -07:00
Zach Fox
98cdbbb3e6 Small update to dot before merging in filterBar 2018-03-14 09:45:42 -07:00
Zach Fox
e2326a3733 Initial work for 'messages waiting' light 2018-03-13 17:05:16 -07:00
Zach Fox
7b6b08fd26 Upgrade specific edition 2018-03-13 13:51:10 -07:00
Zach Fox
f42255f46b Merge branch 'master' of github.com:highfidelity/hifi into commerce_upgrades_1 2018-03-13 13:42:42 -07:00
Zach Fox
08b2be85d2 Don't pass isUpdating around 2018-03-07 11:44:54 -08:00
Zach Fox
d07d02b2bc Take certID from backend instead of query params; Better loading; Uninstall app before updating 2018-03-07 11:10:47 -08:00
Zach Fox
91e0af9b46 Merge branch 'master' of github.com:highfidelity/hifi into commerce_upgrades_1 2018-03-07 10:16:10 -08:00
NissimHadar
d72f46ec3e Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork 2018-03-06 16:24:53 -08:00
Atlante45
edeed95ccc Merge branch 'RC65' of https://github.com/highfidelity/hifi into new-master 2018-03-06 15:33:12 -08:00
NissimHadar
dbf1be5de3 Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork 2018-03-06 15:22:40 -08:00
Zach Fox
ee28983334 Merge branch 'master' of github.com:highfidelity/hifi into commerce_upgrades_1 2018-03-06 11:13:40 -08:00
Zach Fox
35b23cc954 It's working! 2018-03-05 15:54:17 -08:00
Thijs Wenker
d7725f1d73 make the grabbable checkbox again, respect default true setting 2018-03-05 20:54:08 +01:00
Dante Ruiz
1997cd27bd correctly use default values 2018-03-05 11:26:37 -08:00
Zach Fox
4046c873bd Still need to send correct thing to metaverse 2018-03-05 11:24:59 -08:00
Zach Fox
f10f9aa939 Continued progress 2018-03-05 10:01:40 -08:00
Zach Fox
f53aba2a32 Initial progress 2018-03-02 15:53:06 -08:00
NissimHadar
0f2cf8ea85 Re-implemented shadow controls. 2018-03-01 14:24:20 -08:00
SamGondelman
0fca56eef0 Revert "Merge pull request #12407 from NissimHadar/shadowControlsOffZvork" 
This reverts commit 3201d2ba21, reversing
changes made to c0f20900a0.
 2018-02-27 11:33:05 -08:00
NissimHadar
c6580f642a Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork 2018-02-22 13:45:00 -08: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
Nissim Hadar
b519ebd6f1 Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork 2018-02-21 12:36:56 -08:00
David Rowe
44aafd92a4 Merge branch 'master' into 21757 
# Conflicts:
#	scripts/system/html/js/entityProperties.js
 2018-02-20 17:34:59 +13:00
Nissim Hadar
b2a06cdb98 Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork 
# Conflicts:
#	libraries/entities/src/EntityItemProperties.cpp
#	libraries/entities/src/ShapeEntityItem.h
#	libraries/networking/src/udt/PacketHeaders.cpp
#	libraries/networking/src/udt/PacketHeaders.h
 2018-02-19 13:05:57 -08:00
David Rowe
65efeadf10 Fix selecting values when tabbing between entity properties fields 2018-02-19 19:17:23 +13:00
Nissim Hadar
ff43e4c2ad Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork 
# Conflicts:
#	scripts/system/html/js/entityProperties.js
 2018-02-15 11:53:11 -08:00
Nissim Hadar
777862f253 can cast shadow flag now works correctly (UI/JS aspects). 2018-02-15 11:50:38 -08:00
Sam Gondelman
36a74eaeee
Merge branch 'master' into decals 2018-02-15 11:02:49 -08:00
Nissim Hadar
adb02d69f9 WIP -adding canCastShadow flag. 2018-02-14 21:45:56 -08:00
Nissim Hadar
12f4b8dbb1 Corrected event listener for canCastShadow - still bad. 2018-02-14 19:12:24 -08:00
Nissim Hadar
054b2bf3e2 Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork 
# Conflicts:
#	libraries/networking/src/udt/PacketHeaders.cpp
#	scripts/system/html/js/entityProperties.js
 2018-02-14 17:10:07 -08:00
SamGondelman
324eefc914 remove fresnel, add unlit, fix overlays, cleanup 2018-02-14 17:02:07 -08:00
LaShonda Hopper
d466c079a4 Simple fix for 801 Uncaught TypeError (details below). 
entityProperties.js was throwing out: 801 Uncaught TypeError: Cannot read property 'split' of undefined

This moves properties.modelURL related checks behind the property.type validation check to avoid
calling the function on an undefined member if the object doesn't have that key defined.

Changes Committed:
    modified:   scripts/system/html/js/entityProperties.js
 2018-02-14 17:00:52 -05:00
Nissim Hadar
a92765a83a Adding can cast shadow property. 2018-02-14 12:01:30 -08:00
SamGondelman
4500ed17e7 merge from master 2018-02-13 13:58:39 -08:00
SamGondelman
38290064c1 replace materials by name, hide material mode for now 2018-02-13 13:24:08 -08:00
Elisa Lupin-Jimenez
a61021f46c
Merge pull request #12272 from elisa-lj11/2d-images 
2d images (JPG and PNG) are now supported as (quasi) entities
 2018-02-13 11:44:02 -08:00
SamGondelman
9e8aa1898c warnings, load material from URL, shapeID -> parentMaterialID 2018-02-12 12:50:09 -08:00
LaShonda Hopper
b058b346bd [Case 4315] ESLint Pass 7 for colpick.js resolves regex error (details below). 
Issue Count for colpick is now 0.

Changes Committed:
    modified:   scripts/system/html/js/colpick.js
 2018-02-09 18:25:50 -05:00
LaShonda Hopper
fed85a7a53 [Case 4315] ESLint Pass 6 Pt 2 for colpick equality checks (details below). 
* Suppressing equality checking issues within color conversion helper functions.
    * These issues are suppressed as opposed to resolved because their resolution causes
      issues with the color picker's understanding of the color it's being set to along with
      the respective hue.  This is likely due to rounding issues; however, it may also be something
      related to the equality operator implicit conversions semantics of JavaScript.  It's something
      that can be looked into later if desired.
          * Bug Steps upon resolving check as opposed to suppressing them:
              - Select a shape entity for example.
              - Note the visual color and actual RGB values for that entity's color upon selection.
              - Click the Color Wheel.
              - Notice the automatic change of the color for the entity when the picker is shown.
                  - If the issue doesn't show itself right away, alter the color for the entity close the
                    picker, and repeat steps 2-3.

* Issue Count reduced from 8 to 1

Changes Committed:
    modified:   scripts/system/html/js/colpick.js
 2018-02-09 18:21:37 -05:00
LaShonda Hopper
59e0b8476a [Case 4315] ESLint Pass 6 Pt 1 for colpick.js (details below). 
First portion of vetted equality check fixes.
Issue Count reduced from 28 to 8.

Changes Committed:
    modified:   scripts/system/html/js/colpick.js
 2018-02-09 17:57:42 -05:00
LaShonda Hopper
83749b16c7 [Case 4315] ESLint Pass 5 resolves hex already defined issue (details below). 
* var hex was declared both the hexToRGB and hexToHsb functions.
    * hexToRGB was updated to have a more explicit var name
    * hexToRGB & hexToHSB also had the function param name updated to clarify the expected
      object type.  Also error statements and early returns were added should an unsupported
      object type be received.

* Issue Count is now 28

Changes Committed:
    modified:   scripts/system/html/js/colpick.js
 2018-02-09 17:35:03 -05:00
LaShonda Hopper
ef1fd19a98 [Case 4315] ESLint Pass 4 for colpick.js (details below). 
Resolved payeX vs pageX issues.
Resolved stopList & huebar undefined issues.

Issue Count reduced from 47 to 29.

Changes Committed:
    modified:   scripts/system/html/js/colpick.js
 2018-02-09 17:14:34 -05:00
LaShonda Hopper
0a1e05326e [Case 4315] ESLint Pass 3, adds global declarations (details below). 
This resolves 23 error <x> is not defined no-undef errors related to global objects.
Issue Count reduced from 70 to 47.

Changes Committed:
    modified:   scripts/system/html/js/colpick.js
 2018-02-09 16:49:44 -05:00
LaShonda Hopper
691aafcf29 [Case 4315] ESLint Pass 2 for colpick.js (details below). 
Resolves all error Line <x> exceeds the maximum line length of 128  max-len issues.
Issue Count reduced from 85 to 70.

Changes Committed:
    modified:   scripts/system/html/js/colpick.js
 2018-02-09 16:42:43 -05:00
LaShonda Hopper
35bf8f1d01 [Case 4315] ESLint Pass; Simple errors addressed (details below). 
Initial ESLint Pass on colpick.js.
Issue Count reduced from 185 to 100 via:
    eslint -c .eslintrc.js scripts/system/html/js/colpick.js --fix

Changes Committed:
    modified:   scripts/system/html/js/colpick.js
 2018-02-09 16:24:54 -05: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
LaShonda Hopper
2fc954909b [Case 4315] Fixes black color preview for color pickers (details below). 
The original/starting color preview in the picker was black as opposed to
reflecting the entity's color upon clicking the color picker.

Known Issue(s)/TODO(s):

* Color preview restore color functionality isn't working.
    * Clicking the initial color preview doesn't restore the color.
    * The original color preview isn't being visually retained when the user
      changes the color via the picker.

Tested HMD & Desktop Modes.

Changes Committed:
    modified:   scripts/system/html/js/entityProperties.js
 2018-02-09 14:40:40 -05:00
NissimHadar
950a62f3f8 Global graphics flag default to on. 
Added cast shadows flag to zone/keylight.
Exit the RenderShadowMap job if current keylight doesn't cast shadows.
 2018-02-08 15:52:20 -08:00
Liv Erickson
be4a009e11 make it so only the icon on collapse headers collapses headers 2018-02-07 13:18:32 -08:00
Liv Erickson
62de08f324 fix issue with top icon changing 2018-02-07 10:16:27 -08: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
73fde4333e new local reference to image model 2018-02-02 10:27:44 -08:00
Elisa Lupin-Jimenez
d7a847930d added image icon 2018-02-02 10:27:44 -08:00
Elisa Lupin-Jimenez
f71d9e4d6a snapshot referenced locally, won't work on OS 2018-02-02 10:27:44 -08:00
Elisa Lupin-Jimenez
cc4bafb46f image entities shown as images in entity list 2018-02-02 10:27:44 -08:00
Elisa Lupin-Jimenez
d390e20139 removed extraneous commenting and image class 2018-02-02 10:27:42 -08:00
Elisa Lupin-Jimenez
fe3bc00baa loading and rendering atp and http image files 2018-02-02 10:27:42 -08:00
Elisa Lupin-Jimenez
42151b8fd4 creating new image entity opens image property options 2018-02-02 10:14:27 -08:00
Elisa Lupin-Jimenez
dc5f29aa58 entity item properties hooked up for image 2018-02-02 10:08:40 -08:00
Elisa Lupin-Jimenez
ecb53192ad edit properties reflect image members 2018-02-02 10:08:40 -08:00
Elisa Lupin-Jimenez
c9c55af661 setting up properties page (not complete) 2018-02-02 10:08:39 -08:00
LaShonda Hopper
4da7a1e65a [Case 4315] ESLint pass on entityProperties.js. 
Re-ran after changes and issue count was 0.

Changes Committed:
    modified:   scripts/system/html/js/entityProperties.js
 2018-01-23 13:48:47 -05:00
LaShonda Hopper
72ed5f6d91 [Case 4315] Fixes OK button hard to use within HMD mode (details below). 
* Shape Color picker dynamically updates entity color.
    * This removes the OK button which was hard to interact with in HMD mode.  The user no
      longer needs to click the OK button to submit changes to the color; rather the color
      of the entity updates as the user manipulates the color wheel and/or slider.

 Known Issue/TODO(s):

* Color Picker's Color Preview area has a bug where the original/starting color preview
is black as opposed to reflecting the entity's color upon clicking the color picker.
    * Color preview restore color functionality isn't working.  Clicking the initial
color preview doesn't restore the color.

* In HMD Mode: While interacting with the picker the user is able to control scrolling
  navigation for the edit menu.  For example, when moving up or down to change the hue
  the edit menu behind the picker will scroll up and down correlatively.
* In HMD Mode: When the picker is dismissed (user clicks outside the picker), the RGB
  fields for the color still receive input.

Tested in Desktop & HMD Modes.

Changes Committed:
    modified:   scripts/system/html/js/entityProperties.js
 2018-01-23 13:40:31 -05:00
Nissim Hadar
46b494c802 Removed the Stage functionality - it is now implemented as a script. 2018-01-08 14:34:46 -08:00
Nissim Hadar
e797a77262 Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance 
# Conflicts:
#	interface/resources/qml/js/Utils.jsc
 2018-01-04 15:58:08 -08:00
Zach Fox
47a209dc4c Make things slightly better? 2018-01-02 13:11:00 -08:00
Zach Fox
25e76c668b Fix marketplacesInject.js for local Metaverse 2018-01-02 12:22:40 -08:00
Nissim Hadar
87e896ab20 Zone inheritance ready for testing. 2017-12-29 15:13:46 -08:00
Nissim Hadar
0e76d481a1 Completed the use of radio-buttons to hide disabled sections. 2017-12-29 08:28:31 -08:00
Nissim Hadar
a6f3401d0e Removed background combo. 2017-12-29 08:15:34 -08:00
Nissim Hadar
64644fc980 WIP - skybox inheritance 2017-12-28 14:31:59 -08:00
Nissim Hadar
8bb4d1431c WIP - copy skylight URL to ambient URL. 2017-12-28 09:35:40 -08:00
Nissim Hadar
4ffd896ced WIP - adding AmbientLightPropertyGroup 2017-12-26 11:15:33 -08:00
Nissim Hadar
8ee5f642a9 Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance 
# Conflicts:
#	libraries/networking/src/udt/PacketHeaders.cpp
#	libraries/networking/src/udt/PacketHeaders.h
 2017-12-22 15:41:59 -08:00
Nissim Hadar
2eb74647f0 Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance 2017-12-22 08:05:46 -08:00
Zach Fox
618e5c9032 Commerce Data Tracking: Iteration 3 (Purchases) 2017-12-21 15:46:01 -08:00
Nissim Hadar
58c6f8e9c4 Radio buttons now work correctly. 2017-12-20 19:17:18 -08:00
Zach Fox
5da49d156e Commerce: Fix the behavior of the 'cancel' button in Wallet Setup 2017-12-19 16:26:58 -08:00
Zach Fox
ed5da4f83b Fix bug preventing 'get' buttons from working in marketplace 2017-12-19 15:07:50 -08:00
David Kelly
4fc69f8067
Merge pull request #11988 from davidkelly/dk/soldOut 
Handle sold out items a bit better
 2017-12-19 07:43:57 -07:00
Zach Fox
74a5f0881f Fix broken Buy buttons on Marketplace 2017-12-14 11:56:36 -08:00
David Kelly
a49ee46f54 Handle sold out items a bit better 2017-12-14 11:52:56 -07:00
Seth Alves
a6a45bc359
Merge pull request #11936 from ElderOrb/FB10108 
10108 marketplace category cannot scroll
 2017-12-08 07:02:15 -08:00
Brad Hefta-Gaub
b91909011a
Merge pull request #11914 from 1P-Cusack/FogBugz/Case_7049 
[Case 7049]: Remove unused fields and checkboxes from Edit.js
 2017-12-07 09:18:26 -08:00
Alexander Ivash
c007c6d00f 10108 marketplace category cannot scroll 2017-12-06 02:47:19 +03:00
LaShonda Hopper
eb8438a9e8 [Case 7049] Addresses code review feedback. 
Changes Committed:
    modified:   scripts/system/html/js/entityProperties.js
 2017-12-04 18:25:51 -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
Alexander Ivash
48b50e33dd 9461 Keyboard for create appear then disappears immediately (HMD) 2017-12-01 20:29:35 +03:00
LaShonda Hopper
6469dbddc1 [Case 7049] ESLint: Fixes unknown/undefined symbol errors (details below). 
* Fixes the following:
    * 1775:5  error  'augmentSpinButtons' is not defined    no-undef
    * 1777:5  error  'setUpKeyboardControl' is not defined  no-undef

ESLint Issue Count is now 0.

Changes Committed:
    modified:   scripts/system/html/js/entityProperties.js
 2017-11-30 19:43:40 -05:00
LaShonda Hopper
991143655f [Case 7049] ESLint: Fixes indent and max-len errors. 
Issues dropped from 26 to 2.

Changes Committed:
    modified:   scripts/system/html/js/entityProperties.js
 2017-11-30 19:41:20 -05:00
LaShonda Hopper
391fc6022e [Case 7049] ESLint: Ignore camelcase error for lines where it's needed. 
Issues reduced from 28 to 26.

Changes Committed:
    modified:   scripts/system/html/js/entityProperties.js
 2017-11-30 19:26:46 -05:00
LaShonda Hopper
ca65297489 [Case 7049] ESLint: Fixes various minor errors (details below). 
* Fixes some equality checks.
* Fixes some spacing issues.
* Fixes some comment style issues.
* Detected issues reduced from 50 to 28.

Changes Committed:
    modified:   scripts/system/html/js/entityProperties.js
 2017-11-30 19:24:20 -05:00
LaShonda Hopper
618978c959 [Case 7049] ESLint: Fixes unused var errors (details below). 
* Fixes the following errors:
    * 590:13   error  'elJSONEditor' is assigned a value but never used                 no-unused-vars
    * 592:13   error  'elColorSections' is assigned a value but never used              no-unused-vars
    * 641:13   error  'elHyperlinkSections' is assigned a value but never used          no-unused-vars
    * 653:13   error  'elTextBackgroundColor' is assigned a value but never used        no-unused-vars
    * 670:13   error  'elZoneKeyLightDirectionZ' is assigned a value but never used     no-unused-vars
    * 695:13   error  'elZoneHazeAttenuateKeyLight' is assigned a value but never used  no-unused-vars
    * 696:13   error  'elZoneHazeKeyLightRange' is assigned a value but never used      no-unused-vars
    * 697:13   error  'elZoneHazeKeyLightAltitude' is assigned a value but never used   no-unused-vars
* This reduces eslint errors from 67 to 50

* Removes instances of stale commented code found when removing the above related items.
* Removes allSections array which doesn't appear to be actively used save registering _certain_ sections.
    * Removed registered section vars which weren't actually in use aside from being registered.

Changes Committed:
	modified:   scripts/system/html/js/entityProperties.js
 2017-11-30 19:09:58 -05:00
LaShonda Hopper
834fe2f5d5 [Case 7049] JSHint Run: Fixes majority of noted lint issues (details below). 
* 3 JSHint issues remain as of this commit, 3 instances of the same error.
    * Error: Functions declared within loops referencing an outer scoped
             variable may lead to confusing semantics.
        * scripts/system/html/js/entityProperties.js: line 469, col 27
        * scripts/system/html/js/entityProperties.js: line 1634, col 30
        * scripts/system/html/js/entityProperties.js: line 1641, col 32

Tested and prior fix to remove duplicate color fields for entity types is
preserved for non-particle entity types.

Changes Committed:
	modified:   scripts/system/html/js/entityProperties.js
 2017-11-30 18:42:59 -05:00
LaShonda Hopper
3152d5808e Minor: Replace tabs with spaces noticed when browsing file. 
Changes Committed:
    modified:   scripts/system/html/js/entityProperties.js
 2017-11-30 15:14:47 -05:00
LaShonda Hopper
532fc2ca5b [Case 7049] Remove duplicate color fields for shapes (details below). 
There are 2 types or styles of color picker controls.
    * color-control1: Composed of only a color picker
    * color-control2: Composed of a color picker and rgb fields.  The color can be
      manipulated by either.

Previously for shapes, the Properties tab utilized both types of color controls.
Color-control1 was displayed within the quick properties section; whereas, color-control2 was
displayed farther down within the more detailed sections of Properties tab.

This commit removes the duplication of the fields, opting to utilize color-control2 within
the quick properties portion of the Properties tab.

Changes Committed:
    modified:   scripts/system/html/entityProperties.html
    modified:   scripts/system/html/js/entityProperties.js
 2017-11-30 15:14:47 -05:00
Alexander Ivash
78d89d886f 9264 dismiss keyboard after user finished typing in marketplace search bar and hit search or return key 2017-11-16 00:13:46 +03:00
Nissim Hadar
f629357ded Removed Keylight attenuation from .js (as well as .html). 2017-11-11 18:58:12 -08:00
Zach Fox
33b6a13a4d Revert 11728 and fix marketplace JS injection - should revisit 2017-11-08 15:21:36 -08:00
David Rowe
fadbf09cdd Avoid potentially slow entity list refresh upon deleting entities 2017-11-07 18:10:10 +13:00
howard-stearns
76e06a6214 Update to stable-v-staging metaverse switching, to handle marketplace 
injection.
 2017-11-01 15:28:28 -07:00
Zach Fox
82816b5551
Merge pull request #11720 from zfox23/commerce_getToBuy 
Change 'GET' to 'BUY' when hovering over costed items
 2017-11-01 09:49:39 -07:00
Zach Fox
f9a410de87 Change 'GET' to 'BUY' when hovering over costed items 2017-10-31 14:53:37 -07:00
Nissim Hadar
fb6c5b98d6 Merge branch 'master' into hazeZone 2017-10-27 15:40:03 -07:00
Nissim Hadar
66c31caf4b Refactoring of the haze 2017-10-27 09:08:58 -07:00
Zach Fox
3e95484c4c Merge branch 'master' of https://github.com/highfidelity/hifi into stagingSetting 2017-10-26 13:58:50 -07:00
ZappoMan
226b974ce8 DPI is not a decimal 2017-10-25 11:59:29 -07:00
Zach Fox
7998984d8e Missed tons of spots! 2017-10-24 14:30:47 -07:00
Ryan Huffman
894e91ea23 Merge pull request #10702 from CraftsmanMG/master 
Fingerpaint  PR
 2017-10-19 13:13:59 -07:00
Daniela
832e30ad1c Edited Packet headers. 2017-10-19 19:53:47 +01:00
Zach Fox
aa48215933 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_OctoberFixes2 2017-10-19 10:54:31 -07:00
Sam Gateau
4d7accabdf Merge pull request #11439 from NissimHadar/hazeZone 
Adding haze component to the zone entity.
 2017-10-18 16:14:28 -07:00