Commit graph

295 commits

Author SHA1 Message Date
Alezia Kurdis
44db0bb866
Add selection color Parent & Child entities
Add in-world selection color for entities that are Parent & Child at the same time.
When 1 entity is selected (in-world):
if the entity is a Top Parent, the selection color of the bounding box is Orange.
if the entity is Parent and Child, the selection color of the bounding box is Majenta.
if the entity is only a Child, then the selection color of the bounding box is Cyan.
If not involved in any parent line, or if the selection is multiple, then the selection color of the bounding box is Light Grey.
2020-11-09 22:02:42 -05:00
Alezia Kurdis
233d68952a
Add the persistence of the columns setup
Add the persistence of the columns' visibility and ordering.
2020-11-09 00:35:13 -05:00
Alezia Kurdis
f3dea2fbad
Add the persistence of the columns setup
Add the persistence of the columns' visibility and ordering.
2020-11-09 00:34:07 -05:00
Alezia Kurdis
c573242043
Add Setting name to persist the columns setup
Add a Setting name to persist the columns' visibility and ordering.
2020-11-09 00:31:48 -05:00
Alezia Kurdis
dcb1493eaf
Rename "Select Family"
This renames:
"Select Family" for "Select Parent And All Its Children"
"Select Top Family" for "Select Top Parent And All Its Children"
2020-11-05 21:49:22 -05:00
Alezia Kurdis
1cf0e2c00a
"Teleport to Selected Entities" to Actions menu
This moves "Teleport to Selected Entities" from "Selection" to "Actions" menu.
2020-11-04 23:23:29 -05:00
Alezia Kurdis
b793378830
Undo-redo for "Move Selected Entities to Avatar"
This adds the undo/redo to the action "Move Selected Entities to Avatar".
The action is now recorded in the undo history.
2020-11-04 23:12:04 -05:00
Alezia Kurdis
1e51df0843
Minor adjustments
Minor adjustments
2020-10-25 14:25:19 -04:00
Alezia Kurdis
a264fc358e
Expose 2 new columns: Creation and Modif. Date
Expose 2 new optional columns: 
- Creation Date
- Modification Date

To address Issue #673
2020-10-25 00:00:44 -04:00
Alezia Kurdis
7c4115c4cf
Expose 2 new columns: Creation and Modification Date
Expose 2 new optional columns: 
- Creation Date
- Modification Date
To address Issue #673
2020-10-24 23:59:26 -04:00
Alezia Kurdis
8cc9c19b40
Set the shortkey CTRL-A and CTRL-I only
Set the shortkeys for Select All and Inverse Selection to respond to CTRL-A and CTRL-I only.
(Previously it was also responding to Ctrl-Shift-A, Ctrl-Alt-A, Ctrl-Shift-Alt-A and Ctrl-Shift-I, Ctrl-Alt-I, Ctrl-Shift-Alt-I)
2020-10-24 22:37:35 -04:00
Alezia Kurdis
bcebf36261
Minor Code Adjustments
Minor Code Adjustments
2020-10-24 13:19:09 -04:00
Alezia Kurdis
15924f9547
Adjust a button caption
Adjust a button caption
2020-10-23 23:48:06 -04:00
Alezia Kurdis
a68590e68a
Add Parent-Children Selector group
Add Parent-Children Selector group
"Inverse Selection" is now responding to Ctrl-I
Code Adjustments
2020-10-23 23:26:34 -04:00
Alezia Kurdis
bfc216ab00
Add Parent-Children Selector group
Add Parent-Children Selector group
"Inverse Selection" is now responding to Ctrl-I
Code Adjustments
2020-10-23 23:25:51 -04:00
Alezia Kurdis
ba371613ba
Add Parent-Children Selector group
Add Parent-Children Selector group
Prevent action to happen when some entities are Locked in the Selection 
Code Adjustments
2020-10-23 23:24:06 -04:00
Alezia Kurdis
6da472b7e3
Add Parent-Children Selector group
Add Parent-Children Selector group
Prevent action to happen when some entities are Locked in the Selection 
Code Adjustments
2020-10-23 23:22:37 -04:00
Alezia Kurdis
5b0a00a81a
Add Parent-Children Selector group
Add Parent-Children Selector group
Prevent action to happen when some entities are Locked in the Selection 
Code Adjustments
2020-10-23 23:21:32 -04:00
Alezia Kurdis
8baebbdd16
Add Hierarchy display in List and Selection
Add Hierarchy display in List and Selection
2020-10-21 00:50:28 -04:00
Alezia Kurdis
cfec2c492b
Add Hierarchy display in List and Selection
Add Hierarchy display in List and Selection
2020-10-21 00:48:49 -04:00
Alezia Kurdis
48bd101d08
Add Hierarchy display in List and Selection
Add Hierarchy display in List and Selection
2020-10-21 00:47:55 -04:00
Alezia Kurdis
8afa978122
Add Hierarchy display in List and Selection
Add Hierarchy display in List and Selection
2020-10-21 00:47:10 -04:00
Alezia Kurdis
edb4e4dcaa
Actions and Selection button adjustment
Actions and Selection button adjustment
2020-10-20 00:44:49 -04:00
Alezia Kurdis
5322e52990
Add "Move Selected Entity To Avatar"
Add "Move Selected Entity To Avatar"
2020-10-20 00:18:04 -04:00
Alezia Kurdis
5924a65eeb
Add "Move Selected Entity To Avatar"
Add "Move Selected Entity To Avatar"
2020-10-20 00:17:11 -04:00
Alezia Kurdis
6d7d9a3dde
Add "Move Selected Entity To Avatar"
Add "Move Selected Entity To Avatar"
2020-10-20 00:16:38 -04:00
Alezia Kurdis
c3719a7538
Add "Move Selected Entity To Avatar"
Add "Move Selected Entity To Avatar"
2020-10-20 00:15:40 -04:00
Alezia Kurdis
1aa09f59c3
Increase the precison of Angular Velocity
Increase the precison of Angular Velocity
to make more comfortable the Issue #798 Angular Velocity can't go below 0.4 something (round to 0.5)
But this won't solve the trouble.
For this it would require a fixed for issue #76 Rotations that are transmitted over server lose precision
2020-10-18 23:34:36 -04:00
Alezia Kurdis
d0de5154fe
Fix for Issue #711
Fix for Issue:
#711 Add error dialogue if an unsupported filetype is added as a model URL in the create app.

As agreed, the label "Model URL" will indicate now: "Model URL (.fbx, .fst, .glb, .gltf, .obj, .gz)"

The list of file type has been set in Italic. 
And the label for Material dialog has been adjust to have the same standard "(Optional)" is also in italic.
2020-10-18 23:22:17 -04:00
Alezia Kurdis
4c74d5a630
Add support for teleportToEntity
Add support for teleportToEntity
2020-10-18 23:01:55 -04:00
Alezia Kurdis
943ae9aa4c
Add support for teleportToEntity
Add support for teleportToEntity
2020-10-18 23:01:10 -04:00
Alezia Kurdis
8c94d20177
Add support for teleportToEntity
Add support for teleportToEntity
2020-10-18 23:00:31 -04:00
Alezia Kurdis
3241ea7c1f
Add support for teleportToEntity
Add support for teleportToEntity
2020-10-18 22:59:08 -04:00
Alezia Kurdis
9004251bcf
Add "Actions" and "Selection" menu
Add "Actions" and "Selection" menu in the Create App. (HMD/Desktop compliant)
2020-10-18 21:59:14 -04:00
Alezia Kurdis
bd4b9d5d45
Add "Actions" and "Selection" menu
Add "Actions" and "Selection" menu in the Create App. (HMD/Desktop compliant)
2020-10-18 21:58:21 -04:00
Alezia Kurdis
426df39e1d
Add "Actions" and "Selection" menu
Add "Actions" and "Selection" menu in the Create App. (HMD/Desktop compliant)
2020-10-18 21:57:13 -04:00
kasenvr
bfd45a0d53
Merge pull request #760 from AleziaKurdis/754_CreateApp_HMD_Improvments
Create App: HMD missing functionalities
2020-10-16 02:06:00 -04:00
Alezia Kurdis
adf6652e24
Put "Cut" before Copy" to be standard
Put "Cut" before Copy" to be standard
2020-10-09 22:14:53 -04:00
kasenvr
89c006d190
Merge pull request #737 from AleziaKurdis/721_entitySelectionTool_to_local_Entities
Replacement of 3D Overlays for Local Entities
2020-10-08 22:49:17 -04:00
Alezia Kurdis
37d694afa0
Minor Code Adjustments
Minor Code Adjustments
2020-10-06 22:05:39 -04:00
Alezia Kurdis
7c9808de40
Minor Code Adjustment
Minor Code Adjustment
2020-10-06 21:52:40 -04:00
Alezia Kurdis
e273c920a4
Minor Code Adjustment
Minor Code Adjustment
2020-10-06 21:50:24 -04:00
Alezia Kurdis
3882aad551
Minor code adjustments
Minor code adjustments
2020-10-06 21:48:23 -04:00
Alezia Kurdis
a7ca92fb9b
Add an audio feedback on Parent/Unparent
Add an audio feedback mechanism
to play confirmation or rejection sound on specific actions that are not visually detectable.
Here for Parent and Unparent (because it not visually detectable in HMD if the action was successful or not)

Fix also a bug where the HMD multiselection could stay active after we return in Desktop mode
Now it is deactivated when the create window are closed.
2020-09-30 23:58:12 -04:00
Alezia Kurdis
1d7f9554ce
Add audio feedback on Duplicate
Add an audio feedback mechanism
to play confirmation or rejection sound on specific actions that are not visually detectable.
here for "Duplicate" (mainly for the HMD use case where the new entity is generated at the exact same position)
2020-09-30 23:55:46 -04:00
Alezia Kurdis
64ad0b5afb
Add audioFeedback mechanism
Add an audio feedback mechanism
to play confirmation or rejection sound on specific actions that are not visually detectable.
- Duplicate (mainly for the HMD use case where the new entity is generated at the exact same position)
- Parent and Unparent (because it not visually detectable in HMD if the action was successful or not)
2020-09-30 23:54:06 -04:00
Alezia Kurdis
ff39a03b5d
Add parent and unparent buttons
Add parent and unparent buttons
2020-09-30 00:44:07 -04:00
Alezia Kurdis
f1f58dcbd4
Add parent and unparent buttons
Add parent and unparent buttons
2020-09-30 00:42:57 -04:00
Alezia Kurdis
16324ace16
Add parent and unparent buttons
Add parent and unparent buttons
2020-09-30 00:42:15 -04:00
Alezia Kurdis
94d030fb5c
Add HmdMultiSelection on inworld Selection
Add HmdMultiSelection on inworld Selection
2020-09-30 00:40:38 -04:00
Alezia Kurdis
2a0d508bb6
Add HmdMultiSelection on inworld Selection
Add HmdMultiSelection on inworld Selection
2020-09-30 00:39:36 -04:00
Alezia Kurdis
427351bcd8
Add a HMD MultiSelect button
Add a HMD MultiSelect button

Since it's impossible in HDM to do a multiple selection 
This adds a MultiSelect button (available in HMD only)
When active, the selection in the list behaves like having CTRL pressed
When inactive (default value) the selection in the list behaves as before (on item only)
2020-09-28 23:13:18 -04:00
Alezia Kurdis
a394b427d4
Add HMD MultiSelect button
Add HMD MultiSelect button
2020-09-28 23:08:48 -04:00
Alezia Kurdis
5047cf338f
HMD: Make the 2 buttons visible without scrolling
HMD: Make the 2 buttons visible without scrolling

In HMD, the 2 buttons:
- Open This Domain's Asset Server
- Import Entities (.json)
were not visible without scrolling. people would not even notice their presence
This fix adjust the spacing and the margin to have the entities button on 2 rows when the UI is in landscape mode
this way the button are visible.
2020-09-28 00:36:42 -04:00
Alezia Kurdis
c2064eed89
Fix a bug about tablet stuck in Landscape
Fix a bug about tablet stuck in Landscape
when the create app was open in desktop and you put your VR Headset on, 
then next time you open the tablet it was in landscape mode. (because a refresh was happening after the landscape set to false at the closure)
Now the condition is geared to deal with the situation.
2020-09-27 23:49:48 -04:00
Alezia Kurdis
3f98cd4934
Fix: Reset Landscape mode in HMD
Fix: Reset Landscape mode in HMD

In HMD, clicking on the button "Open this Domain's Asset server" is reverting the tablet to "portrait" mode
This fix forces the mode to return to Landscape if from the Asset server we click on the "List" tab.
2020-09-27 15:23:17 -04:00
Alezia Kurdis
6ecbbd258b
Fix: Reset Landscape mode in HMD
Fix: Reset Landscape mode in HMD

In HMD, clicking on the button "Open this Domain's Asset server" is reverting the tablet to "portrait" mode
This fix forces the mode to return to Landscape if from the Asset server we click on the "Properties" tab.
2020-09-27 15:22:00 -04:00
kasenvr
87d4fddb40
Merge branch 'master' into feature/transparent-web-entities 2020-09-26 01:25:02 -04:00
Alezia Kurdis
d72f707862
Add the support for HMD buttons
This adds the support for 6 new buttons:
Copy-Cut-Paste-Duplicate-Undo-Redo

It adds the automatic toggling of the HMD only buttons:
Copy-Cut-Paste-Duplicate
2020-09-26 00:55:16 -04:00
Alezia Kurdis
41ef2fafce
Add 6 new buttons
4 buttons for HMD enforce to be hidden by default. (Copy - Cut - Paste - Duplicate)
2 button (Undo and Redo)
2020-09-26 00:50:49 -04:00
Alezia Kurdis
ab45a32fea
Add new button in HMD
Add new button in HMD:
- add undo and redo support
- add HMD detection
2020-09-26 00:46:32 -04:00
Alezia Kurdis
826991d6b4
Code Adjustments and Optimizations
Remove an unused commented const.
Generate all the material using a centralized function, using an array to store the keys. 
Make them deleted by iteration on this array.
Using now defaultFallthrough = true instead of setting albedo to fallthrough.
Replace "materialMappingMode" "projected" for "uv"
Added "ignorePickIntersection": true on the Material entities
2020-09-23 22:28:52 -04:00
Kalila L
ed5a7e82d7 Fix default URLs for edit.js 2020-09-23 01:57:00 -04:00
Kalila L
154a95ac86 Update all scripts, script-archive scripts still broken. 2020-09-22 19:24:58 -04:00
Alezia Kurdis
de21ebf853
Selection Tool "unlit"
This commit includes 2 parts:
1- Re-adjustment in the code to stay aligned with axis/colors/Pitch-Yaw-Roll 
It seems that the Overlay 3dCircle was in fast patch to work while the Gizmo Ring is aligned for Axix versus Pitch-Yaw-Roll.
The modification has been done differently and is in fact a simpler solution.

2- Add a Material local entities parented to each tool entity to make the Selection tool "unlit"
This addresses Issue #709 Enhancement: Make create translate "widget" unlit
BUT there is a known issue: The Gizmo Ring are not supporting the Material currently. (an issue has been open for that see #744)
The Rotation rings are then not "unlit", but everything in the code is ready to support it when it will be done.
Gizmo Ring having practically designed for that specific usage, I think we should keep using them.
Other alternatives like using an image or a model would imply to considerable modifications. 
We would lose the angular representation (that can't be done with image or model). 
The remaining "unlit" issue is very low severity, the widget is still fully functional. So I think it can wait for the support of Material.
2020-09-21 21:59:19 -04:00
Alezia Kurdis
dca2f2e00e
Replacement of 3D Overlays for Local Entities
This replaces all the deprecated 3d Overlays for Local Entities.
No functional changes, only technical.

Many variables have been renamed for clarity. 
(Mainly the term "overlay" that were used to designate the elements of the selection tool. 
Now it refer to "toolEntity" to designate the entities composing the Selection Tool.)

The color of the different elements of the selection tools has also been adjusted.
They are now more contrasted and more vivid.
(The green and the blue of the previous version were too much close at the point that 
some color blind people might have difficulty to differenciate them.)
2020-09-19 23:20:43 -04:00
Dale Glass
0310764013 More review fixes 2020-09-20 01:29:32 +02:00
Dale Glass
cd901f9e32 Move enum into ExternalResources namespace 2020-09-20 01:29:32 +02:00
Dale Glass
c65cc9570d Prototype for moving content away from hifi infrastructure 2020-09-20 01:29:32 +02:00
kasenvr
9fad6109ca
Merge pull request #703 from AleziaKurdis/feature_Create_App_materialData
Feature: Create Material even without a URL.
2020-09-16 23:36:56 -04:00
Alezia Kurdis
6ca176335e
Change "Add" button for "Create"
Change "Add" button for "Create"
2020-09-16 23:15:07 -04:00
Alezia Kurdis
1a0e69ed6e
Change "Add" button for "Create"
Change "Add" button for "Create"
2020-09-16 23:07:41 -04:00
Alezia Kurdis
ec4d559055
Added (Optional) to the label "Material URL"
Added "(Optional)" to the label "Material URL"

"Material URL (Optional)"
2020-09-15 22:24:08 -04:00
Alezia Kurdis
180742f790
Clarify the "materialURL" tooltip
Clarify the "materialURL" tooltip that was a bit obscure.
New value:
"The URL to an external JSON file or "materialData".  Append "?<materialName>" to select a single material if multiple are defined."
2020-09-10 00:15:07 -04:00
Alezia Kurdis
da6a86b411
Create Material without url
This enhancement changes the behavior when a Material Entity is created using the Create App.
Previously, if we left the URL null, no entity was created.
With this fix, if we left the URL null, then the entity is created with "materialData" already set in materialURL (ready to use Material Data).
2020-09-10 00:11:50 -04:00
Alezia Kurdis
6337e84894
Fix for Issue #696
This fixes a refresh of the FILE value in the Create App Entity list when updating the imageURL of an Image Entity.
(It was missing in the condition that checks to add to the refresh of the list.)

This solves the issue #696.
2020-09-09 22:41:05 -04:00
daleglass
aba63051e5
Merge pull request #606 from AleziaKurdis/530_593_CrAppUIadust
Change colorSpread color-picker and other small fixes
2020-08-27 23:30:16 +02:00
Kalila L
26d4eb8e67 Updates per CR.
Co-Authored-By: David Rowe <david@ctrlaltstudio.com>
2020-08-24 18:43:03 -04:00
daleglass
90c957c9e9
Merge pull request #604 from AleziaKurdis/534_601_Default_images
New URL for default Particle and Image resource
2020-08-20 23:26:45 +02:00
Alezia Kurdis
46ca84167c
EOL unix 2020-08-18 23:28:44 -04:00
Alezia Kurdis
92f7e87081
EOL unix 2020-08-18 23:27:47 -04:00
Alezia Kurdis
c6cf0b8c33
New "useBackground" property on Web Entity
New "useBackground" property on Web Entity.
2020-08-18 23:22:39 -04:00
Alezia Kurdis
bda88828a0
Tooltip for useBackground
Tooltip for useBackground
2020-08-18 23:21:32 -04:00
Alezia Kurdis
8d217d215f
Better code fix for preview
being more specific on the validation for the unresolvable relative path.
checking now if the path start with "file:///~" instead of only: "file:/"
This was too much restrictive since those direct path works and wouldn't return a preview:
Ex: "file://MYSERVER/folder/100_0057.jpg"
2020-08-17 21:58:42 -04:00
Alezia Kurdis
341c114adf
Replace default url for external storage
var DEFAULT_IMAGE = "http://eu-central-1.linodeobjects.com/vircadia-assets/interface/default/default_image.jpg";
var DEFAULT_PARTICLE = "http://eu-central-1.linodeobjects.com/vircadia-assets/interface/default/default_particle.png";
2020-08-16 21:58:35 -04:00
Alezia Kurdis
2cd1fc8471
Keep the suffix only for Duplicate
This update removes the incremental suffix from the "Paste"
since this can't really work.
This will be only for "Duplicate".
2020-08-11 22:50:12 -04:00
Alezia Kurdis
d31f161d88
Remove the deprecated "acceleration" attribute
This removes the "acceleration" attribute from the Create App. (Physic section)
because this attribute is deprecated.
2020-08-09 00:10:40 -04:00
Alezia Kurdis
f3a6fa527b
Replace the colorSpread color-picker by a vector
Replace the color picker of the attribute particle.colorSpread by a color vec3
To do this, a new type of UI field has been added "vec3rgb" to support the "red, green, blue" vector (non-Color-picker).
This addresses issue #593

Fix also the broken particle texture preview that, as for 'atp:/', doesn't support 'file:/'. 
This will be required for issue #534
2020-08-08 00:14:26 -04:00
Alezia Kurdis
c31ccc7a78
Fix unit for localAngularVelocity and other things
Revisiting the tooltips for:
- colorSpread
- localAngularVelocity (Set the correct unit 'deg/s'. This addresses issue #530 )
- damping
- angularDamping
2020-08-08 00:04:44 -04:00
Alezia Kurdis
856cb5cb2c
Replace default URL for Image and Particle
Replace default URL for Image and Particle
and point now to a local deployed resource.
2020-08-07 13:04:01 -04:00
Alezia Kurdis
91ebd378f5
Clone suffix without uniqueness check
Simpler solution without any hazardous uniqueness check.
Cloned entities will systematically get the suffix " (2)", unless their name has already a suffix. 
In that case, we simply increment the suffix.
2020-08-07 12:51:24 -04:00
Alezia Kurdis
47e3649298
Incremental suffix to duplicated entities
This enhancement adds an incremental suffix to the name 
of the cloned entities resulting from "Duplicate" and "Paste".
The goal is to help to figure which entities is the coned one.
This addresses issue #575
2020-08-06 22:28:32 -04:00
Kasen IO
3e585267e4 Fix gizmo size issue post auto-resize of a new model. 2020-06-18 01:11:07 -04:00
Kasen IO
3910448367 Fix models not scaling correctly when loading due to timeout. 2020-06-11 15:36:13 -04:00
Kasen IO
778276bb43 Adjust how check is performed. 2020-05-30 20:56:28 -04:00
Kasen IO
3c21a4d3f6 Fix Create app using naturalDimensions for all entity types. 2020-05-30 19:58:54 -04:00
kasenvr
41c961198c
Merge pull request #369 from AleziaKurdis/feature/zonesSelectorSorted
Zones Selector sorted by zone names
2020-05-29 20:44:45 -04:00
Alezia Kurdis
0b330dfcd6
Zone selector sorting vs uppercases
This makes the sorting of the Zone in the Zone selector
with the uppercase grouped with the lowercase for a same letter
but uppercase always first.
(Note: Accented char are considered as a different letter. We would need to support exception cases for all the existing charsets. These are only entities descriptors, not really for literature.)
2020-05-28 23:32:44 -04:00
Kasen IO
6c6a405020 Add periods and remove double copyright in tabletaboutdialog.qml 2020-05-25 16:41:16 -04:00
Kasen IO
a4bf1c4d82 Update copyright headers. 2020-05-25 15:59:43 -04:00
Alezia Kurdis
b7393b2398
Make the zones sort as case insensitive
Make the sort of the zone selector to be case insensitive.
2020-05-23 22:54:45 -04:00
Alezia Kurdis
e6d092aefe
Code Adjustment
Code Adjustment

{
    ...
    listExistingZones.sort(zoneSortOrder());
    return listExistingZones;
}

function zoneSortOrder() {
    return function(a, b) {
        if (a.name > b.name) {
            return 1;    
        } else if (a.name < b.name) {
            return -1;
        }
        return 0;
    }
}
2020-05-21 22:13:33 -04:00
Alezia Kurdis
3023924cf1
Minor code adjustments
Minor code adjustments
2020-05-20 16:11:48 -04:00
Kasen IO
ce1a1faf79 Fix copyright headers + some docs. 2020-05-20 15:02:03 -04:00
Alezia Kurdis
3a0c4e1477
Zones Selector sorted by zone names
This change makes the Zones Selector sorted by zone names.
To address issue: renderWithZones: zone list incorrectly sorted. #354
(But this doesn't fix the problem with the scrolling)
2020-05-18 23:48:02 -04:00
kasenvr
7996698c8f
Merge branch 'master' into fix/other-renamings 2020-05-18 15:10:32 -04:00
MotoFufu9k
dd9728a09f
Change standard grabbable setting to false 2020-05-13 23:06:36 +02:00
Alezia Kurdis
5d00341662
Correct value to ENTIRE_DOMAIN_SCAN_RADIUS
Set the correct value to constant: ENTIRE_DOMAIN_SCAN_RADIUS

var ENTIRE_DOMAIN_SCAN_RADIUS = 27713;
to reach all the entities of a domain from the center,(including in the corners) the radius must be:
sqr((16000 ^2) + (16000) ^2 + (16000 ^2))
which is once rounded = to 27713.
2020-05-09 15:24:18 -04:00
Alezia Kurdis
d575616a6d
Code Adjustments.
Constant used for ENTIRE_DOMAIN_SCAN_RADIUS instead of 17000
Missing spaces,
and line too long being adjusted.
2020-05-09 15:08:38 -04:00
Alezia Kurdis
6357dd91f5
Fix EOL from Windows to Unix
Fix EOL from Windows to Unix
2020-05-09 02:50:16 -04:00
Alezia Kurdis
c96591367b
Fix the wrong merge 2020-05-08 23:41:52 -04:00
Alezia Kurdis
637352052b
Merge branch 'master' into feature/renderWithZones-Create-UI 2020-05-08 15:20:31 -04:00
Alezia Kurdis
096bc40aa3
Merge the "screenshare" modifs
Merge the "screenshare" modifs with renderWithZones update
2020-05-08 15:16:38 -04:00
Alezia Kurdis
95562f7e23
Merged of "screenshare" and requested changes.
1- Update some tooltips (changed "Set the" for "The")
for Lines: 9, 18, 24, 215, 325, 329, 332, 335, 611

2- Include merge for conflict (not detected by Github) for "screenshare" attribute
2020-05-07 22:46:35 -04:00
Alezia Kurdis
91d234589e
Minor Code Adjustment
Minor Code Adjustment
and uncommented the new property renderWithZones
2020-05-06 23:39:11 -04:00
Alezia Kurdis
5180c9b247
Minor Code Adjustment 2020-05-06 23:36:39 -04:00
Alezia Kurdis
cc308c11b6
Minor Code Adjustment
Line 50: removed extra space char.
2020-05-06 23:06:33 -04:00
Alezia Kurdis
1671887602
Merge branch 'master' into kasen/core 2020-04-29 12:02:12 -04:00
Alezia Kurdis
962d4671eb
To avoid a regression at some point 2020-04-27 22:49:42 -04:00
Alezia Kurdis
c42734cba8
adding screenshare with the real file 2020-04-27 22:47:49 -04:00
Alezia Kurdis
75747a6a2f
to avoid regression 2020-04-27 22:20:19 -04:00
Alezia Kurdis
e850e6fe22
Adding field screenshare
Adding field screenshare
to avoid conflict
2020-04-27 22:05:24 -04:00
David Rowe
ffeb37e7aa Merge remote-tracking branch 'hifi/master' into merge-hifi-master
# Conflicts:
#	CMakeLists.txt
#	README.md
#	cmake/externals/glad32es/CMakeLists.txt
#	cmake/externals/glad41/CMakeLists.txt
#	cmake/externals/glad45/CMakeLists.txt
#	cmake/externals/polyvox/CMakeLists.txt
#	cmake/externals/quazip/CMakeLists.txt
#	cmake/externals/vhacd/CMakeLists.txt
#	cmake/init.cmake
#	cmake/ports/hifi-deps/CONTROL
#	cmake/ports/sdl2/CONTROL
#	cmake/ports/sdl2/disable-hidapi-for-uwp.patch
#	cmake/ports/sdl2/enable-winrt-cmake.patch
#	cmake/ports/sdl2/fix-arm64-headers.patch
#	cmake/ports/sdl2/fix-x86-windows.patch
#	cmake/ports/sdl2/portfile.cmake
#	cmake/ports/sdl2/vcpkg-cmake-wrapper.cmake
#	cmake/ports/tbb/portfile.cmake
#	hifi_vcpkg.py
#	interface/src/avatar/MyAvatar.h
#	libraries/avatars-renderer/src/avatars-renderer/Avatar.h
#	libraries/avatars/src/AvatarData.h
#	libraries/entities-renderer/src/RenderableEntityItem.h
#	libraries/entities/src/EntityItem.cpp
#	libraries/entities/src/EntityItem.h
#	libraries/fbx/src/GLTFSerializer.cpp
#	libraries/graphics-scripting/src/graphics-scripting/Forward.h
#	libraries/networking/src/AddressManager.cpp
#	libraries/networking/src/DomainHandler.h
#	libraries/procedural/src/procedural/ProceduralMaterialCache.cpp
#	libraries/render-utils/src/HighlightEffect.cpp
#	libraries/render-utils/src/MeshPartPayload.cpp
#	libraries/render-utils/src/Model.cpp
#	libraries/render-utils/src/RenderShadowTask.cpp
#	libraries/script-engine/src/WebSocketClass.cpp
2020-04-09 16:46:27 +12:00
Kasen IO
115c40bd54 Lots of renamings, more to come. 2020-04-07 04:56:02 -04:00
Alezia Kurdis
9c5f8fc946
Typo
missing dot.
2020-04-05 02:18:51 -04:00
Alezia Kurdis
6d33713e35
Better tooltip for renderWithZones property
Better tooltip for renderWithZones property
2020-04-05 02:14:10 -04:00
Alezia Kurdis
cdef49d633
Fix tooltip text for particles alpha properties
Fix the tooltip's text for particle alpha properties.
2020-04-04 22:18:59 -04:00
Alezia Kurdis
4a3405484c
Add new property "renderWithZones"
Add the new property "renderWithZones" to the Create App.
For this, a new type of renderer type has been added: "Multiple Zones Selector".
(Required for the PR#78)
2020-04-03 23:43:36 -04:00
Alezia Kurdis
16c5d8c051
Support for "Multiple Zones Selector" Renderer
Add the code to expose the Zones list to the entityProperty.
as support for the new "Multiple Zones Selector" Renderer type.
(Required to support the new property "renderWithZones" for PR #78)
2020-04-03 23:37:18 -04:00
Alezia Kurdis
0afca55e18
Add the new property "renderWithZones"
This adds the Tooltip for new property "renderWithZones"
(Required for PR#78)
2020-04-03 23:32:45 -04:00
Alezia Kurdis
e52e1bafc6
Moved tabs.css reference
-Change the path for the new location of tabs.css
-Local "style" migrated to "class"
2020-03-18 18:38:41 -04:00
Alezia Kurdis
022ea6c5fb
Moved tabs.css to system/html/css
Moved tabs.css to system/html/css
with other css.
2020-03-18 18:34:51 -04:00
Alezia Kurdis
8ab40e1a08
Fix the userData and materialData editor
Fix the userData and materialData editor.
Only 2 conditions have been modified to make it works.
I have removed a significant quantity of dead code
that was trying to overlay a static text an obscure reason.
Please, retest this. In case I missed something that I don't know.
2020-03-10 00:48:54 -04:00
Alezia Kurdis
d934018c7b
Codes minor adjustments
Codes minor adjustments.
Some formatting issues.
Use element instead of a string
2020-03-04 18:42:57 -05:00
Alezia Kurdis
206b1b12c5
Additional fixes about the formatting.
Additional fixes about the formatting.
2020-03-04 18:26:23 -05:00
Alezia Kurdis
ed9918a537
Fix for the multiselection.
This is the fix for the multiselection case.
(It doesn't include the solution for User Data.)
2020-03-03 19:21:14 -05:00
Alezia Kurdis
e6a45690ba
Color Adjustments
The color has been attenuated on those 2 icons.
It was too present compared to the others.
2020-03-02 23:53:55 -05:00
Alezia Kurdis
d1c641de49
Code minor adjustments.
Code minor adjustments to be compliant with the coding convention.
2020-03-02 23:13:47 -05:00
Alezia Kurdis
4a1926a901
Code minor adjustments.
Code minor adjustments to be compliant with the coding convention.
2020-03-02 23:11:45 -05:00
Alezia Kurdis
124b3fe6a2
Code minor adjustments.
Code minor adjustments to be compliant with the coding convention.
2020-03-02 23:10:33 -05:00
Alezia Kurdis
f3096ae74d
Replace tabulations for spaces.
Replace tabulations for spaces in the code.
2020-03-01 22:37:44 -05:00
Alezia Kurdis
5c7e6e43c2
Replace tabulations for spaces.
Replace tabulations for spaces in the code.
2020-03-01 22:36:43 -05:00
Alezia Kurdis
fa7143c87e
Replace tabulations for spaces.
Replace tabulations for spaces in the code.
2020-03-01 22:35:48 -05:00
Alezia Kurdis
0eb6f1f183
Fix page height blocking dropdown
Fix the page height that blocked the correct use of the shape dropdown.
The layout looks more stable now.
2020-02-29 15:52:06 -05:00
Alezia Kurdis
29e780e3f1
Sections reorganization
1- Section "behavior" is now split in 2 sections: "behavior" and "scripts"

2- Particles sections: "particles_acceleration" and "particles_spin" 
has been joined as a new section: "particles_behavior"

3- Particles section: "particles_alpha"  has been merged under  section: "particles_color"
2020-02-29 14:07:15 -05:00
Alezia Kurdis
bb422a3832
Icons for sections reorganization
behavior will be split: behavior,  scripts
particles_behavior will replace: particles_acceleration and particles_spin
2020-02-29 14:02:57 -05:00
Alezia Kurdis
2bd0950a01
Delete particles_spin.png
Not going to be used.
2020-02-29 14:00:10 -05:00
Alezia Kurdis
fd0186f997
Delete particles_acceleration.png
No going to be used.
2020-02-29 13:59:38 -05:00
Alezia Kurdis
3c4e073874
Properties Editor using tabs
Properties Editor using tabs instead of collapsible sections to avoid painful scrolling.
2020-02-28 23:52:24 -05:00
Kasen IO
08ec9ef3b7 Various URL updates + window title update. 2020-02-05 15:25:51 -05:00