Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-22 23:34:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
62810 commits 75 branches 59 tags 1.2 GiB
Commit graph

3600 commits

Author SHA1 Message Date
H Q
72ed3b077d Addressed PR change requests 2017-12-07 11:28:40 -08:00
Zach Fox
b2bafed2bb Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist 2017-12-07 11:21:24 -08:00
Brad Hefta-Gaub
88ed15aaaa
Merge pull request #11942 from ctrlaltdavid/21633 
Fix image overlay's subImage property's width and height support
 2017-12-07 09:19:43 -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
H Q
ed76ca8018 return to main mktplace page from rez page 2017-12-06 15:37:19 -08:00
David Rowe
d61f0584c3 Fix diectory.js script's icon URL 2017-12-07 12:26:29 +13:00
Dante Ruiz
32fca16c85 fix radius equiping 2017-12-06 14:16:32 -08:00
Zach Fox
5f3b148baa Fix marketplace icon incorrectly appearing active 2017-12-06 13:01:23 -08:00
Zach Fox
3183a1a8b9 Add setupAttemptID to every step (thanks Dave) 2017-12-05 16:48:30 -08:00
Alexander Ivash
c007c6d00f 10108 marketplace category cannot scroll 2017-12-06 02:47:19 +03:00
Zach Fox
c807fc80e3 Add marketplace cta referrer 2017-12-05 15:25:05 -08:00
Zach Fox
7521e4870e Bugfixes 2017-12-05 14:56:47 -08:00
Dante Ruiz
bbc022da2d fix-far-to-equip 2017-12-05 14:09:46 -08:00
Clément Brisset
a5e671e0fd
Merge pull request #11931 from highfidelity/stable 
stable -> master
 2017-12-05 11:58:23 -08: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
NissimHadar
ec1c4c37fa
Merge pull request #11912 from ElderOrb/FB9461 
9461 Keyboard for create appear then disappears immediately (HMD)
 2017-12-04 16:49:25 -06:00
Zach Fox
5261434b6a Further remove dependencies of marketplaces.js on edit.js 2017-12-04 09:45:36 -08:00
LaShonda Hopper
2cc9a8b2b2 [Case 7049] Give collision section a header for consistency. 
Changes Committed:
    modified:   scripts/system/html/entityProperties.html
 2017-12-01 16:00:27 -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
Dante Ruiz
eaa049863d Merge branch 'RC60' of github.com:highfidelity/hifi into fix-equipping 2017-11-30 14:49:24 -08:00
Dante Ruiz
db374b8c6d fixing adjusting equipped entities 2017-11-30 14:49:06 -08: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
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
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
Dante Ruiz
6fd8fb1e5b Merge branch 'master' of github.com:highfidelity/hifi into controllerDispatcher-interval 2017-11-30 11:52:41 -08:00
Daniela
ef49aa0b71 Refactor to comply with code standard. 2017-11-29 18:54:08 +00:00
Dante Ruiz
982fad5050 fix laser interaction on HUD in HMD mode 2017-11-29 10:42:35 -08:00
Daniela
8985acd8b6 YAW ROLL PITCH tool now represents angles in a usefull way. Refactoring. 2017-11-29 13:00:36 +00:00
Daniela
68d5d600b7 YAW ROLL PITCH tool gizmos + functionality 2017-11-28 23:16:34 +00:00
Daniela
eb0d925091 YAW ROLL PITCH tool gizmos + functionality 2017-11-28 22:55:09 +00:00
Daniela
123f898f80 Merge branch 'master' of https://github.com/highfidelity/hifi into Gizmos 2017-11-28 15:38:30 +00:00
SamGondelman
d4a4c8902a fix reticle depth at different scales and x button click on mouse press 2017-11-27 17:46:19 -08:00
SamGondelman
52039e022b merge from master, get rid of resolution in RayPick 2017-11-27 13:11:35 -08:00
Alexander Ivash
da06b2656f 7991 Change Instances of Edit Mode to Create Mode 2017-11-27 22:47:42 +03:00
Brad Hefta-Gaub
068b93fc30
Merge pull request #11838 from druiz17/fix-grabbing 
fixing setting incorrect parent when grabbing entities
 2017-11-27 08:27:42 -08:00
samcake
84ff40c717 Merging with master 2017-11-21 14:12:47 -08:00
Dante Ruiz
56972d1547 Merge branch 'master' of github.com:highfidelity/hifi into fix-grabbing 2017-11-21 13:09:45 -08:00
Dante Ruiz
9622fef149 fix controllerDispatcher time step 2017-11-21 09:48:19 -08:00
Dante Ruiz
5bb23ef1df Merge branch 'master' of github.com:highfidelity/hifi into controllerDispatcher-interval 2017-11-21 09:30:41 -08:00
Howard Stearns
4018b99118
Merge pull request #11848 from zfox23/commerce_flipTheSwitch 
Turn Commerce on by default!
 2017-11-20 16:18:53 -08:00
Dante Ruiz
a201312dcf re-added fix that when into master that this branch breaks 2017-11-20 13:10:35 -08:00
Dante Ruiz
76935c1457 fixing merge conflict 2017-11-20 09:51:10 -08:00
Brad Hefta-Gaub
1de6ecec30
Merge pull request #11830 from ElderOrb/FB8244 
8244 Rename captionColorOverride to captionColor
 2017-11-18 14:28:32 -08:00
Brad Hefta-Gaub
95f59b0ab8
Merge pull request #11844 from druiz17/stylus-near-grab 
allow near grabbing of entities while stylus module is running.
 2017-11-17 17:33:54 -08:00
SamGondelman
033f658fff Merge remote-tracking branch 'upstream/master' into pointers 2017-11-17 16:10:20 -08:00
Zach Fox
7d34b3fe67 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist 2017-11-17 15:45:03 -08:00
Brad Hefta-Gaub
ed4ec3208d
Merge pull request #11797 from luiscuenca/case7589 
Fix notifications shrink with avatar
 2017-11-17 15:27:46 -08:00
SamGondelman
393ad0079c home button is circle instead of sphere, fixed positioning, fix lasers on tablet 2017-11-17 15:24:21 -08:00
Zach Fox
f47f259816 Turn Commerce on by default 2017-11-17 15:12:49 -08:00
luiscuenca
df51d66f60 no double scaling and comments 2017-11-17 13:40:22 -07:00
Dante Ruiz
8f6c781014
Merge pull request #11831 from misslivirose/feat/scale-emit-hands 
Emit avatar scale changed signal when scaled with hand controllers
 2017-11-17 11:55:31 -08:00
SamGondelman
42d047c572 merge with master 2017-11-17 11:52:34 -08:00
SamGondelman
e38b0ab6b8 make web overlays match web entities more, remove resolution 2017-11-17 11:50:24 -08:00
luiscuenca
bbf5e3b023 simplifications and comments 2017-11-17 12:45:36 -07:00
Dante Ruiz
4bbf2ff482 near grab entity while stylus is showing 2017-11-17 11:32:02 -08:00
Andrew Meadows
98001b64d9
Merge pull request #11788 from ctrlaltdavid/21579-a 
Particles emitter fixes
 2017-11-17 11:31:12 -08:00
Andrew Meadows
6a784794c9
Merge pull request #11789 from ctrlaltdavid/21599 
Don't remove entities from list when try to delete locked entity
 2017-11-17 11:26:00 -08:00
SamGondelman
61c7ccde6e cleanup 2017-11-17 10:45:39 -08:00
Dante Ruiz
cabe3819a3 fixing crash 2017-11-17 10:20:34 -08:00
Dante Ruiz
e8da66514c Merge branch 'master' of github.com:highfidelity/hifi into controllerDispatcher-interval 2017-11-17 08:49:59 -08:00
SamGondelman
b252c81d84 fix home button hover overlay dimensions 2017-11-16 15:34:42 -08:00
Dante Ruiz
b66153b9cb fixing setting incorrect parent 2017-11-16 15:07:00 -08:00
Dante Ruiz
c82798673f change controllerDispatcher to setTimeOut update 2017-11-16 10:42:28 -08:00
Dante Ruiz
f6a74cc80e fixing merge conflicts 2017-11-16 10:04:36 -08:00
SamGondelman
ac7242102c Merge remote-tracking branch 'upstream/pointers' into ui 2017-11-16 09:47:29 -08:00
SamGondelman
e3aa79990b merge with master 2017-11-16 09:45:32 -08:00
Liv Erickson
dda32f1987 Emit scale changed signal when scaled with hand controllers 2017-11-16 09:26:42 -08:00
Dante Ruiz
94ac8e52d5
Merge pull request #11822 from druiz17/fix-tablet-3d-person 
fixing tablet in 3d person
 2017-11-16 08:55:27 -08:00
Alexander Ivash
c5d2f598d7 8244 Rename captionColorOverride to captionColor 2017-11-16 15:46:49 +03:00
SamGondelman
3274c41aeb Merge remote-tracking branch 'upstream/pointers' into ui 2017-11-15 17:45:45 -08:00
Zach Fox
93c3d53144 Fix marketplaces.js URLs 2017-11-15 16:46:00 -08:00
SamGondelman
7eb22b372f merge with master 2017-11-15 14:35:30 -08:00
Dante Ruiz
9564b7567b fixing tablet in 3d person 2017-11-15 13:39:21 -08: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
Brad Davis
bb2e061d77 Fixing global declarations in JS 2017-11-15 12:00:52 -08:00
Brad Davis
26a745be6f Merge remote-tracking branch 'upstream/master' into feature/qml_whitelist_tablet 2017-11-15 11:59:06 -08:00
Brad Davis
1167be4102 Reverting tablet API rename, cleaning up duplicated code 2017-11-15 11:52:55 -08:00
Brad Davis
64592d66d7 Fix relative path for tablet login dialog 2017-11-15 11:46:56 -08:00
John Conklin II
8592f3fd4d
Merge pull request #11764 from luiscuenca/case7587 
7587 Lasers resize with avatar
 2017-11-15 09:31:45 -08:00
Zach Fox
d6c244d1d5 Remove incorrect logic 2017-11-14 14:54:03 -08:00
Zach Fox
f5994375cf Remove Marketplace's dependency on Edit.js for rez 2017-11-14 14:29:49 -08:00
Dante Ruiz
b026cfc42f make sure teleport pointers are deleted 2017-11-14 14:09:08 -08:00
luiscuenca
26e401a069 fix broken HMD notifications 2017-11-14 14:22:53 -07:00
Dante Ruiz
54075d4c9a make hud laser relative to camera 2017-11-14 13:09:16 -08:00
Dante Ruiz
8779d52ad3 making requested changes 2017-11-14 13:04:09 -08:00
Dante Ruiz
416a47cfc7 adding controller haptic feedback to tablet onPress 2017-11-14 09:34:17 -08:00
Dante Ruiz
b779c33a1b fixed lockEndUUID offset for scripts 2017-11-13 16:42:16 -08:00
Dante Ruiz
6173c33b51 fixing merge conflict 2017-11-13 15:02:25 -08:00
Dante Ruiz
132b33dbe7 disable stylus pointer when not being used 2017-11-13 14:53:54 -08:00
SamGondelman
60db24f2d3 merge with master 2017-11-13 14:36:24 -08:00
SamGondelman
2fb1981c4a merge with master 2017-11-13 14:34:39 -08:00
Brad Davis
69029b49f3 Merge remote-tracking branch 'upstream/master' into feature/qml_whitelist_tablet 2017-11-13 14:29:49 -08:00
Dante Ruiz
7613bddefa fixing some issues with hud module 2017-11-13 14:26:34 -08:00