Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-18 10:40:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
68372 commits 25 branches 0 tags 1.1 GiB
Commit graph

4306 commits

Author SHA1 Message Date
Seth Alves
86f58c1353 Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3 2017-12-07 08:50:50 -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
Seth Alves
2dd223ebaa Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3 2017-12-06 09:18:40 -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
Seth Alves
3642d6cfdf fix includes 2017-12-05 11:26:36 -08:00
Seth Alves
c4e5c53eee jshint cleanups 2017-12-05 11:17:31 -08:00
Seth Alves
5b908dbf51 import zach's edit.js dependency fixes 2017-12-05 11:14:59 -08:00
Seth Alves
26cb275b89 adjust wearables with saved offsets after WEAR IT 2017-12-05 11:11:56 -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
Dante Ruiz
b9f60aff2a fix-edit 2017-11-30 13:22:26 -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
Dante Ruiz
cbaf59d99e disable stylus 2017-11-30 11:13:17 -08:00
Dante Ruiz
024dbcd712 fix scrolling 2017-11-30 09:07:19 -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
Dante Ruiz
70820e6075 laser allways on prototype 2017-11-28 15:37:36 -08: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
Dante Ruiz
5852224a31 clean up code and finialize changes 2017-11-13 13:37:53 -08:00
Zach Fox
641c4656c4 Fix bug with disappearing certificate info 2017-11-13 10:53:16 -08:00
Brad Davis
5cf9c1bb33 Merge remote-tracking branch 'upstream/master' into feature/qml_whitelist_tablet 2017-11-13 10:48:21 -08:00
Nissim Hadar
f629357ded Removed Keylight attenuation from .js (as well as .html). 2017-11-11 18:58:12 -08:00
Dante Ruiz
43c6d71236 fix stylus module 2017-11-10 17:28:55 -08:00
luiscuenca
262dc091ce 7589 Fix notifications shrink with avatar 2017-11-10 17:22:41 -07:00
Brad Davis
7bf1b176d7 Renaming Tablet API to Tablets, supporting dev-mode QML loading from filesystem 2017-11-10 14:21:24 -08:00
Sam Gateau
f857b37d2e
Merge pull request #11758 from NissimHadar/hazeUIFix 
Improved Haze UI in Create menu
 2017-11-10 11:58:06 -08:00
Brad Davis
92a3c209aa Merge remote-tracking branch 'upstream/master' into feature/qml_whitelist_tablet 2017-11-10 11:44:29 -08:00
luiscuenca
7dfdc8da59 Redesign and clean of unused lineWidths 2017-11-09 17:50:38 -07:00
Dante Ruiz
ef55e3181d moveing controllerDispatchaer pointers to pointerUtils.js 2017-11-09 16:48:52 -08:00
David Rowe
ad661cb345 Don't remove entities from list when try to delete locked entity 2017-11-10 10:50:07 +13:00
David Rowe
c53c356842 Display "no preview available" for ATP images in particles UI 2017-11-10 10:23:35 +13:00
Dante Ruiz
86439eff07 fixing merge conflict 2017-11-09 13:07:55 -08:00
SamGondelman
5a78c9ebfe integrated stylus into pointer system, need to update controller module 2017-11-09 11:59:17 -08:00
Clément Brisset
40baca6ee1
Merge pull request #11756 from ctrlaltdavid/21592 
Fix import from URL adding multiple copies of imported entities
 2017-11-08 18:01:48 -08:00
Nissim Hadar
7cb9514feb Converted 'Glare Angle' control to a slider. 2017-11-08 16:50:44 -08:00
Nissim Hadar
5a56ea5894 Merge branch 'master' into hazeUIFix 2017-11-08 16:44:59 -08:00
Nissim Hadar
5c7ebc0af3 Converted 'Glare Angle' control to a slider. 2017-11-08 16:44:05 -08:00
Nissim Hadar
2920c6f9a9 Merge branch 'master' into hazeUIFix 2017-11-08 15:42:20 -08:00
Nissim Hadar
c1b5d00993 Converted 'Background Blend' control to a slider. 2017-11-08 15:41:24 -08:00
Zach Fox
33b6a13a4d Revert 11728 and fix marketplace JS injection - should revisit 2017-11-08 15:21:36 -08:00
Luis Cuenca
6fb47eef85
Merge branch 'master' into case7587 2017-11-07 17:19:39 -07:00
luiscuenca
332cb48a41 Lasers and teleport scale with avatar 2017-11-07 16:57:55 -07:00
Seth Alves
0edf056b78
Merge pull request #11755 from MidnightRift/patch-1 
Fix controllerDispatcherUtils file path
 2017-11-07 13:22:18 -08:00
Seth Alves
e22926eb89
Merge pull request #11762 from ctrlaltdavid/21594 
Speed up entity list update after deleting entities
 2017-11-07 09:34:47 -08:00
Seth Alves
ce7d0c324b
Merge pull request #11761 from ctrlaltdavid/21593 
Don't move or rotate entities if Alt or Meta keys are pressed
 2017-11-07 09:33:21 -08:00
Seth Alves
e9c0e53aa6
Merge pull request #11760 from druiz17/far-grab-parent 
Far grab rolls up parent tree when grabbing and add offset to LaserPointer::lockEndUUID
 2017-11-07 08:53:13 -08:00
David Rowe
fadbf09cdd Avoid potentially slow entity list refresh upon deleting entities 2017-11-07 18:10:10 +13:00
Dante Ruiz
bdd31b63ed update functions call names to match pointer API changes 2017-11-06 17:23:40 -08:00
Dante Ruiz
3e9eaa727b Merge branch 'ui' of github.com:SamGondelman/hifi into ui 2017-11-06 16:39:10 -08:00
David Rowe
60319e8d53 Don't move or rotate entities if Alt or Meta keys are pressed 2017-11-07 13:35:31 +13:00
Dante Ruiz
3b15897b12 fixed farGrab parent grabbing and laser LockEndUUID 2017-11-06 15:21:20 -08:00
David Rowe
b272b2e6c8 Fix import from URL adding multiple copies of imported entities 2017-11-07 11:28:35 +13:00
Nissim Hadar
650df24761 Improved Haze UI in Create menu 2017-11-06 14:27:02 -08:00
Brad Davis
544c54b8ee Merge remote-tracking branch 'upstream/master' into HEAD 2017-11-06 10:07:22 -08:00
Midnight
e2ca3c6de0
Fix lib file path 
Changed the include to what should be the correct file path. it does not exist in the controllers folder.
 2017-11-05 13:39:26 -07:00
Brad Davis
d162e1cff6 Whitelist functionality for tablet apps 2017-11-04 15:14:06 -07:00
Dante Ruiz
539cf35f30 saving work 2017-11-03 17:14:27 -07:00
Dante Ruiz
b6e3262164 removing the last remaining laserPointers 2017-11-02 11:31:13 -07:00
howard-stearns
76e06a6214 Update to stable-v-staging metaverse switching, to handle marketplace 
injection.
 2017-11-01 15:28:28 -07:00
Dante Ruiz
0580e23686 fixed edit mode and allow to scroll off tablet 2017-11-01 15:16:02 -07:00
Dante Ruiz
66f07cb21b eslint controller modules 2017-11-01 11:36:36 -07:00
Brad Davis
f061b9c2da Add stylus functionality to pointer manager 2017-11-01 11:27:57 -07:00
Dante Ruiz
abb6f786fa added homebutton message and scripts cleanup 2017-11-01 11:03:48 -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
Dante Ruiz
cde5208151 fixing merge conflict 2017-11-01 08:56:55 -07:00
SamGondelman
5a7298f15b Merge remote-tracking branch 'upstream/master' into pointers 2017-10-31 17:33:52 -07:00
Dante Ruiz
f44025a8b1 completely removed non-need laserPointers 2017-10-31 15:57:57 -07:00
Zach Fox
f9a410de87 Change 'GET' to 'BUY' when hovering over costed items 2017-10-31 14:53:37 -07:00
Dante Ruiz
30332c3d00 removing more laserPointers 2017-10-31 14:13:42 -07:00
Nissim Hadar
f3147fc24f Merge branch 'master' into hazeZone 2017-10-30 21:41:23 -07:00
Brad Hefta-Gaub
c1a808e726
Merge pull request #11703 from AndrewMeadows/circles-and-quads 
fix Circles and quads
 2017-10-30 18:03:32 -07:00
Brad Hefta-Gaub
fbcd813d7b
Merge pull request #11694 from ElderOrb/FB8315 
8315 Stylus appears in wrong place on hand
 2017-10-30 18:00:56 -07:00
Dante Ruiz
e5600e4f1e one universal controller pointer for all modules 2017-10-30 16:58:14 -07:00
Andrew Meadows
0f1139343c
Merge pull request #11709 from druiz17/equip-adjustment 
Remember adjustment made to equipped entities
 2017-10-30 15:45:28 -07:00
Nissim Hadar
6391282680 Swapped location of keylight attenuation and the blending factor. 2017-10-30 12:05:23 -07:00
Nissim Hadar
349e12c065 Merge branch 'master' into hazeZone 2017-10-30 10:08:35 -07:00
Brad Davis
23653f08ca Merge remote-tracking branch 'upstream/master' into HEAD 2017-10-30 09:20:58 -07:00
Ryan Downe Karpf
28a99fe685
Merge pull request #11655 from dback2/tabletcontextualmode 
add a tablet contextual mode flag to HMDScriptingInterface used to keep tablet in place
 2017-10-30 08:56:26 -07:00
Nissim Hadar
fb6c5b98d6 Merge branch 'master' into hazeZone 2017-10-27 15:40:03 -07:00
samcake
8a3b1a20cc merge with upstream 2017-10-27 14:57:25 -07:00
Dante Ruiz
e9298b6ff8 Merge branch 'master' of github.com:highfidelity/hifi into equip-adjustment 2017-10-27 14:46:18 -07:00
Dante Ruiz
bea0df8e60 implemented remebering equiping entities offset 2017-10-27 14:46:04 -07:00
Zach Fox
5ab737f66d
Merge pull request #11658 from zfox23/pop_dynamicTestsMaster 
Commerce: Owner Verification for Certified Entities
 2017-10-27 12:28:04 -07:00
Nissim Hadar
420b0f321c Merge branch 'master' into hazeZone 2017-10-27 09:14:53 -07:00
Nissim Hadar
66c31caf4b Refactoring of the haze 2017-10-27 09:08:58 -07:00
Daniela
9dbe349867 Merge branch 'master' of https://github.com/highfidelity/hifi into Gizmos 2017-10-27 11:29:59 +01:00
Daniela
2ceba76ba2 yaw tool 2017-10-27 11:28:44 +01:00
Andrew Meadows
5ed58d5e5d enable Quad in ShapeEntityItem properties 2017-10-26 22:59:25 -07:00
samcake
1dbeac7b88 Adding the idons for Luci and cleaning up the scripts 2017-10-26 19:55:59 -07:00
Zach Fox
8cb60fc62c Small edit.js changes 2017-10-26 16:44:21 -07:00
Zach Fox
3e95484c4c Merge branch 'master' of https://github.com/highfidelity/hifi into stagingSetting 2017-10-26 13:58:50 -07:00
SamGondelman
a44e8efb99 merge from master 2017-10-26 12:14:53 -07:00
beholder
ddd25da430 8315 Stylus appears in wrong place on hand 2017-10-26 19:39:15 +03:00
Daniela
a1110bf28d Rotations now happen using the correct axis taking into account the avatar referential 2017-10-26 16:52:58 +01:00
Seth Alves
0f31631f17 Merge pull request #11677 from druiz17/fix-fargrab 
Make non-dynamic entities collisionless during far-grab
 2017-10-25 17:31:02 -07:00
Zach Fox
2f28cf1443 Remove unnecessary newline 2017-10-25 15:20:31 -07:00
Zach Fox
3f0108528d Remove unnecessary newline 2017-10-25 15:19:56 -07:00
Zach Fox
14150c09ac Merge branch 'master' of https://github.com/highfidelity/hifi into stagingSetting 2017-10-25 12:59:36 -07:00
ZappoMan
226b974ce8 DPI is not a decimal 2017-10-25 11:59:29 -07:00
Dante Ruiz
2ec8f3f625 made non-dynamic entities collisionless during far-grab 2017-10-25 11:29:32 -07:00
Zach Fox
91333cdf7b Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster 2017-10-25 10:26:50 -07:00
Brad Hefta-Gaub
18a74cea91 Merge pull request #11659 from zfox23/mergeRC57IntoMaster_20171023 
2017-10-23: Merge RC57 into Master
 2017-10-24 21:19:01 -07:00
Zach Fox
7998984d8e Missed tons of spots! 2017-10-24 14:30:47 -07:00
Zach Fox
4b50454104 Missed a spot 2017-10-24 14:13:14 -07:00
Zach Fox
c64c2e17c8 First pass at consolidation 2017-10-24 12:01:05 -07:00
Brad Davis
befe583c5e Merge remote-tracking branch 'upstream/master' into HEAD 2017-10-24 11:50:07 -07:00
Zach Fox
1f6d989044 Merge branch 'RC-57' of https://github.com/highfidelity/hifi into mergeRC57IntoMaster_20171023 2017-10-23 17:37:43 -07:00
David Back
80dc98b2c2 remove prints 2017-10-23 14:23:45 -07:00
David Back
b5f1793863 add a tablet contextual mode flag to HMDScriptingInterface used to keep tablet in place 2017-10-23 14:21:18 -07:00
Zach Fox
cda43ec1ea Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster 2017-10-23 11:52:59 -07:00
Daniela
f15038c54f Re-add isFacingAvatar to true and delete rotation of the grabbermoveup tool. 2017-10-23 19:11:32 +01:00
Daniela
32b5776743 Merge branch 'master' of https://github.com/highfidelity/hifi into Gizmos 2017-10-23 18:51:40 +01:00
SamGondelman
7686948daf resolve conflicts and cleanup 2017-10-20 15:23:17 -07:00
SamGondelman
fb969964f3 generalized scripting interfaces 2017-10-20 14:37:10 -07:00
Brad Hefta-Gaub
26ea8bea6a Merge pull request #11612 from highfidelity/pointers 
Fix tablet intersection bug and start of Pointer migration work (WIP)
 2017-10-20 13:53:52 -07:00
Zach Fox
ae1b2bd931 'Tis a silly hack 2017-10-20 11:11:23 -07:00
vladest
ea6c2e1bb5 Merge branch 'master' into tablet_extended_sounds 2017-10-20 14:46:02 +02:00
Zach Fox
0dc6211a7d Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster 2017-10-19 14:43:33 -07:00
Ryan Huffman
894e91ea23 Merge pull request #10702 from CraftsmanMG/master 
Fingerpaint  PR
 2017-10-19 13:13:59 -07:00
Zach Fox
24d109cfe7 Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster 2017-10-19 12:13:38 -07:00
Daniela
832e30ad1c Edited Packet headers. 2017-10-19 19:53:47 +01:00
Zach Fox
9537e19ad4 Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster 2017-10-19 10:58:55 -07:00
Zach Fox
aa48215933 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_OctoberFixes2 2017-10-19 10:54:31 -07:00
Daniela
b28a99c2af Merge branch 'master' of https://github.com/highfidelity/hifi into Gizmos 2017-10-19 18:06:23 +01:00
Daniela
a02ee5b7d5 Grabber Tool Move up, remove billboard on grabbermoveupoverlay 2017-10-19 18:05:51 +01:00
Brad Hefta-Gaub
e2ccfb84f9 Merge pull request #11626 from Delanir/BubbleScaleMaster 
7429 IPD Secondary Task List: bubble.js Scale
 2017-10-19 09:31:15 -07:00
Melissa Brown
1a3821e984 Merge pull request #11591 from ctrlaltdavid/21568 
Add some Quat and Uuid JavaScript helper properties
 2017-10-18 22:07:06 -07:00
Seth Alves
28d0da51b9 Merge pull request #11628 from luiscuenca/case8269 
8269  controllerDispatcher is creating log spam with web entities
 2017-10-18 18:11:13 -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
luiscuenca
6e8756e8af Debug mode has been turned off 2017-10-18 15:40:03 -07:00
Zach Fox
6c7096b0d7 Fix login button injection on individual item page 2017-10-18 14:53:39 -07:00
Daniela
e9f3dd6e44 Merge BubbleScale for IPD with hifi master. 2017-10-18 22:29:12 +01:00
Zach Fox
de50eef9c7 Fix rez certified... 2017-10-18 13:54:46 -07:00
Zach Fox
949da17046 Wear It button for items with category 'Wearables' 2017-10-18 13:51:58 -07:00
Zach Fox
a669aff453 Merge branch 'RC-57' of https://github.com/highfidelity/hifi into mergeRC57IntoMaster_20171018 2017-10-18 10:45:30 -07:00
Zach Fox
3f0b08aea8 Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster 2017-10-18 10:37:47 -07:00
David Rowe
f31e014e8b Quat.ZERO --> Quat.IDENTITY 2017-10-18 20:34:55 +13:00
David Rowe
5b6d33bcb2 Missing semicolon 2017-10-18 20:29:34 +13:00
David Rowe
f74c33f597 Fix importing entities from URL 2017-10-18 17:44:36 +13:00
SamGondelman
58172cfbd4 merge from master 2017-10-17 18:05:59 -07:00
Nissim
935180bf09 Fixed my bloody stupid mistake... 2017-10-17 15:02:05 -07:00
Zach Fox
f3b641a833 Edit.js caused a testing fail :( 2017-10-17 11:30:15 -07:00
Nissim
a641d6de66 Variable rename. 2017-10-17 09:18:29 -07:00
David Rowe
8d4e979dc8 Replace usages of AVATAR_SELF_ID previously missed 2017-10-17 16:38:05 +13:00
David Rowe
ed1c974f75 Use MyAvatar.SELF_ID instead of Uuid.SELF 2017-10-17 15:58:51 +13:00
David Rowe
1e3a2b3e4e Merge branch 'master' into 21568 2017-10-17 15:15:49 +13:00
SamGondelman
429905de51 update scripts to use ignoreItems, fix caching bug 2017-10-16 15:52:17 -07:00
Nissim
1b42572f99 Merge branch 'hazeZone' of https://github.com/NissimHadar/hifi into hazeZone 
# Conflicts:
#	scripts/system/html/js/entityProperties.js
 2017-10-16 14:29:56 -07:00
SamGondelman
aee817fbbc scale end sphere in c++ for controller modules 2017-10-16 13:31:25 -07:00
Nissim
fd2b0da76d First version. 2017-10-16 12:20:31 -07:00
Zach Fox
1cf816a261 Fix Wallet notification appearing when taking screenshots 2017-10-16 11:15:09 -07:00
Nissim Hadar
afb8b2d8e7 Merge branch 'master' into hazeZone 2017-10-13 13:40:06 -07:00
Nissim Hadar
9c9dfc7211 Replace light blend with glare. 2017-10-13 13:36:46 -07:00
Zach Fox
17a0dd2a76 Elide long usernames in injected code 2017-10-13 13:32:55 -07:00
Seth Alves
fe9f142bf6 Merge pull request #11562 from druiz17/fix-release-grab 
include release message to controller modules
 2017-10-13 13:06:18 -07:00
Brad Hefta-Gaub
9f3331ec19 Merge pull request #11587 from druiz17/stylus-fix 
Fix Stylus in Tablet + Grab with Hand Results in the other Stylus being Dysfunctional
 2017-10-13 12:42:26 -07:00
David Rowe
fc4e440dc4 Update system scripts to use new properties 2017-10-14 08:32:14 +13:00
Nissim Hadar
c76229934c Changed blend-in colour and blend-out colour to colour and glare colour 2017-10-13 12:21:00 -07:00
Dante Ruiz
d14e6b6e5a Merge pull request #11450 from ElderOrb/case7722 
7722 Add onHover Outline to Tablet "X" Button
 2017-10-13 11:38:38 -07:00
druiz17
6799b9ca13 fix stylus 2017-10-13 09:34:08 -07:00
Nissim Hadar
b1174ce40c Merge branch 'master' into hazeZone 2017-10-12 17:04:42 -07:00
Brad Hefta-Gaub
1bba5ff812 Merge pull request #11554 from sethalves/import-av-entities 
Import av entities
 2017-10-12 13:30:53 -07:00
beholder
8c7462f012 fine-tuning based on discussion with Anshuman 2017-10-12 22:21:40 +03:00
Nissim Hadar
dc45c7af75 Implemented radio-buttons. 2017-10-12 11:18:18 -07:00
vladest
2d010980b0 Removed special sound for Mute and replace it with hover and click sounds 2017-10-12 19:15:09 +02:00
vladest
da734b628c Remove sound on stylus show and hide 2017-10-12 18:54:40 +02:00
vladest
145149fedd Merge branch 'master' into tablet_extended_sounds 2017-10-12 18:01:23 +02:00
Nissim Hadar
d0deaa631c Trying to pretty-up. 2017-10-12 07:54:03 -07:00
Nissim Hadar
00609c9547 Name correction. 2017-10-12 07:37:44 -07:00
beholder
9c15af9fbe raise highlight above button overlay to reduce flickering 2017-10-12 14:46:01 +03:00
Nissim Hadar
30fdf9d08e Merge branch 'master' into hazeZone 2017-10-11 22:12:52 -07:00
Nissim Hadar
a21995db24 Added checkbox for altitude effect. 2017-10-11 22:10:58 -07:00
Nissim Hadar
3ec8faa1b9 Added checkbox for altitude effect of haze. 2017-10-11 20:47:39 -07:00
Nissim Hadar
96fd3123e8 Changed haze altitude to ceiling. 2017-10-11 20:36:24 -07:00
Nissim Hadar
2f4ddd84f8 Renamed haze colours and moved checkbox for glare. 2017-10-11 19:32:09 -07:00
Nissim Hadar
748f97364b Moved Bakground Blend to end of Haze fields. 2017-10-11 19:20:46 -07:00
Nissim Hadar
832f9fb6e3 Renamed HAZE_MODE_RANGE_ONLY to HAZE_MODE_ENABLED. 2017-10-11 19:10:51 -07:00
Nissim Hadar
ea6b9ed28e Removed ...ALTITUDE_MODE from combo. 2017-10-11 18:58:59 -07:00
Zach Fox
99109fe8e5 Merge pull request #11567 from zfox23/commerce_daveIntegration3 
2017-10-10 Commerce Frontend Updates
 2017-10-11 11:07:03 -07:00
Zach Fox
c2733a4186 Fix notification bug 2017-10-11 09:47:16 -07:00
druiz17
67944c40a1 Merge branch 'master' of github.com:highfidelity/hifi into fix-release-grab 2017-10-11 09:13:01 -07:00
Atlante45
6dd49f5c32 Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master 2017-10-10 16:53:34 -07:00
Sam Gateau
f143c28625 Merge pull request #11542 from SamGondelman/bubbleBoy 
Move HUD and HUD overlay rendering out of display plugin
 2017-10-10 14:26:20 -07:00
druiz17
e77ac9fd10 include release message 2017-10-10 13:47:33 -07:00
Zach Fox
1c0a564155 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_daveIntegration3 2017-10-10 12:36:06 -07:00
Zach Fox
b105248dd7 Merge pull request #11555 from zfox23/commerce_daveIntegration2 
2017-10-09 Commerce Frontend Updates
 2017-10-10 12:34:30 -07:00
Seth Alves
4a3b59ea61 Merge pull request #11560 from druiz17/far-grab-nondynamic 
Far grab non-dynamic entities
 2017-10-10 12:29:38 -07:00
Zach Fox
be2b241629 Lots of progress; don't yet have some things 2017-10-10 12:20:48 -07:00
druiz17
013e15c9a2 made requested changes 2017-10-10 10:54:56 -07:00
Zach Fox
8d0d9a159f Bugfixes 2017-10-10 10:38:19 -07:00
Melissa Brown
662bb6c103 Merge pull request #11338 from 1P-Cusack/FogBugz/Case_6491_Part7 
[Case 6491] Remainder of entitySelectionTool clean up (details below).
 2017-10-10 10:36:14 -07:00
druiz17
a179df29fb mouse grab non-dynamic entities 2017-10-10 10:31:40 -07:00
druiz17
d0eb6a3ad0 remove comments 2017-10-10 09:45:41 -07:00
druiz17
003395b256 removing whitespace 2017-10-10 09:43:02 -07:00
Daniela
a46ef56af9 Merge with hifi:master. Packet Headers version were increased. 2017-10-10 17:26:33 +01:00
druiz17
fc41155ce1 saving work 2017-10-10 09:17:01 -07:00
Nissim Hadar
1a932fbaf0 Corrected error in html. 2017-10-09 19:10:30 -07:00
Nissim Hadar
71f567f15a Merge branch 'master' into hazeZone 2017-10-09 17:28:10 -07:00
Nissim Hadar
7d5a887f43 Refactoring. 2017-10-09 17:25:19 -07:00
Zach Fox
733df8391f Round 2 2017-10-09 12:27:56 -07:00
Seth Alves
23f41457be Revert "Revert "fix importing of avatar entities"" 
This reverts commit 28a8b18060.
 2017-10-09 11:52:43 -07:00
Seth Alves
28a8b18060 Revert "fix importing of avatar entities" 2017-10-07 16:54:05 -07:00
Brad Hefta-Gaub
62fc193bff Merge pull request #11532 from sethalves/import-av-entities 
fix importing of avatar entities
 2017-10-06 17:59:54 -07:00
Thijs Wenker
77a36bf788 Merge pull request #10892 from ctrlaltdavid/vr-edit-a 
VR edit app
 2017-10-07 02:19:00 +02:00
SamGondelman
7e6d5d9d98 merge with master 2017-10-06 14:57:08 -07:00
Nissim Hadar
bfdd489682 Fixed color selector bug. 2017-10-06 13:18:12 -07:00
Seth Alves
8d00731620 Merge branch 'master' of github.com:highfidelity/hifi into import-av-entities 2017-10-06 07:20:34 -07:00
LaShonda Hopper
2f082d9e86 [Case 6491] Fixes issue in normalizeDegrees from last commit (details below). 
The range of the function is targeting (-180, 180] such that
the statement:
    if (degrees < -180)
should be:
    if (degrees <= -180)
to account for degrees being -180.

Changes Committed:
	modified:   scripts/system/libraries/entitySelectionTool.js
 2017-10-06 10:11:26 -04:00
LaShonda Hopper
707569b230 [Case 6491] More efficient version of normalizeDegrees function (details below). 
Refactoring the original normalizeDegrees function to be
more efficient as suggested via:
    https://github.com/highfidelity/hifi/pull/11338#pullrequestreview-67520585

Changes Committed:
	modified:   scripts/system/libraries/entitySelectionTool.js
 2017-10-06 09:50:24 -04:00
Nissim Hadar
76aace980a Merge branch 'master' into hazeZone 2017-10-05 20:32:43 -07:00
Nissim Hadar
320c888ce4 Added checkbox to allow separate control of keylight attenuation. 2017-10-05 20:31:45 -07:00
Nissim Hadar
3afab3c1d3 Keylight attenuation implemented. 2017-10-05 18:25:02 -07:00
Nissim Hadar
f261477aa2 Adding sun attenuation. 2017-10-05 17:55:24 -07:00
David Rowe
105457b388 Don't unbusubscribe from possibly shared channel 2017-10-06 13:27:08 +13:00
druiz17
3139f5ef2a improve mouseHMD exit logic 2017-10-05 15:12:58 -07:00
druiz17
ba50fcc509 fix mouse dissapearing in desktop mode 2017-10-05 15:07:49 -07:00
Nissim Hadar
e15699192d Added blend angle and altitude reference base. 2017-10-05 14:18:03 -07:00
Nissim Hadar
2e2364e03f WIP - adding haze blend out colour 2017-10-05 13:20:21 -07:00
Nissim Hadar
cbaae2c79b WIP - haze colour. 2017-10-05 12:59:56 -07:00
Nissim Hadar
395d9cbd6b WIP - haze colour. 2017-10-05 12:13:37 -07:00
Seth Alves
b96fac2f00 Merge branch 'master' of github.com:highfidelity/hifi into import-av-entities 2017-10-05 11:43:25 -07:00
Seth Alves
53a49272dc fix importing of avatar-entities 2017-10-05 11:43:19 -07:00
Nissim Hadar
512b469dc6 Added haze colour selector. 2017-10-05 11:31:49 -07:00
Nissim Hadar
595530161a WIP - adding background blend. 
Haze altitude works.
 2017-10-05 09:28:55 -07:00
Nissim Hadar
b7af6a58a6 WIP - adding background blend 2017-10-05 09:16:14 -07:00
druiz17
347645329e fixing laser staying on in edit mode 2017-10-05 09:11:02 -07:00
Nissim Hadar
794cb961d5 Merge branch 'master' into hazeZone 2017-10-04 23:03:59 -07:00
Nissim Hadar
8b72e3044a WIP - implementing range+altitude mode. 2017-10-04 22:26:53 -07:00
David Rowe
b526ec0d93 Code review 2017-10-05 18:21:04 +13:00
LaShonda Hopper
18d884f6c4 [Case 6491] eslint pass: Fixes no-multiple-empty-lines issues. 
* eslint pass using .eslintrc.js

Changes Committed:
	modified:   scripts/system/libraries/entitySelectionTool.js
 2017-10-04 20:51:06 -04:00
LaShonda Hopper
e9ae2099f3 [Case 6491] eslint pass: Fixes indent issues. 
* eslint pass using .eslintrc.js

Changes Committed:
	modified:   scripts/system/libraries/entitySelectionTool.js
 2017-10-04 20:37:57 -04:00
LaShonda Hopper
ac81b22cc9 [Case 6491] eslint pass: Fixes references to SelectionManager (details below). 
SelectionManager was being referred to as selectionManager.

* eslint pass used .eslintrc.js

Changes Committed:
	modified:   scripts/system/libraries/entitySelectionTool.js
 2017-10-04 20:24:20 -04:00
David Rowe
63e7521711 Merge branch 'master' into vr-edit-a 2017-10-05 11:29:49 +13:00
Clément Brisset
74fd69ac2d Merge pull request #11523 from Atlante45/new-master 
RC56 into Master
 2017-10-04 15:17:52 -07:00
druiz17
9de1ca4e1a allow farGrab module to run when stylus is visible 2017-10-04 15:04:27 -07:00
LaShonda Hopper
a5b913a8b9 [Case 6491] Fixes minor spacing issue, on while loop missed previous eslint pass. 
Changes Committed:
    modified:   scripts/system/libraries/entitySelectionTool.js
 2017-10-04 17:36:28 -04:00
Nissim Hadar
71b49e5001 Merge branch 'master' into hazeZone 2017-10-04 10:25:06 -07:00
Brad Hefta-Gaub
a1979a2600 Merge branch 'master' into RC-56 2017-10-03 18:16:21 -07:00
Nissim Hadar
d4acb00aa5 Merge branch 'master' into hazeZone 2017-10-03 17:44:31 -07:00
druiz17
13feec89c2 remove update stylus 2017-10-03 16:12:37 -07:00
druiz17
ad9677f63e fixing grabbing and tablet bugs 2017-10-03 16:11:51 -07:00
SamGondelman
fa838e4715 merge from master 2017-10-03 15:53:33 -07:00
druiz17
6b3d89d18f fix hudlaser module 2017-10-03 14:13:37 -07:00
druiz17
33e9a71000 grab attachments 2017-10-03 12:51:51 -07:00
Zach Fox
ea3da6c9dd Merge pull request #11495 from zfox23/pop_interfaceChanges2 
Commerce: One step closer!
 2017-10-03 11:56:00 -07:00
Nissim Hadar
86c497a12f Merge branch 'master' into hazeZone 
# Conflicts:
#	libraries/networking/src/udt/PacketHeaders.cpp
#	libraries/networking/src/udt/PacketHeaders.h
 2017-10-03 10:34:33 -07:00
Howard Stearns
22f0ef33ed Merge pull request #11496 from howard-stearns/certificate-properties 
Certificate properties
 2017-10-03 10:06:48 -07:00
Daniela
b55e416ccf Remove fingerpaint app from scripts/system. 2017-10-03 15:28:05 +01:00
Daniela
2b18296cfd Merge remote-tracking branch 'upstream/master' 
# the commit.
 2017-10-03 15:26:22 +01:00
David Rowe
5145107f8c 2D overlays can no longer be lasered 2017-10-03 21:36:40 +13:00
David Rowe
a59d590111 ESLint 2017-10-03 13:33:20 +13:00
David Rowe
46ce68a893 Fix lasers 2017-10-03 13:33:11 +13:00
Zach Fox
11d0062104 Progress on buy endpoint 2017-10-02 16:57:41 -07:00
druiz17
8a0ecf4e6f propertly determine is laser intersects with HUD UI 2017-10-02 16:46:43 -07:00
druiz17
68780f56b7 Merge branch 'master' of github.com:highfidelity/hifi into fix-hud-module 2017-10-02 14:06:26 -07:00
Zach Fox
1050d2851d Modify injected code to add to dropdown menu 2017-10-02 12:37:49 -07:00
Zach Fox
15c0a21e0e Varied commit - styling changes, beginnings of new Wallet endpoint, etc 2017-10-02 12:19:24 -07:00
LaShonda Hopper
cb264b5552 [Case 6491] eslint pass: Addresses curly bracket, keyword spacing issues. 
* eslint pass using .eslintrc.js

Changes Committed:
  modified:   scripts/system/libraries/entitySelectionTool.js
 2017-10-02 13:28:43 -04:00
LaShonda Hopper
97ecf84f3d [Case 6491] eslint pass: Cleaning up comma-dangle noise. 
* eslint pass using .eslintrc.js

Changes Committed:
	modified:   scripts/system/libraries/entitySelectionTool.js
 2017-10-02 13:21:10 -04:00
LaShonda Hopper
c131686f1b [Case 6491] eslint pass: Addressing some comment issues. 
* This should reduces the noise for the eslint passes on this script.
* eslint pass using .eslintrc.js

Changes Committed:
	modified:   scripts/system/libraries/entitySelectionTool.js
 2017-10-02 12:55:51 -04:00
Howard Stearns
930832bb19 Merge branch 'master' of https://github.com/highfidelity/hifi into certificate-properties 2017-10-02 09:44:29 -07:00
LaShonda Hopper
a610946af1 [Case 6491] eslint pass: fixes undefined center var in that.updateHandles. 
* eslint pass using .eslintrc.js

Changes Committed:
	modified:   scripts/system/libraries/entitySelectionTool.js
 2017-10-02 12:31:10 -04:00
Zach Fox
1ec0f5d9a0 Merge branch 'master' of https://github.com/highfidelity/hifi into pop_interfaceChanges2 2017-10-02 09:26:59 -07:00
LaShonda Hopper
dbf8d19095 [Case 6491] eslint pass: fixes issues with equality checks. 
* Also adds some paren grouping to help with readability of some statements.
* eslint pass on script using .eslintrc.js

Changes to be committed:
	modified:   scripts/system/libraries/entitySelectionTool.js
 2017-10-02 12:26:00 -04:00
vladest
e360c1363e Merge branch 'master' into tablet_extended_sounds 2017-10-02 18:03:49 +02:00
David Rowe
829cc8e5e6 Merge branch 'master' into vr-edit-a 2017-10-02 17:08:27 +13:00
Nissim Hadar
449d7ae988 Merge branch 'master' into hazeZone 2017-10-01 19:18:16 -07:00
Anthony J. Thibault
7dfa80f666 Bug fix for offset of animated parts of oculus touch controller display 
Ensure position/rotations are updated with a consistent scale and
are animated correctly as the controller values change.
 2017-10-01 17:52:59 -07:00
druiz17
20918641f4 saving work 2017-09-29 16:48:25 -07:00
Howard Stearns
73c8da99dc Merge branch 'master' of https://github.com/highfidelity/hifi into certificate-properties 2017-09-29 16:46:43 -07:00
Zach Fox
1e52e7824b Fix injection 2017-09-29 16:39:07 -07:00
Zach Fox
255cede808 Correctly determine if we're on a marketplace screen 2017-09-29 16:05:26 -07:00
LaShonda Hopper
6571aef997 [Case 6491] makeStretchTool: Fix z undefined issue (details below). 
z:z appears to have been a typo, as there's no var z.  Should likely be z:1.

Changes Committed:
	modified:   scripts/system/libraries/entitySelectionTool.js
 2017-09-29 18:52:39 -04:00
Nissim Hadar
2e1919eba5 Merge branch 'master' into hazeZone 2017-09-29 15:16:46 -07:00
Anthony J. Thibault
9273e02497 Bug fix for offset of animated parts of oculus touch controller display 
Ensure position/rotations are updated with a consistent scale and
are animated correctly as the controller values change.
 2017-09-29 14:01:50 -07:00
Zach Fox
63396a2fc3 WalletScriptingInterface; wallet status refactor 2017-09-29 13:42:04 -07:00
David Rowe
75365847a1 Merge branch 'master' into vr-edit-a 2017-09-30 09:30:38 +13:00
SamGondelman
b59ec07171 move hud rendering to render thread, still need to separate out hud overlays 2017-09-29 09:49:08 -07:00
Seth Alves
7645808694 Merge pull request #11479 from druiz17/more-bugs 
fixing grabbing and tablet bugs
 2017-09-28 20:02:47 -07:00
Seth Alves
3d05a0c07c Merge pull request #11484 from druiz17/grab-js 
disable grab.js in HMD
 2017-09-28 17:27:26 -07:00
Howard Stearns
d1350a03c2 working checkpoint, but with a lot of debug/development stuff 2017-09-28 17:06:07 -07:00
druiz17
45b8bfdb1f disbale grab.js in HMD 2017-09-28 16:17:39 -07:00
Thijs Wenker
cabd68a63a Every time a dialog opened in edit.js a new callback is created, which wasn't disconnected after the event happened, this caused lots of entities to be created after each next import. 2017-09-28 16:03:09 -07:00
Zach Fox
2cff5c1fa6 First time Purchases tutorial 2017-09-28 15:12:55 -07:00
Zach Fox
66be558a04 My Items Interface 2017-09-28 14:04:57 -07:00
druiz17
1947f2ba99 remove update stylus 2017-09-28 13:23:28 -07:00
Zach Fox
68c08969ae Update Purchases 2017-09-28 12:49:38 -07:00
LaShonda Hopper
ff051db79a [Case 6491] Minor: Fixes some paren spacing. 
Changes Committed:
	modified:   scripts/system/libraries/entitySelectionTool.js
 2017-09-28 15:06:09 -04:00
LaShonda Hopper
0deabf54ef [Case 6491] Minor: fixes some coding standard spacing with wantDebug statements. 2017-09-28 15:04:28 -04:00
LaShonda Hopper
2bb76a357a [Case 6491] Some adjustments to isActiveTool (details below). 
* isActiveTool now respects null and undefined args.
    * If null or undefined toolHandle is passed, activeTool
      is directly tested against those values.  Rather than
      explicitly returning false.
* Added some clarification to unknown tool warning message.

Reviewed-by: Leander Hasty <leander@1stplayable.com>

Changes Committed:
	modified:   scripts/system/libraries/entitySelectionTool.js
 2017-09-28 15:04:28 -04:00
LaShonda Hopper
bed50dda2f [Case 6491] Fixes consistency issue with lights (details below). 
Fixes issue with light selection actions having inconsistent ui
in comparison to other selections from an earlier commit change.

As of this commit:
* When translating point lights, the edge grabbers are no longer be visible.
* When rotating or translating spot lights, the edge grabbers are no longer visible.

Note:
* For both point & spot lights, when translating and/or rotating, their circle
  and/or radial guides should remain visible.  This commit shouldn't have any
  influence on that behavior.

Tested:
* Rotating and translating spot lights.
* Translating point lights.  Didn't test rotation as only spot
  lights support rotation.

Changes Committed:
	modified:   scripts/system/libraries/entitySelectionTool.js
 2017-09-28 15:04:28 -04:00
LaShonda Hopper
9fb76340c7 [Case 6491] removes SelectionDisplay.mode (details below). 
This var isn't needed as the var essentially piggy backed
off of activeTool and activeTool.mode.

This also helps guard against the _majority_ of situations
where mode check fails due to typo inserted when composing
the check.

Most instances of manual string checks have been replaced by
querying activeTool via new isActiveTool function.  For instances
that still require a direct mode check getMode will return
the mode string associated with the current activeTool.

TODO:  Get this code reviewed.
 2017-09-28 15:04:28 -04:00
LaShonda Hopper
3a174780c2 [Case 6491] Minor: Move that.updateHandleSizes up (details below). 
It was down below the amidst the mouse event handlers. This just moves
it up with the other that.update handle functions definitions.

Changes Committed:
	modified:   scripts/system/libraries/entitySelectionTool.js
 2017-09-28 15:04:28 -04:00
LaShonda Hopper
9279290b2e [Case 6491] Remove dupe pickRay var (details below). 
Ran lint pass and found the dupe define.

As noted in a previous commit, the only remaining lint
issues are as follows:

* scripts/system/libraries/entitySelectionTool.js: line 17, col 1, Read only.
    * HIFI_PUBLIC_BUCKET assignment
* scripts/system/libraries/entitySelectionTool.js: line 19, col 1, Read only.
    * SPACE_WORLD assignment
* scripts/system/libraries/entitySelectionTool.js: line 30, col 1, Read only.
    * SelectionManager assignment

Changes Committed:
	modified:   scripts/system/libraries/entitySelectionTool.js
 2017-09-28 15:04:28 -04:00
LaShonda Hopper
c286ee95a4 [Case 6491] Zero state improvements (details below). 
Fixes issue where when translating the selected object(s),
user view was obstructed by grabber handles.

This also brings more consistency to the selection ui state between
rotation and translation user interactions.  Both types
of interactions feel nicer with the selection ui as concise
as possible during the action, limited only to that useful for
the current interaction.

Expected Behavior:
    Note the following presumes you're in creation mode.
* When the selection is clicked, the rotation, stretch, clone,
  and translateY handles should turn invisible.
* When moving a selection along either the x or z axis, the
  rotation, stretch, clone, and translateY handles should be
  invisible and remain that way until the user releases the selection.
* When the selection is released, the rotation, stretch, clone,
  and translateY handles should become visible.
* When the translateY handle is clicked, the rotation, stretch, and
  clone handles should turn invisible.  The translateY handle should
  remain visible.
* When moving the selection along the y axis, the rotation, stretch,
  and clone handles should be invisible and remain that way until the
  user releases the selection.  The translateY handle should be visible
  during the entire interaction.
* When the selection is released, the rotation, stretch, clone should
  become visible.  The translateY handle, visible the entire time, should
  already be visible.
* When the user click somewhere other than a selection, entity object,
  creation menu or tools, then any current selection should be
  unselected and all creation ui local to it should turn invisible.
* When the user exits creation mode, any current selection should be
  unselected and all creation ui local to it should turn invisible.

TODO:
* We may want to visit the scaling interaction ui as well; however,
  that could be a later task as it's tangential.  The changes here
  are a good first step.
    * The idea with that interaction is perhaps only showing the
      handle for the current scaling operation.  Currently when
      scaling all of the other handles remain visible, though
      their appearance does update.

Reviewed-by: Leander Hasty <leander@1stplayable.com>

Changes Committed:
	modified:   scripts/system/libraries/entitySelectionTool.js
 2017-09-28 15:04:27 -04:00
LaShonda Hopper
45c4a1081b [Case 6491] entityToolSelection logging/print review (details below). 
* Added some wantDebug guards to print sections without them.
* Normalized error logging statements to have script name
  and/or specific script function where reasonable.
    * All error statements contain at least the script name
      and a descriptive snippet of the error or clue to resolve it.
* Removed some stale todos.

Reviewed-by: Leander Hasty <leander@1stplayable.com>

Changes Committed:
	modified:   scripts/system/libraries/entitySelectionTool.js
 2017-09-28 15:04:27 -04:00
Leander Hasty
0b86169500 [Case 6491] remove rotateOverlayTarget. 
It is no longer used.

Reviewed-by: LaShonda Hopper <lashonda@1stplayable.com>
 2017-09-28 15:04:27 -04:00
Leander Hasty
74734f35e9 [Case 6491] more uniform grabber tools; more distrust of rotateOverlayTarget. 
Rotation tools' onMove methods now use rayPlaneIntersection rather than using the giant invisible rotateOverlayTarget.  It can likely be entirely removed in the next commit.

tool.onBegin's signature is now (event, pickRay, pickResult, ...) -- this allows us to avoid recomputing the ray or intersection when unnecessary.

translateXZTool is now a part of the grabberTools array; addGrabberTool and addStretchTool have been modified to return the tool reference (and not disassemble and reassemble the tools, so they can keep their own local functions and state).  This does make the array potentially less type-uniform, which may (?) undo some javascript optimizations, but allows us to eventually remove some state -- and they're only 1x/frame methods.

We now compute rotationNormal in rotation tool onBegin, rather than having many different normals lying around.

Merged the final branches in mousePressEvent.

Also fixed issue with mode TRANSLATE_XZ test within updateRotationHandles.

Reviewed-by: LaShonda Hopper <lashonda@1stplayable.com>
 2017-09-28 15:04:27 -04:00
Leander Hasty
fa74fbc986 [Case 6491] fixes rotation skip near 0 and 180. 
Previously, when rotating, it would be easy to achieve 1 degree granularity, except near the 0 degree and 180 degree "poles", where it would often e.g. jump from 10 to -10, or 174 to -175, or similar.

yawZero/pitchZero/rollZero were all based on the yawHandle/pitchHandle/rollHandle ray intersection, and were not necessarily coplanar with rotateOverlayTarget. As a result, centerToZero didn't lie on the expected plane, while centerToIntersect did.  This had the effect of distorting the rotation range.

We also have a possible issue in here with editOverlay(rotationOverlayTarget,{rotation:...}) not taking effect immediately.  Better to take the existing ray and cast against a known plane, as e.g. translateXZTool and such do.  No risk of stale rotation in that case.

This also cleans up rotationHelper args a bit to avoid some string switches and keep flow a little more readable.

TODO: propagate ray-plane test to helperRotationHandleOnMove rather than relying on ray hit location; normalize onBegin/onMove/etc across all tools to take queryRay and results args to avoid recreating the ray.

Reviewed-by: LaShonda Hopper <lashonda@1stplayable.com>
 2017-09-28 15:04:27 -04:00
LaShonda Hopper
fe171af31b [Case 6491] entitySelectionTool mousePressEvent refactor/cleanup (details below). 
Fixes situations where attempting to click on a rotate, grab,
or scale handle that was in front of others might unexpectedly
activate the obscured handle.

As of this commit the flow of mousePressEvent such that the
first item whether it be a tool or selection is what reacts
and absorbs the click/touch.  This is counter to the prior
behavior where whichever item or tool last passed the check
would determine what was hit and handled the touch _even_
when it wasn't the first thing to be touched.

* Got rid of some unused/stale vars
* Added some convenience functions
    * setRotationHandlesVisible function
    * setStretchHandlesVisible function
    * setGrabberMoveUpVisible function
* Removed checkIntersectWith helper functions as they're
  no longer used.
* Normalized onBegin signatures for all GrabberTools to
  support the new flow within mousePressEvent.
    * These are tools registered via addGrabberTool/makeStretchTool.
    * The onBegin signature changes from onBegin( event ) to
      onBegin( event, intersectResult ).
        * This allows for a simpler tool triggering where tools which
          utilized the additional information provided will have it,
          those which may need it the future shall have it with little
          issue, and those that don't care may ignore it.

NOTE(s):
* Tested normal movement within opening creation menu:  Passed
* With Creation Menu Open:
    * Tested clicking around the world in empty space: Passed
    * Tested single selection: Passed
    * Tested single selection rotation (pitch, yaw, roll): Passed
    * Tested single selection translation (xz, y): Passed
    * Tested multiple selection: Passed
    * Tested multiple selection rotation (pitch, yaw, roll): Passed
    * Tested multiple selection translation (xz, y): Passed

Reviewed-by: Leander Hasty <leander@1stplayable.com>

Changes Committed:
	modified:   scripts/system/libraries/entitySelectionTool.js
 2017-09-28 15:04:27 -04:00
LaShonda Hopper
96afbeca23 [Case 6491] Dedupe rotation handle tool code (details below). 
Pulled the common code shared between the rotation handle
tools out into helper funcs:
* helperRotationHandleOnBegin
* helperRotationHandleOnMove
* helperRotationHandleOnEnd

These functions either take in or derive the necessary info
needed to handle a specific rotation axis.

NOTE(s):
* Tested yaw, pitch, & roll handles using a box. The behavior
  remained consistent with that prior to this commit.

Reviewed-by: Leander Hasty <leander@1stplayable.com>

Changes Committed:
	modified:   scripts/system/libraries/entitySelectionTool.js
 2017-09-28 15:04:26 -04:00
LaShonda Hopper
926789437c [Case 6491] Propagates rotation reposition fix from YawHandle (details below). 
This wraps the selections rotation update handling into common helper
function utilized by all rotation handle tools (yaw,pitch,roll).

This function is the generalized fix previously exclusive to yawHandle.
This functions is now called within onMove for yaw, pitch, & rollHandle
tools.

NOTE(s):
* Tested yaw, pitch, & roll rotation didn't see any aberrant behavior.
** Tested overlapping shapes and selecting the overlapping portions followed
   by a rotation handle.  Only one took hold as a selection.
** Tested multiple selection and objects rotated & repositioned about the
   encapsulating bounding box's center point as expected.
* Tested translation with multiple items selected and it behaved as
  expected.

Reviewed-by: Leander Hasty <leander@1stplayable.com>

Changes Committed:
	modified:   scripts/system/libraries/entitySelectionTool.js
 2017-09-28 15:04:26 -04:00
LaShonda Hopper
18cc632df5 [Case 6491] Minor: Switching off wantDebug flags that were left on. 
Changes Committed:
	modified:   scripts/system/libraries/entitySelectionTool.js
 2017-09-28 15:04:26 -04:00
LaShonda Hopper
196b665e22 [Case 6491] Cleanup of mousePressEvent/tool(s) onBegin (details below). 
* Removes unregister tools switch which was never reached.
* Rolls all code rotation handle related code within mousePressEvent
  to the respective rotation handler onBegin functions.
    * onBegin call site updated accordingly to provide intersection
      data that code depends upon.
* Moves all translateXZTool code explicitly within mousePressEvent
  to the tool's onBegin function.
    * onBegin signature updated accordingly to provide intersect
      results that the tool relies upon.
    * Found and fixed a bug with translateXZTool
      where its startingElevation and startingDistance properties
      were _only_ set when local _debug_ var was set.
          * This appears to have been responsible for being able
            to move the object farther than was visible.  Re-tested
            with fix and wasn't able to get that behavior any longer.
* Wrap intersect tests within more reader friendly functions.

NOTE(s):
* Tested GrabberMoveUp and Rotation Handles.  They work as they
  did previously as expected.
* Tested selection behavior and it currently maintains as expected.
* Tested translationXZTool and it maintains its prior behavior with
  the improvement noted above.

Reviewed-by: Leander Hasty <leander@1stplayable.com>

Changes Committed:
    modified:   scripts/system/libraries/entitySelectionTool.js
 2017-09-28 15:04:20 -04:00
LaShonda Hopper
ae8ae6f6cc [Case 6491] Grabbers stay invisible while rotating (details below). 
This fixes the issue where grabbers would re-appear when rotating
the selected object rather than staying hidden.

updateHandles will now take the mode into account when deciding
if the non-light grabber handles should be visible.  This can be
subverted by the user selecting a light source as in line with
the previous behavior.

Adds some debug prints in event handlers guarded by local
wantDebug checks.

Has some minor cleanup changes:
* Remove unused var within updateRotationHandles
* Readability improvement for light check within updateHandles
* Pulled up rotate mode check within updateHandles
* Added grabberCloner visibility flag within updateHandles

Changes Committed:
    modified:   scripts/system/libraries/entitySelectionTool.js
 2017-09-28 14:58:30 -04:00
LaShonda Hopper
15ff4ebecb [Case 6491] Adds some debugging prints. 
Changes Committed:
	modified:   scripts/system/libraries/entitySelectionTool.js
 2017-09-28 14:58:30 -04:00
druiz17
3b05317db6 fixing grabbing and tablet bugs 2017-09-28 11:18:40 -07:00
Zach Fox
f0d668c5c3 Fix marketplace injection problems - yay! 2017-09-28 11:14:44 -07:00
Daniela
4a1dd975a9 Fix bubble scale issue for IPD Secondary Task List: bubble.js Scale. 2017-09-28 17:05:06 +01:00
Daniela
13eb7db462 Change teleport.js to update render state more frequently. 2017-09-28 16:12:20 +01:00
David Rowe
30c4a22441 Merge branch 'master' into vr-edit-a 2017-09-28 16:10:26 +13:00
Nissim Hadar
4d8a1db895 Merge branch 'master' into hazeZone 
# Conflicts:
#	libraries/entities-renderer/src/RenderableModelEntityItem.cpp
 2017-09-27 17:50:51 -07:00
Seth Alves
3016ce0a2b Merge pull request #11470 from sethalves/fix-grab-vs-trigger 
set grabbable and other checkboxes correctly if userData is blank
 2017-09-27 15:24:37 -07:00
Zach Fox
7ad3a5a1e3 Commerce: Tons of Interface changes (#11463) 
* canRez(Tmp)Certified()

* CertifiedItem beginnings

* Skeleton of verifyOwnerChallenge()

* Controlled failure; updateLocation() skeletion

* Controlled failure on checkout page with ctrl+f

* Skeleton Purchases first-use tutorial

* Initial progress on new setup

* Security pic tip

* Skeleton Certificate page

* Updates to Certificate

* General progress; setup is nearly complete

* Better buttons; last step almost done

* Initial progress on wallet home

* Completed recent transactions

* Security page

* Scrollbar

* Fix auth error text

* PassphraseSelection

* Change security pic

* Minor layout changes; beginnings of emulated header

* Various layout changes; wallet nav bar

* Help screen

* Quick onaccepted change

* First pass at new purchases

* Small style updates

* Some error progress

* Lightbox in purchases

* Collapse other help answers when clicking on another

* REZZED notif

* Commerce Lightbox

* Lots of new interactions in Purchases

* Hook up 'view certificate'

* Fix errors, fix close button on cert

* Purchases timer; much faster filter

* Add debugCheckout

* Purchase updates

* GlyphButton; separator; Checkout Success; Ledger fix; debug modes

* Lock glyph below security pic should be white

* Various fixes, round 1

* Circular mask

* Passphrase change button fix; TextField error edge highlighting

* Recent Activity fixes

* Various changes

* Standard Security Pic location

* Color changes

* Filter bar changes

* Styling for multiple owned items

* Minor language change

* Header dropdown (harder than expected)

* Small fixes

* View backup instructions

* marketplaces.js onCommerceScreen

* Beginnign of new injection

* Marketplace injection changes

* Purchase button style changes

* More button styling

* MY PURCHASES button

* marketplace onUsernameChanged

* New help QA

* Help text changes etc

* Downscale security image, reducing filesize

* Lots of bugfixes

* Cleanup before PR

* Only open cert during inspection if commerce switch is on

* Help text changes

* Purchase status incl. change to confirmed; Help text; Open Explorer to hifikey

* Quick glyph change

* New 'wallet not set up' flow for when entering Purchases or Checkout without set-up wallet
 2017-09-27 14:43:51 -07:00
druiz17
58a00a89d7 remove debug print 2017-09-27 12:58:11 -07:00
druiz17
cea3c002dd improving far rotate 2017-09-27 11:47:26 -07:00
druiz17
38096b48d9 fixing entitySelectionTool 2017-09-27 10:52:56 -07:00
Seth Alves
eb6c99456d Merge branch 'master' of github.com:highfidelity/hifi into fix-grab-vs-trigger 2017-09-27 10:01:24 -07:00
Daniela
c22d2add17 Resolve conflict with hifi/master. 2017-09-27 17:06:12 +01:00
Brad Hefta-Gaub
3500705d0c Merge pull request #11427 from ElderOrb/case7723 
7723 Tablet Should Rotate Faster when using Create app
 2017-09-26 22:05:45 -07:00
David Rowe
6b3b2beae0 Merge branch 'master' into vr-edit-a 2017-09-27 15:34:52 +13:00
Seth Alves
ae42d56cd6 Merge pull request #11465 from hyperlogic/bug-fix/teleporter-near-scale 
Teleport.js: can now teleport small distances with small avatar scale
 2017-09-26 19:05:14 -07:00
Seth Alves
ce3e5eb1a3 set grabbable and other checkboxes correctly if userData is blank or malformed. near-trigger blocks near-grab 2017-09-26 18:56:27 -07:00
Seth Alves
f384cde471 Merge pull request #11467 from sethalves/fix-near-trigger 
Fix near trigger
 2017-09-26 17:27:05 -07:00
Dante Ruiz
410baaf7bc Merge pull request #11464 from druiz17/controller-dispatacher-bugs 
fix auto dropping and re-grabbing loop
 2017-09-26 16:46:34 -07:00
Seth Alves
8180acbffc use same trigger test as in isReady 2017-09-26 16:29:22 -07:00
Andrew Meadows
dafadf82bb Merge pull request #11458 from jherico/fix/tablet_latency 
Fix long tablet lag on first load
 2017-09-26 16:18:31 -07:00
Seth Alves
a478506da3 Merge branch 'master' of github.com:highfidelity/hifi into fix-near-trigger 2017-09-26 15:52:22 -07:00
Seth Alves
644532dd59 only send startNearTrigger once 2017-09-26 15:17:23 -07:00
beholder
ef732fb547 enable 'close' button overlay on hover/leave with stylys/lasers 2017-09-27 01:07:32 +03:00
beholder
6409580b03 ignore intersection for 'close' button highlight overlay 2017-09-27 01:06:47 +03:00
druiz17
5a1242a1ac fix spelling error 2017-09-26 15:06:31 -07:00
druiz17
76c1fe688c fix auto dropping 2017-09-26 14:52:01 -07:00
Anthony J. Thibault
a7cfb5d635 teleport.js: fix for TELEPORT_CANCEL_RANGE with large/small avatar scale 2017-09-26 14:21:25 -07:00
Anthony J. Thibault
c26d04dca1 Teleport.js: Fix message bugs, and made eslint clean 
* 'Hifi-Teleport-Ignore-Add' and 'Hifi-Teleport-Ignore-Remove' messages should now should work
* 'Hifi-Teleport-Disabler' message should now work
 2017-09-26 13:58:00 -07:00
Seth Alves
a871a6db1d Merge pull request #11430 from sethalves/fix-parent-grab 
Fix parent grab
 2017-09-26 13:00:16 -07:00
beholder
24a12a2f8f 7722 Add onHover Outline to Tablet "X" Button 2017-09-26 22:31:56 +03:00
Seth Alves
81f74f9297 Merge pull request #11444 from druiz17/module-handcontrollerPointer 
Made handControllerPointer into modules in hope of preventing mouse cursor interference with tablet
 2017-09-26 12:21:03 -07:00
Seth Alves
91f5f61ea3 Merge pull request #11456 from druiz17/bugs-handControllerGrab 
Correctly grab tablet in 3rd person
 2017-09-26 12:19:20 -07:00
Seth Alves
913d3c4d12 Merge pull request #11422 from hyperlogic/feature/ant-man2 
Secondary IPD fixes
 2017-09-26 11:53:45 -07:00
Seth Alves
216888aa03 Merge branch 'fix-parent-grab' of github.com:sethalves/hifi into fix-parent-grab 2017-09-26 11:08:40 -07:00
Seth Alves
737b583745 avoid unequipping things during a HMD snap-turn 2017-09-26 11:08:33 -07:00
Dante Ruiz
e397d49564 Merge pull request #11159 from vladest/modal_dialogs_async 
Modal dialogs async
 2017-09-26 11:07:42 -07:00
druiz17
2cc8a55151 fix cloning equiping 2017-09-26 10:37:36 -07:00
Daniela
e264503b9f Merge remote-tracking branch 'upstream/master' 2017-09-26 17:49:15 +01:00
Daniela
179a426389 Address QA comments. 2017-09-26 17:44:46 +01:00
Seth Alves
0b60928dd3 fix rollup-to-parent code to only roll up to entity parents 2017-09-25 19:07:40 -07:00
Brad Davis
40c42d35a5 Fix long tablet lag on first load 2017-09-25 17:50:04 -07:00
druiz17
6332a53ee2 able to grab tablet in 3rd person 2017-09-25 16:36:29 -07:00
Seth Alves
5da5b24894 unmangle merge 2017-09-25 15:18:22 -07:00
David Rowe
428efa571e Merge branch 'master' into vr-edit-a 2017-09-26 10:40:07 +13:00
druiz17
ec40df711d fix tablet grabbing and eslint changes 2017-09-25 14:31:13 -07:00
druiz17
b1b31444f0 fix mouse visiblity 2017-09-25 11:34:18 -07:00
druiz17
dda20c1ef5 fixing merge conflict 2017-09-25 09:45:29 -07:00
Nissim Hadar
27af4685e7 Added range and altitude to UI. 2017-09-25 09:32:52 -07:00
Seth Alves
5741782f45 merge from upstream 2017-09-25 09:16:43 -07:00
Brad Hefta-Gaub
030da7d850 Merge pull request #11401 from druiz17/module-scale-entities 
ScaleEntity Module
 2017-09-25 09:10:32 -07:00
Seth Alves
90954a4e4f Merge branch 'master' of github.com:highfidelity/hifi into fix-parent-grab 2017-09-25 09:09:58 -07:00
vladest
1a2d38e31f Removed sounds for tablet in and out, added sounds for stylus instead. Added logging for testing semi-pressed laser and keyboard sounds 2017-09-25 17:11:44 +02:00
Nissim Hadar
1a9625d272 Merge branch 'master' into hazeZone 2017-09-24 18:27:36 -07:00
Nissim Hadar
6cbf087708 First version with combo for Haze Mode. 2017-09-24 15:08:22 -07:00
Zach Fox
921ebc221e Merge pull request #11431 from zfox23/contextOverlayInterface_fixEnabled 
Enable Inspection Mode for all; change Commerce setting name
 2017-09-22 17:52:27 -07:00
druiz17
b8ee60a394 fix scripting error 2017-09-22 17:13:48 -07:00
druiz17
2c7b8cdb4f fixing script issues 2017-09-22 16:26:41 -07:00
druiz17
ee9ac3e7f9 undo unnessary changes 2017-09-22 15:38:39 -07:00
druiz17
28d8af0b44 Merge branch 'master' of github.com:highfidelity/hifi into module-handcontrollerPointer 2017-09-22 15:33:17 -07:00
druiz17
e965b7fff1 hand controller pointer 2017-09-22 15:32:40 -07:00
Zach Fox
0eafdeab14 Fix hover -> unhover overlay behavior 2017-09-22 13:32:11 -07:00
Zach Fox
bb9db3ef6d Updates to behavior and shader appearance 2017-09-22 11:24:30 -07:00
Nissim Hadar
5e1d470553 WIP 2017-09-22 09:48:22 -07:00
David Rowe
e0658c7a2f Merge branch 'master' into vr-edit-a 2017-09-22 15:18:14 +12:00
druiz17
53efe6bfb2 working on fix 2017-09-21 18:17:05 -07:00
Anthony J. Thibault
54e627e2c5 Merge branch 'master' into feature/ant-man2 2017-09-21 13:59:47 -07:00
Seth Alves
fc3e259f6f remove debug prints 2017-09-21 11:42:30 -07:00
Seth Alves
3c22c9ea3a back out bad change 2017-09-21 11:39:14 -07:00
Zach Fox
57b5a23373 Enable Inspection Mode for all; change Commerce setting name 2017-09-21 11:18:21 -07:00
Seth Alves
24bfb3f3b9 oops 2017-09-21 11:16:00 -07:00
Seth Alves
363a2a3a7a merge from upstream 2017-09-21 11:08:29 -07:00
Seth Alves
473db92a8e fix some parent-grab bugs, re-enable adjusting equipped entities, don't trigger guns right when they are equipped 2017-09-21 11:07:47 -07:00
Daniela
d054c6dc36 Merge branch 'master' of https://github.com/highfidelity/hifi 2017-09-21 18:29:45 +01:00
Daniela
adde847798 Fix code standard. 2017-09-21 17:57:02 +01:00
Seth Alves
61efaf7fc2 Merge pull request #11420 from druiz17/fix-parenting-overlay-module 
nearParentGrab module now sets the correct previous parent id when switching grabbed overlays from one hand to another
 2017-09-21 09:44:07 -07:00
Daniela
9787c31d70 Fix protect color pick from wrong user input. 2017-09-21 17:17:36 +01:00
druiz17
65e0c99618 small change 2017-09-21 09:07:49 -07:00
druiz17
2d7d6f85ba fixing merge conflicts 2017-09-21 09:04:13 -07:00
Daniela
d960a7c42e Merge branch 'master' of https://github.com/highfidelity/hifi 2017-09-21 16:20:51 +01:00
Daniela
7ccfac0b3b Protect stroke width from wrong user input. Protect color pick from wrong user input. 2017-09-21 15:54:53 +01:00
beholder
8085d0292d 7723 Tablet Should Rotate Faster when using Create app 2017-09-21 16:26:54 +03:00
David Rowe
c05ccd2ed5 Merge branch 'master' into vr-edit-a 2017-09-21 14:08:16 +12:00
Anthony Thibault
03e278c5ae Merge pull request #11416 from druiz17/stylus-pos 
Pull back the stylus position in hand.
 2017-09-20 17:40:22 -07:00
druiz17
2c55419c60 change tablet forward offset 2017-09-20 16:49:45 -07:00
Seth Alves
90c97319ea Merge pull request #11408 from druiz17/fix-tablet-input 
fixing/improving and cleanup tablet inputs
 2017-09-20 16:36:07 -07:00
druiz17
949c343604 fixing nearGrabParentModule switching grabbed overlays 2017-09-20 15:34:01 -07:00
Thijs Wenker
7ea1968b33 Tip, Code Writer which comes standard with Windows 10, does enter tabs by default when using the tab key. >=) 2017-09-20 14:59:15 -07:00
Thijs Wenker
60a566768a removed debug spam from makeUserConnection, to reactivate it set Settings.setValue('MAKE_USER_CONNECTION_DEBUG', true); and reload the script 2017-09-20 14:39:13 -07:00
druiz17
92f3dfe2ab move the stylus back a bit 2017-09-20 14:23:43 -07:00
druiz17
c20c5ee2b5 fixed tablet grabbing issue 2017-09-20 14:10:10 -07:00
druiz17
2ce6dcf89d fixing spelling error 2017-09-20 11:45:42 -07:00
druiz17
5d87036f32 make changes requests and slight fixes 2017-09-20 11:41:31 -07:00
vladest
c17ca955db Listener disconnects in C++ now 2017-09-20 20:03:53 +02:00
Daniela
8144841258 Add Edit.js Entities spawn up according to the orientation of the avatar. 2017-09-20 09:21:16 -07:00
Anthony J. Thibault
0873b88347 code review feedback 2017-09-20 09:21:15 -07:00
druiz17
e78d8bc132 tablet on wiki planet 2017-09-20 09:11:06 -07:00
druiz17
9c66a25d83 fixing and cleanup tablet inputs 2017-09-19 17:03:53 -07:00
vladest
67771bc297 Merge branch 'master' into modal_dialogs_async 2017-09-19 21:51:02 +02:00
Daniela
1426e10024 Fix texture loading issue with upstream master. Tune amount of points. 2017-09-19 17:47:00 +01:00
druiz17
e2921661e9 scaling entities 2017-09-19 09:35:22 -07:00
David Rowe
c56fda88fa Merge branch 'master' into vr-edit-a 2017-09-19 16:17:04 +12:00
druiz17
9df3b6c211 change tablet spawn position 2017-09-18 13:29:05 -07:00
Anthony J. Thibault
0757f513af Merge branch 'master' into feature/ant-man 2017-09-18 11:36:39 -07:00
vladest
5585265349 Merge branch 'master' into modal_dialogs_async 2017-09-16 22:06:49 +02:00
Seth Alves
765031bf89 Merge pull request #11377 from vladest/create_resize 
Add resizable flag. Use the flag for Create only
 2017-09-16 11:14:40 -07:00
Seth Alves
095cd03ee2 Merge pull request #11380 from ctrlaltdavid/fix-controller-typos 
Fix typos in controller modules disabler
 2017-09-16 11:13:15 -07:00
vladest
5b033e021a Merge branch 'master' into modal_dialogs_async 2017-09-16 12:30:07 +02:00
David Rowe
e788f691c4 Merge branch 'master' into vr-edit-a 2017-09-16 15:59:08 +12:00
David Rowe
6c5a1c0460 Address laser and controller interactions with HUD overlays and tablet 2017-09-16 15:45:44 +12:00
David Rowe
18b71f0c0f Fix typos in controller modules disabler 2017-09-16 15:34:53 +12:00
vladest
de4f34aacb Add resizable flag. Use the flag for Create only 2017-09-15 21:49:38 +02:00
Seth Alves
0816a8af27 fix grab entity methods 2017-09-15 12:07:50 -07:00
Seth Alves
b67c571aaa fix grab entity methods 2017-09-15 12:05:49 -07:00
Artur Gomes
e37b98e0f5 Fix polyline optimization. 
Add more points to the polyline to check if the optimizations are
working.
 2017-09-15 19:20:33 +01:00
Seth Alves
df80b7ecfa stopNearTrigger, not end 2017-09-15 11:16:54 -07:00
Seth Alves
39e6605f6f fix grab entity methods + jshint cleanups 2017-09-15 10:50:46 -07:00
Anthony J. Thibault
f534ee5ad9 laser offset fix 2017-09-14 16:37:45 -07:00
David Rowe
b0c951a2c4 Merge branch 'master' into vr-edit-a 2017-09-15 11:09:39 +12:00
Thijs Wenker
af4bc59307 clone local avatar entities 2017-09-14 23:31:51 +02:00
vladest
0bfa29d0d4 Merge branch 'master' into modal_dialogs_async 2017-09-14 20:21:29 +02:00
Anthony J. Thibault
7959988622 Merge branch 'master' into feature/ant-man 2017-09-14 10:37:45 -07:00
Anthony J. Thibault
7c725756f1 IPD Fixes for controllerDispatcher and controllerModules 2017-09-14 10:36:05 -07:00
David Rowe
299a8078e3 Revert handControllerGrab.js related changes 2017-09-14 17:08:26 +12:00
Anthony J. Thibault
9a9f4a0d24 Fix controllerModules with appropriate IPD scale changes 2017-09-13 18:23:54 -07:00
Anthony J. Thibault
8fb69a9867 Merge branch 'master' into feature/ant-man 2017-09-13 18:23:11 -07:00
Anthony J. Thibault
745d2ff395 Remove handControllerGrab.js, see controllerDispatcher.js instead. 2017-09-13 17:36:56 -07:00
David Rowe
a4ecb69ea6 Merge branch 'master' into vr-edit-a 2017-09-14 12:26:20 +12:00
druiz17
1b288ef860 make garbbing radius the same as master 2017-09-13 16:15:36 -07:00
Anthony J. Thibault
a505a16232 Don't rescale tablet, in desktop mode, when sensorToWorldScale changes. 2017-09-13 14:22:49 -07:00
Anthony J. Thibault
ae2d0e89b4 Fixes for desktop tablet 2017-09-13 14:18:00 -07:00
Anthony J. Thibault
de5f0ad987 WebTablet.js: calcSpawnInfo works more consistently. 2017-09-13 12:01:41 -07:00
Anthony J. Thibault
9a1fa9b2f2 Fix for stylus intersection with tablet and home button for scaled tablets 2017-09-13 09:52:20 -07:00
Artur Gomes
b65520e788 Merge remote-tracking branch 'upstream/master' 2017-09-13 12:32:17 +01:00
druiz17
b3ff5c86f7 fixed secondary triggers and chest lid 2017-09-12 14:43:06 -07:00
Artur Gomes
6e5eb1d918 Made the number of points per line 70 again for test purposes. 2017-09-12 20:03:32 +01:00
Dante Ruiz
d90f6320a9 Merge pull request #8 from sethalves/controller-dispatcher-1 
Controller dispatcher 1
 2017-09-12 10:54:10 -07:00
druiz17
b634292261 fixing some small issues 2017-09-12 10:53:04 -07:00
Seth Alves
e9918ca599 add profiling to controller-dispatcher 2017-09-12 10:52:52 -07:00
Seth Alves
a9aa6df93e Merge branch 'controller-dispatcher-1' of github.com:sethalves/hifi into controller-dispatcher-1 2017-09-12 10:44:29 -07:00
Seth Alves
315f874824 add profiling to controller-dispatcher 2017-09-12 10:44:09 -07:00
Seth Alves
2850029f26 add profiling to controller-dispatcher 2017-09-12 10:00:32 -07:00
Anthony J. Thibault
bb5e808051 Fix for some of tablet size issues, on switching domains. 2017-09-11 18:59:52 -07:00
druiz17
684aef23dc Merge branch 'controller-dispatcher-1' of github.com:druiz17/hifi into controller-dispatcher-1 2017-09-11 15:08:37 -07:00
druiz17
a46e41607c fixed teleport, added avatar scaling, allow laser to be used on tablet when stylus is shown 2017-09-11 15:07:14 -07:00
Seth Alves
9c098f1a0c Merge branch 'controller-dispatcher-1' of github.com:druiz17/hifi into controller-dispatcher-1 2017-09-08 17:10:02 -07:00
druiz17
405d8c3afc fixing cloning and laser 2017-09-08 17:07:27 -07:00
Seth Alves
a1ffc7abd0 distance from controller to object is sometimes decided by pickray 2017-09-08 17:04:09 -07:00
druiz17
42ef397b5e fixed include path 2017-09-08 15:13:19 -07:00
Anthony J. Thibault
72e0c844e4 Merge branch 'master' into feature/ant-man 2017-09-08 14:08:26 -07:00
druiz17
e33012e522 laser on tablet update 2017-09-08 13:30:30 -07:00
druiz17
dbb91e5953 Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1 2017-09-08 11:50:43 -07:00
druiz17
f0c12e50dd some small bug fixes 2017-09-08 11:50:19 -07:00
Daniela
e453bf8d55 Refactoring. 2017-09-08 17:58:16 +01:00
Daniela
08688dc9ed Refactoring. 2017-09-08 17:56:11 +01:00
Daniela
758f049f30 Correct offset for teleport pad. 2017-09-08 14:02:26 +01:00
Daniela
10e29d1cf0 Decrease offset for teleport pad. Add Bubble orientation and scale correction. 2017-09-08 12:45:29 +01:00
David Rowe
03ddf04140 Merge branch 'master' into vr-edit-a 2017-09-08 16:51:12 +12:00
Anthony J. Thibault
d0f9a20a01 Fix for tablet grabbing at small scales 2017-09-07 15:10:15 -07:00
druiz17
ef050a09f9 made requested changes and also allow entities/overlays to be grabbed by the grip button 2017-09-07 14:42:46 -07:00
Brad Hefta-Gaub
b316f366fc Merge pull request #11198 from druiz17/oculus-tablet-position 
fixed tablet spawn position for oculus menu button
 2017-09-07 12:30:33 -07:00
Brad Hefta-Gaub
fce8715457 Merge pull request #11306 from ElderOrb/case7385 
7385 - Collect Stats on "Exit VR" button
 2017-09-07 10:18:58 -07:00
druiz17
636e906191 Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1 2017-09-06 17:15:18 -07:00
druiz17
cc7a222374 fixing Hifi-Hand-Drop for equipEntity 2017-09-06 17:15:05 -07:00
David Rowe
83a8cb5fe0 Merge branch 'master' into vr-edit-a 2017-09-07 10:53:41 +12:00
druiz17
0d66bfca05 added far trigger 2017-09-06 14:58:04 -07:00
Daniela
0ac7e00612 Add Avatar resize compatible teleport.js pad scale 2017-09-06 19:45:03 +01:00
Dante Ruiz
a5553d5e1c fixed text scale for notifications 2017-09-06 09:26:48 -07:00
Dante Ruiz
b4f7cb961a Merge branch 'feature/ant-man' of github.com:hyperlogic/hifi into feature/ant-man 2017-09-06 08:38:08 -07:00
Dante Ruiz
15c853567d Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1 2017-09-06 08:34:28 -07:00
David Rowe
52bf8ac9a1 Merge branch 'master' into vr-edit-a 2017-09-06 13:33:33 +12:00
David Rowe
6838461b07 Display notification message when don't have rez permissions 2017-09-06 12:44:57 +12:00
Anthony J. Thibault
af8b147321 away.js - works better with sensor scale. 2017-09-05 17:34:35 -07:00
Dante Ruiz
a34dae4aad adding scale to notifications 2017-09-05 17:12:40 -07:00
David Kelly
1fd30b1e0f fix passphrase reset 2017-09-05 17:03:11 -07:00
Anthony J. Thibault
74f974c68f Merge branch 'master' into feature/ant-man 2017-09-05 16:27:41 -07:00
Dante Ruiz
fec8482b69 Merge branch 'master' of github.com:highfidelity/hifi into feature/ant-man 2017-09-05 16:26:51 -07:00
Anthony J. Thibault
3d3bb2853a Updated naturalDimensiosn for touch controller config 
Totally untested! I don't have an oculus.  I'm sure it will work tho. ;)
 2017-09-05 15:39:35 -07:00
Anthony J. Thibault
23ff1b9ead Fixes for scaling controller display 
Adds MyAvatar.sensorToWorldScaleChanged signal.
 2017-09-05 15:03:41 -07:00
David Kelly
4bdfe092cf Regression in injection script 2017-09-05 12:28:31 -07:00
Dante Ruiz
cefa65de5e some more small changes 2017-09-05 12:06:32 -07:00
Dante Ruiz
28694dcf8a small change to contextOVerlays in farActionGrab 2017-09-05 11:46:06 -07:00
beholder
c0e7e5a8b2 7385 - Collect Stats on "Exit VR" button 2017-09-05 21:26:35 +03:00
David Rowe
44b365df6d Merge branch 'master' into vr-edit-a 2017-09-03 10:57:32 +12:00
David Kelly
8723ff2df2 Merge pull request #11294 from zfox23/commerce_walletPassphraseModal 
Commerce: Wallet Passphrase Input Modal
 2017-09-01 17:46:09 -07:00
Dante Ruiz
3b357ad61e finshed handControllerGrab refactoring 2017-09-01 17:07:26 -07:00
Seth Alves
8ccacf34f4 Merge pull request #11290 from Menithal/21484 
WL21484 - Add an additional parameter for entity animations to "allow translation"
 2017-09-01 15:34:07 -07:00
Zach Fox
3cf0df518f Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_walletPassphraseModal 2017-09-01 11:53:47 -07:00
Anthony J. Thibault
26e9e6e580 Fixes for stylus ranges and grab radii 2017-09-01 11:19:51 -07:00
Dante Ruiz
9bd368c0a9 Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1 2017-09-01 08:27:09 -07:00
vladest
681fc529dc Merge branch 'master' into modal_dialogs_async 2017-09-01 13:31:15 +02:00
druiz17
2948061904 code cleanup 2017-08-31 22:30:30 -07:00
David Rowe
269f1769be Merge branch 'master' into vr-edit-a 2017-09-01 14:45:59 +12:00
Anthony J. Thibault
6618ba12e9 Merge branch 'master' into feature/ant-man 2017-08-31 18:10:39 -07:00
Dante Ruiz
7cf27c18d3 code cleanup and fix broken features 2017-08-31 18:06:55 -07:00
Anthony J. Thibault
a1b94fd9d2 Bug fixes for laser offset and avatar hold action 2017-08-31 17:26:00 -07:00
Zach Fox
fa25c434ca Messages to marketplaces.js 2017-08-31 15:50:42 -07:00
Brad Davis
65b49a958f Merge branch 'master' into 21484 2017-08-31 14:59:30 -07:00
Anthony J. Thibault
98c89cbe78 Fixes for stylus size and offset 2017-08-31 14:45:59 -07:00
Zach Fox
ce32d2d420 Checkout and Purchases 2017-08-31 14:12:05 -07:00
David Kelly
de2ce1cd5f warning 2017-08-31 13:23:38 -07:00
Anthony J. Thibault
a0eb8152a6 fix for tablet spawn position 2017-08-31 13:15:46 -07:00
Anthony J. Thibault
1a01209020 Fixes for scaling tablet at high frame rates 2017-08-31 13:02:31 -07:00
druiz17
98b1fe6138 Merge pull request #11266 from ElderOrb/case6819 
6819 - Create button not disabled
 2017-08-31 12:36:08 -07:00
David Kelly
396f108182 forgot this the first time 2017-08-31 12:18:46 -07:00
Zach Fox
914a6bae00 Commerce: Wallet Passphrase Modal 2017-08-31 12:18:38 -07:00
vladest
1b5e6fd5f8 Merge branch 'master' into modal_dialogs_async 2017-08-31 20:39:48 +02:00
Anthony J. Thibault
9c6b8a6826 Fixes for scaling tablet 2017-08-31 11:28:05 -07:00
Zach Fox
164eeaae64 Fix the duplicated buy buttons for admins on Marketplace 2017-08-31 10:41:44 -07:00
Daniela
42be6434af Merge branch 'master' of https://github.com/highfidelity/hifi 2017-08-31 18:03:39 +01:00
David Rowe
8205b0d9d2 Merge branch 'master' into vr-edit-a 2017-08-31 15:45:15 +12:00
Anthony J. Thibault
6e6687c3a6 Change tablet dimensions as sensorToWorldScale changes 2017-08-30 18:21:25 -07:00
Dante Ruiz
47699d4439 fixed edit.js 2017-08-30 16:52:59 -07:00
David Kelly
988ee8c8d1 fix image provider, couple other things 2017-08-30 15:23:54 -07:00
Dante Ruiz
3960ec7d5a finish main handControllerGrab refactoring 2017-08-30 15:20:03 -07:00
Zach Fox
f366743be7 Login; punctuationMode; new images 2017-08-30 11:07:03 -07:00
Zach Fox
1b48319a3f Merge pull request #11267 from zfox23/commerce_zachsPunchlist1 
Commerce: Zachs Punchlist 01
 2017-08-30 10:10:56 -07:00
Anthony J. Thibault
9cd8b6991e Merge branch 'master' into feature/ant-man 2017-08-30 08:58:55 -07:00
Dante Ruiz
ff134b338b Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1 2017-08-30 08:25:53 -07:00
howard-stearns
5b264a867a fix wallet login (and share code with snapshot login) 2017-08-29 16:05:01 -07:00
Zach Fox
a9c99854f9 Haven't purchased anything yet UI 2017-08-29 15:39:07 -07:00
Dante Ruiz
49608f1253 Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1 2017-08-29 15:19:16 -07:00
Dante Ruiz
ed52136fc5 finished equiping locked clone-able entities 2017-08-29 15:18:28 -07:00
Zach Fox
50241078ae Buncha punchlist items checked off 2017-08-29 14:30:00 -07:00
beholder
180acbc188 6819 - Create button not disabled 2017-08-29 23:49:44 +03:00
Zach Fox
91f4e59f61 Misc fixes. Get started. 2017-08-29 12:33:44 -07:00
Dante Ruiz
4b592687b7 finished webEntityLaserInput, now working on cloning 2017-08-28 17:35:34 -07:00
Zach Fox
22d3857501 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_checkoutAndInventory 2017-08-28 15:10:17 -07:00
Anthony J. Thibault
573985c7c9 Merge branch 'master' into feature/ant-man 2017-08-28 09:27:04 -07:00
Sam Gateau
a98d861600 Merge pull request #11242 from SamGondelman/tabletLayer2 
Web overlays and entities are always non anti-aliased
 2017-08-28 09:10:14 -07:00
vladest
38295ab73f Merge conflicts 2017-08-28 16:58:30 +02:00
Dante Ruiz
0eceb7b382 unviersial web3d vs laser 2017-08-25 17:40:30 -07:00
Zach Fox
a03f9592c1 Inventory to Purchases 2017-08-25 16:34:48 -07:00
Zach Fox
d19377d2d4 Saving 2017-08-25 15:56:30 -07:00
Dante Ruiz
a5508c9f75 Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1 2017-08-25 14:21:01 -07:00
Dante Ruiz
b3ffa7b6b4 Working laser vs tablet 2017-08-25 14:20:31 -07:00
Zach Fox
e606e3dfb3 Squashed commit of the following: 
commit 453897b9e2
Author: Zach Fox <fox@highfidelity.io>
Date:   Fri Aug 25 10:56:53 2017 -0700

    Huge cleanup!
 2017-08-25 11:45:37 -07:00
Zach Fox
453897b9e2 Huge cleanup! 2017-08-25 10:56:53 -07:00
Dante Ruiz
fa676aaadf lasers on tablet working 2017-08-24 17:42:27 -07:00
Zach Fox
3980a478d9 Only show 'buy' on costed items' 2017-08-24 16:38:44 -07:00
Zach Fox
e2c74d8b88 Initial progress 2017-08-24 15:22:30 -07:00
SamGondelman
4a49801217 web overlays and entities are always nonAA 2017-08-24 14:23:21 -07:00
Dante Ruiz
eb6248400c Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1 2017-08-24 13:41:54 -07:00
David Rowe
2159d309e2 Merge branch 'master' into vr-edit-a 2017-08-25 08:36:22 +12:00
David Kelly
eb9436ba96 Merge pull request #11235 from davidkelly/dk/encryptFile 
Initial wallet app plus some encryption of security image
 2017-08-24 13:17:14 -07:00
Menithal
e47dfeaeab Merge remote-tracking branch 'upstream/stable' into 21484 2017-08-24 21:37:20 +03:00
Brad Hefta-Gaub
5c832eae9c Merge pull request #11226 from SamGondelman/miceWithLasers 
EntityTreeRender uses RayPick API with precision picking
 2017-08-24 08:10:21 -07:00
Dante Ruiz
dbe8aa77d7 working on laser v tablet 2017-08-23 17:32:41 -07:00
Zach Fox
e815946744 Merge pull request #11231 from ElderOrb/Case5830 
5830: Go-To menu shows up blank except for address bar
 2017-08-23 14:33:04 -07:00
beholder
9cd784990c 5830: Go-To menu shows up blank except for address bar 2017-08-23 23:27:02 +03:00
Zach Fox
a489267cec Hide behind switch and remove dead code 2017-08-23 10:48:47 -07:00
SamGondelman
d7b3686364 include noncollidable entities 2017-08-22 17:37:51 -07:00
Dante Ruiz
dc8d0c9604 disable far grab when on hud 2017-08-22 16:51:13 -07:00
Zach Fox
4d8980b538 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_walletApp 2017-08-22 12:30:24 -07:00
Zach Fox
f1da7a6381 Checkpoint 2017-08-22 11:53:37 -07:00
Anthony J. Thibault
d62a0ea8ff Correct controller offsets with sensor scaling 2017-08-22 11:43:39 -07:00
vladest
b7a048c6ea Adopt clonable settings to new styling 2017-08-22 11:23:55 -07:00
Dante Ruiz
cdd184e32d intergradted teleport 2017-08-22 11:06:11 -07:00
Dante Ruiz
f6151fae85 slowly intergrating teleport.js 2017-08-21 16:53:28 -07:00
Dante Ruiz
94dc942d79 Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1 2017-08-21 16:34:10 -07:00
Chris Collins
a85022bb93 Merge pull request #11216 from MidnightRift/emitterShouldTrail 
Change emitShouldTrail to emitterShouldTrail.
 2017-08-21 15:29:05 -07:00
David Rowe
cddb054066 Merge branch 'master' into vr-edit-h 
# Conflicts:
#	libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp
#	scripts/system/controllers/handControllerGrab.js
 2017-08-20 18:41:29 +12:00
Zach Fox
512a08f67f Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_walletApp 2017-08-18 17:05:56 -07:00
Howard Stearns
188cbee781 Merge pull request #11212 from howard-stearns/asynchronous-commerce-2 
Asynchronous Ledger Interactions with Server
 2017-08-18 15:40:24 -07:00
anshuman64
a7090c7e07 Merge pull request #11211 from vladest/edit_clonable_lost 
Adopt cloneable settings to new styling
 2017-08-18 15:37:37 -07:00
Midnight
5f162c0352 Change emitShouldTrail to emitterShouldTrail. 2017-08-18 15:10:58 -07:00
Elisa Lupin-Jimenez
44f1f340e1 Merge pull request #11147 from elisa-lj11/blocks 
Adding Blocks Tablet App to Marketplace
 2017-08-18 15:06:18 -07:00
Zach Fox
9636fad679 Updates from wireframes 2017-08-18 13:45:30 -07:00
Dante Ruiz
8d04047d8a starting to integrate teleport.js 2017-08-18 13:23:44 -07:00
Sam Gondelman
cbf2bb3a61 Merge pull request #10980 from SamGondelman/sharks 
Reduce laser pointer lag
 2017-08-18 13:14:38 -07:00
vladest
d29d4b5016 Adopt clonable settings to new styling 2017-08-18 21:44:44 +02:00
SamGondelman
c9f4958925 handControllerGrab fix, maybe, hopefully 2017-08-18 10:39:40 -07:00
howard-stearns
6e34ab45d6 Merge branch 'master' of https://github.com/highfidelity/hifi into asynchronous-commerce-2 2017-08-18 10:03:33 -07:00
howard-stearns
3d401129fb checkpoint 2017-08-18 10:03:00 -07:00
Zach Fox
d052b49a54 Login and picture selection done 2017-08-17 16:34:33 -07:00
Zach Fox
5f69f30551 MOAR PROGRESS 2017-08-17 16:20:50 -07:00
Zach Fox
9135e37078 Go go go go gog o 2017-08-17 15:20:17 -07:00
Zach Fox
eab16fc28c Initial progress 2017-08-17 15:01:25 -07:00
Menithal
dc5e374485 Merge remote-tracking branch 'upstream/master' into 21484 2017-08-17 22:28:43 +03:00
Elisa Lupin-Jimenez
2b44608ece Merge branch 'master' of https://github.com/highfidelity/hifi into blocks 2017-08-17 10:18:40 -07:00
Elisa Lupin-Jimenez
4b1498f727 moved blocksApp.js to unpublished scripts, added icon 2017-08-17 10:18:29 -07:00
Artur Gomes
e8fea16449 Fix for line points disappearing on second client (trying new value to 
see if the line replicates correctly)
 2017-08-17 17:19:13 +01:00
Artur Gomes
e59ff51cdd Fixed two icons showing up when picking a color from the color table or 
from the custom colors.
 2017-08-17 16:25:33 +01:00
Artur Gomes
321742a865 Fix for points disappearing on second client (the one that's not 
drawing) (trying to limit it a bit more to see if it results in no loss
at all)
 2017-08-17 16:01:53 +01:00
Artur Gomes
2835130515 Fix dynamic hue not cycling through all the 360 hue values when drawing 
the line due to the change in the max size of the line.
 2017-08-17 15:53:13 +01:00
Artur Gomes
4f5bfcbc2b Merge remote-tracking branch 'upstream/master' 2017-08-17 14:57:31 +01:00
Artur Gomes
be35734074 Fix tablet not reopening after removing headset and putting it back on. 2017-08-17 14:56:29 +01:00
Artur Gomes
5e6e675f62 Replace stars brush. 2017-08-17 09:45:54 +01:00
Chris Collins
9c9bcd80b8 Merge pull request #11191 from SamGondelman/logging 
Miscellaneous logging fixes
 2017-08-16 15:46:32 -07:00
vladest
15f8bc0141 Keep old function names for compatibility 2017-08-16 22:17:34 +02:00
druiz17
8eabf46a30 Merge pull request #11165 from 1P-Cusack/FogBugz/Case_6491_Part1 
[Case 6491] Part 1 of entitySelectionTool clean up
 2017-08-16 13:05:27 -07:00
Artur Gomes
8ef8e974b6 Merge remote-tracking branch 'upstream/master' 2017-08-16 21:00:29 +01:00
Artur Gomes
030877457b Fix tablet not opening. 
Fix headers not showing correctly since changes in editProperties page.
 2017-08-16 20:59:09 +01:00
vladest
4e5c650621 Modified some usecases for async dialogs 2017-08-16 21:41:18 +02:00
LaShonda Hopper
cc2ff565ac [Case 6491] Ran lint on entitySelectionTool.js (details below). 
Prior Issue Count: 35
Current Issue Count: 3

Resolved:
* 17 used out of scope issues.
* 11 already defined issues.
* 2 missing semicolon issues.
* 1 implicit comparison against null issue.
* 1 readability warning.

Remaining Issues as of this commit:
* scripts/system/libraries/entitySelectionTool.js: line 17, col 1, Read only.
** HIFI_PUBLIC_BUCKET assignment
* scripts/system/libraries/entitySelectionTool.js: line 19, col 1, Read only.
** SPACE_WORLD assignment
* scripts/system/libraries/entitySelectionTool.js: line 30, col 1, Read only.
** SelectionManager assignment

One notable item was a chunk of code from makeStretchTool's onMove
function which wasn't in scope of the vars being utilized.

Changes Committed:
	modified:   scripts/system/libraries/entitySelectionTool.js
 2017-08-16 15:21:30 -04:00
Artur Gomes
d4255928c7 Add sections to brushes tab. 
Add preview of special effects.
Fix polyline poinst disappearing (using 48 points for now as a quick
fix)
Fix dynamic saturation and brightness effect being to strong.
 2017-08-16 18:35:23 +01:00
Artur Gomes
3ddddf4ad6 Fix animated hue not working even though the checkbox was checked after 
restarting the interface.
 2017-08-16 18:35:23 +01:00
Artur Gomes
270d41fabf Fix animation flickering caused on multiplayer because both users 
where using the script to update the color and the color was also being
replicated.
 2017-08-16 18:35:23 +01:00
Artur Gomes
ca37c5ee94 Fix desktop drawing mode creating more than one entity in an unusual way. 2017-08-16 18:35:22 +01:00
Artur Gomes
fb696bcbac Fix settings not being correctly restored when reloading tablet (when 
using desktop mode and right clicking over the tablet + refresh)
Remove postMessage in favour of emitWebEvent to communicate between the
tabs and the main script.
 2017-08-16 18:35:22 +01:00
Artur Gomes
b41ef08428 Fix tablet loosing focus (from the drawing hand) when switching hands. 2017-08-16 18:35:22 +01:00
Artur Gomes
482924266c Fix brush texture stretching at start. 
Add some code refactoring.
 2017-08-16 18:35:21 +01:00
Artur Gomes
07416951e5 Did clean up of the code and unused files. 2017-08-16 18:35:21 +01:00
Artur Gomes
83cdd1739d Add hue, saturation and brightness dynamic brushes. 
Add continuous drawing mode.
Add new brushes.
Remove some brushes.
Fix animation play distance for when painting in Desktop mode.
Fix Hue animation not starting from the chosen color (would always start
from red).
Fix multiple color polyline.
 2017-08-16 18:35:15 +01:00
Artur Gomes
03b70ed492 Do not test! 
Add color qvector to polyline entity to allow for multiple colors
through the line.
Add some new icons to the tabs of the app.
 2017-08-16 18:32:17 +01:00
Artur Gomes
108c02d05e Fix Desktop painting weird behaviour when painting (painting surface not 
always facing the user, this happened because of the change of the
paint surface direction on the last commit)

Fix brush tint (was just changing color in the last commit, now is
blending with the brush, using a kind of luminance blend effect)

Remove unecessary files.
 2017-08-16 18:28:59 +01:00
Artur Gomes
2d2efab5ed Fix paint surface always facing the HMD instead of rotating with the 
brush/hand;
 2017-08-16 18:28:58 +01:00
Artur Gomes
6e4ad996af Make savedSettings variable null after it is used, since it is probably 
a cause for a big memory leak.
 2017-08-16 18:28:58 +01:00
Artur Gomes
130ed238a5 Add restore tablet state after removing and putting back the headset. 
Update max line width;
Remove erase tab in favor of a single undo button in the tabs bar;
Add background color to brushes (using the same as the stroke color so
the user can preview the stroke with the color);
Add padding between custom color picker and preset colors table.
 2017-08-16 18:28:58 +01:00
Artur Gomes
c477b50272 Fix brush weird behaviour when starting with clean settings (brush would 
be black and filled instead of appliying the correct texture with color)
 2017-08-16 18:28:57 +01:00
Artur Gomes
ae078f4689 Add Avatar dominant hand as default hand the first time the user starts 
fingerpaint app or when the settings for the app are deleted.
Add some checks to fix an non critical error (when trying to reset the
left/right hands and they were not yet initialized)
 2017-08-16 18:28:57 +01:00
Artur Gomes
c65010669b Move line width widget from the palette tab to the brushes tab. 2017-08-16 18:28:57 +01:00
Artur Gomes
91a6f2c8d9 Add undo for created Entities in order to be able to remove entities 
when drawing in desktop mode.
Fix keyboard not showing.
Fix app button not being deactivated when switching to another app.
 2017-08-16 18:28:56 +01:00
Artur Gomes
c94774ec18 Add Keyboard when input fields get focus in the palette tab. 
Add feedback when user picks a color from the table or from the set
custom colors.
Fix hand hovering tablet when entering the app (stopped working after
restoring brush values).
 2017-08-16 18:28:56 +01:00
Artur Gomes
5c40a6810e Add drawing in Desktop mode. 
Remove dynamic rotation and translation brushes since the movement would
be unsynced after a while, resulting in a poor user experience.
Fix restoring last used settings taking to long, which caused the user
to see the values to change after the tablet application was open.
Fix using a different brush after restarting the app, if drawing before
the brush was reset.
 2017-08-16 18:28:55 +01:00
Artur Gomes
dffbc442be Add new Interface (more similar to the ui used on other apps) 
Fix brush on repeat mode (keeps the the aspect ratio of the texture)
 2017-08-16 18:28:55 +01:00
Artur Gomes
9d35cdcda3 Add save and restore last user settings; 
Fix multiple dynamic brushes not working in some cases (mixing axis
would not work neither for rotation nor for translation);
Fix tablet hovering detection only working for right hand;
 2017-08-16 18:28:55 +01:00
Artur Gomes
c8d475dff1 Add new dynamic and colored brushes. 
- Add dynamic hue brush;
- Add dynamic (animated) rotation and translation brush;
- Add colored brushes that already have the colors set (user can't
change it);
 2017-08-16 18:25:03 +01:00
Artur Gomes
b6ccce3904 Add new brushes (In progress) 2017-08-16 18:25:03 +01:00
Artur Gomes
69a532ea45 Fix application button not resetting state after exiting the app. 
Fix hovering tablet detection not working before unhovering the tablet.
Fix finger closing and opening while hovering the tablet and drawing.
 2017-08-16 18:25:02 +01:00
Artur Gomes
b6beb2033f Switch between stylus and fingerpaint mode when not painting and hand 
hovers the tablet.
Replace OK button in color picker with Add button (allows user to add custom
colors, and enables user to pick color just by pressing on top of the
color picker);
 2017-08-16 18:25:02 +01:00
Artur Gomes
9309f5137a Add tablet application to replicate the existing overlay interface that 
uses qml.
Add last user picked colors using the custom color picker so that users can easily reuse that color.
 2017-08-16 18:25:02 +01:00
Delanir
3d8951a5e0 Replace Paint Source Entity by Overlay 2017-08-16 18:25:01 +01:00
Delanir
066598fe3f Add Support to different UV modes in the finger paint script and deactivate "paint hand" 2017-08-16 18:25:01 +01:00
Delanir
faf57f068c Override hand animation for finger paint. 
Paint hand stays in a pointing position while in paint mode.
 2017-08-16 18:25:00 +01:00
Delanir
59719a13b6 Move fingerPaint folder into "scripts/system" and add fingerPaint script to DEFAULT_SCRIPTS_SEPARATE 2017-08-16 18:23:04 +01:00
SamGondelman
86cc938a47 Merge remote-tracking branch 'upstream/master' into sharks 2017-08-16 09:54:12 -07:00
Dante Ruiz
e48c14ec23 fixed tablet spawn position for oculus menu button 2017-08-16 09:08:55 -07:00
David Rowe
f1fe3be1f4 Merge branch 'master' into vr-edit-a 2017-08-17 00:13:08 +12:00
Seth Alves
3082c357f9 cloning sort-of works... cloning an equipable doesn't 2017-08-15 17:54:04 -07:00
Seth Alves
4bfbab294d near-trigger works? 2017-08-15 14:53:58 -07:00
Seth Alves
03977334a0 near-trigger works? 2017-08-15 14:50:39 -07:00
Seth Alves
3b61e8518f near-trigger works? equip calls its entity methods now 2017-08-15 14:46:48 -07:00
Seth Alves
ddca25672f trying to get near-triggering working 2017-08-15 14:14:28 -07:00
vladest
273261ee57 Reworked WindowScriptingInterface browse method for async methods 2017-08-15 23:12:35 +02:00
vladest
8afdb27c1b Reworked WindowScriptingInterface save method for async methods 2017-08-15 22:55:44 +02:00
Zach Fox
b7282cc776 Lots of fixes 2017-08-15 13:46:20 -07:00
Seth Alves
1d24523be9 equip drop gesture works 2017-08-15 13:09:17 -07:00
Seth Alves
e6ac07d43d equipping mostly works 2017-08-15 11:45:45 -07:00
Zach Fox
bddce9328b V1 2017-08-15 11:08:03 -07:00
Seth Alves
b2d7eefc97 equip highlight works now 2017-08-15 10:30:47 -07:00
Elisa Lupin-Jimenez
3d7995da34 Merge branch 'master' of https://github.com/highfidelity/hifi into blocks 2017-08-15 10:01:24 -07:00
Seth Alves
774cb33303 Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1 2017-08-15 09:17:52 -07:00
vladest
e9ed05c3ba Reimplement snapshot dir browser for async 2017-08-15 15:55:36 +02:00
Seth Alves
b52a406ff1 trying to get equipping working 2017-08-14 18:25:57 -07:00
SamGondelman
1c27335193 a couple logging fixes 2017-08-14 17:34:32 -07:00
Seth Alves
13424eb792 kinematic-grab defaults to true 2017-08-13 17:42:08 -07:00
Seth Alves
9015d69c71 fix pop at start of far-grab 2017-08-13 17:21:55 -07:00
Seth Alves
f10dc7cbd5 allow far to near-grab transition 2017-08-13 16:54:37 -07:00
Seth Alves
58b199e9f9 far-grab sort-of works 2017-08-13 15:54:03 -07:00
Seth Alves
c2861d29d2 trying to get highlighting to work 2017-08-13 13:49:17 -07:00
Seth Alves
327bc23b5c get ready for highlighting 2017-08-13 11:41:12 -07:00
Seth Alves
e7437d66ef if a raypick hits something that's very close, put it into the nearby-entities list 2017-08-12 17:49:02 -07:00
Seth Alves
ec93172676 far-search rays work, but nothing else about far-grab. 2017-08-12 17:27:48 -07:00
Seth Alves
505b564c62 sort plugins isReady calls by plugin priority. hook up pickrays in data-gathering phase 2017-08-12 13:14:00 -07:00
Seth Alves
92cb1c9bf2 Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1 2017-08-12 12:40:18 -07:00
Seth Alves
9fb1835a26 grabbing overlays works, again 2017-08-12 12:38:36 -07:00
Seth Alves
7ae41064db tablet stylus works again 2017-08-12 11:19:39 -07:00
Zach Fox
c38837c200 Remove fixmes 2017-08-11 16:21:39 -07:00
Zach Fox
a21ff75a49 Big progress! 2017-08-11 12:54:55 -07:00
Seth Alves
b4a54b017a plugins occupy activity-slots and more than one plugin may run at a time, as long as their slots aren't in conflict 2017-08-11 12:15:41 -07:00
Zach Fox
080c6da71a Get HFC balance from QmlCommerce API 2017-08-11 10:49:11 -07:00
Zach Fox
d2362e6329 addInventoryButton() under setting 2017-08-11 10:31:32 -07:00
Zach Fox
e1064938cd Add inventory; also fix some bugs 2017-08-11 10:31:32 -07:00
Seth Alves
128be5c2c1 Merge branch 'sharks' of github.com:SamGondelman/hifi into controller-dispatcher-1 2017-08-11 08:52:47 -07:00
David Rowe
401a00441a Merge branch 'master' into vr-edit-a 2017-08-11 15:26:20 +12:00
Elisa Lupin-Jimenez
da5bb03187 Trying to add in a back button 2017-08-10 16:34:37 -07:00
SamGondelman
4c55849290 merge from master 2017-08-10 15:43:23 -07:00
Elisa Lupin-Jimenez
28476960bb Moved Blocks to tablet app 2017-08-10 14:23:45 -07:00
howard-stearns
ca13d58b0b blance and inventory stubs 2017-08-10 12:44:50 -07:00
Seth Alves
0d0f147056 port action-near-grab to dispatcher 2017-08-09 17:48:35 -07:00
Elisa Lupin-Jimenez
d3c76c99c2 See all markets button working again 2017-08-09 17:28:05 -07:00
Elisa Lupin-Jimenez
69a13052ab commented out blocks injection 2017-08-09 17:23:08 -07:00
Zach Fox
2d256a62a9 Fix marketplaces message passing 2017-08-09 17:04:36 -07:00
Elisa Lupin-Jimenez
74c90d6323 minor typo 2017-08-09 16:08:47 -07:00
Elisa Lupin-Jimenez
a2e407f786 fixed merge conflicts in marketplacesInject.js 2017-08-09 15:59:20 -07:00
Seth Alves
5e3b573d19 Merge branch 'sharks' of github.com:SamGondelman/hifi into controller-dispatcher 2017-08-09 14:08:07 -07:00
Seth Alves
2c8aac53cd Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher 2017-08-09 14:05:49 -07:00
Zach Fox
65f9b0052f Working buy button 2017-08-09 13:59:21 -07:00
Sam Gondelman
85c3f94976 Merge branch 'master' into sharks 2017-08-09 13:36:18 -07:00
Howard Stearns
cc634a2d1b Merge pull request #11148 from zfox23/commerce_singleSetting 
New commerce mode now depends on 1 setting; bugfixes; Tablet -> TAB key
 2017-08-09 13:25:10 -07:00
SamGondelman
6157f4fa55 script fixes 2017-08-09 11:56:25 -07:00
howard-stearns
1cf81495ab basic commerce infrastructure 2017-08-09 11:50:52 -07:00
Zach Fox
33fa8c4f86 Fix bugs and also change to single setting 2017-08-09 11:44:09 -07:00
Zach Fox
61526256bc Remove personalized comment 2017-08-09 09:30:18 -07:00
LaShonda Hopper
48e327815d [Case 6491] Resolves arg order to centerToZero and centerToIntersection vectors. 
Changes Committed:
	modified:   scripts/system/libraries/entitySelectionTool.js
 2017-08-09 11:38:44 -04:00
Elisa Lupin-Jimenez
d599753771 Started blocks download catch, fixed a debug typo 2017-08-08 18:43:35 -07:00
Zach Fox
9d60d5153f Clarifying comment and turn setting off first 2017-08-08 18:00:17 -07:00
Zach Fox
4f85923517 Tons of fixes and improvements! 2017-08-08 17:58:41 -07:00
Zach Fox
b2c5a1f899 Fancy MutationObserver! 2017-08-08 17:12:06 -07:00
Elisa Lupin-Jimenez
efd25a5e70 Merge branch 'master' of https://github.com/highfidelity/hifi into blocks 2017-08-08 16:55:10 -07:00
Zach Fox
871a5ff1ab Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_CheckoutQMLInvestigation 2017-08-08 15:53:22 -07:00
Zach Fox
69fc69cffb Comment fix and overlay click fix 2017-08-08 15:52:59 -07:00
Andrew Meadows
71ba6ba10a Merge pull request #10807 from jmo7/21356 
21356 - Reorder Edit.js
 2017-08-08 15:15:37 -07:00
Zach Fox
7d26d2d88b Switch and fix overlay clicks 2017-08-08 14:29:44 -07:00
Menithal
982d4a451f Updated Protocol to add allowTranslation 
There still is a bug for the value no actually updating
 2017-08-08 23:47:37 +03:00
Elisa Lupin-Jimenez
1102b27ba1 Fixed merge conflicts with master 2017-08-08 11:47:08 -07:00
SamGondelman
684001a756 workaround deadlock in editRenderState 2017-08-08 11:11:19 -07:00
David Rowe
f88191b7b3 Merge branch 'master' into vr-edit-a 2017-08-08 16:43:20 +12:00
Zach Fox
1493a310af Beginning of stack stuff 2017-08-07 17:02:24 -07:00
Zach Fox
7e922cb2c2 Layout 2017-08-07 16:16:17 -07:00
Zach Fox
517128a939 More steps 2017-08-07 16:03:42 -07:00
Zach Fox
d7dd331685 Bugfixes 2017-08-07 14:39:31 -07:00
Zach Fox
7d4fd995f2 First steps 2017-08-07 14:29:47 -07:00
SamGondelman
489e08aef0 Merge branch 'master' of https://github.com/highfidelity/hifi into sharks 2017-08-07 13:29:00 -07:00
Dante Ruiz
38db4a6f47 fixed create spinner not appearing 2017-08-07 20:03:55 +01:00