David Rowe
6095a90e69
Don't display default lasers when Shapes app is active
2018-01-04 21:09:38 +13:00
David Rowe
6c16fcfe65
Fix tablet laser when Shapes app is running
2018-01-04 16:37:20 +13:00
David Rowe
7236ac17e2
Merge branch 'master' into 21661
2018-01-04 15:21:00 +13:00
David Rowe
efa6f1f02f
Use "Prefer Stylus Over Laser" setting
2018-01-04 15:00:17 +13:00
Zach Fox
ff4f582c7d
Thanks Howard
2018-01-03 17:23:35 -08:00
Zach Fox
8d4a6f01cb
Fix bugs related to inspecting entities with hand controllers
2018-01-03 16:03:37 -08:00
David Rowe
6e43497e14
Merge tag 'RELEASE-7602' into 21661
...
Jenkins Git plugin tagging with RELEASE-7602
2018-01-03 16:46:10 +13:00
Zach Fox
917db14879
Add a link to My Purchases from Wallet Home
2018-01-02 15:26:11 -08:00
Zach Fox
47a209dc4c
Make things slightly better?
2018-01-02 13:11:00 -08:00
Zach Fox
25e76c668b
Fix marketplacesInject.js for local Metaverse
2018-01-02 12:22:40 -08:00
Nissim Hadar
7260b4ff7b
Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance
...
# Conflicts:
# libraries/entities/src/EntityPropertyFlags.h
2017-12-29 15:16:14 -08:00
Nissim Hadar
87e896ab20
Zone inheritance ready for testing.
2017-12-29 15:13:46 -08:00
luiscuenca
47dbb0c168
load script manually
2017-12-29 15:35:44 -07:00
luiscuenca
49bd62ca29
Touch feeling for near grab
2017-12-29 14:04:36 -07:00
Nissim Hadar
0e76d481a1
Completed the use of radio-buttons to hide disabled sections.
2017-12-29 08:28:31 -08:00
Nissim Hadar
a6f3401d0e
Removed background combo.
2017-12-29 08:15:34 -08:00
Nissim Hadar
64644fc980
WIP - skybox inheritance
2017-12-28 14:31:59 -08:00
Nissim Hadar
8bb4d1431c
WIP - copy skylight URL to ambient URL.
2017-12-28 09:35:40 -08:00
Nissim Hadar
4ffd896ced
WIP - adding AmbientLightPropertyGroup
2017-12-26 11:15:33 -08:00
Nissim Hadar
3f82e9147b
Change keylight/ambient mode default from "enabled" to "inherit"
2017-12-22 16:30:19 -08:00
Nissim Hadar
8ee5f642a9
Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance
...
# Conflicts:
# libraries/networking/src/udt/PacketHeaders.cpp
# libraries/networking/src/udt/PacketHeaders.h
2017-12-22 15:41:59 -08:00
Seth Alves
96197e66bb
Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3
2017-12-22 15:13:02 -08:00
Nissim Hadar
2eb74647f0
Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance
2017-12-22 08:05:46 -08:00
Seth Alves
897b96d092
Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3
2017-12-22 07:36:26 -08:00
Zach Fox
618e5c9032
Commerce Data Tracking: Iteration 3 (Purchases)
2017-12-21 15:46:01 -08:00
Nissim Hadar
58c6f8e9c4
Radio buttons now work correctly.
2017-12-20 19:17:18 -08:00
Nissim Hadar
4e59fecae2
Added keylight and ambient light mode radio-buttons to the html (the UI).
2017-12-20 10:24:51 -08:00
Zach Fox
08edc52932
Merge pull request #12025 from zfox23/commerce_fixWalletSetupCancel
...
Commerce: Fix the behavior of the 'cancel' button in Wallet Setup
2017-12-20 09:18:10 -08:00
Zach Fox
297a3df63c
Merge pull request #11815 from zfox23/commerce_QmlWhitelist
...
QML Whitelisting + Commerce Integration
2017-12-19 18:07:14 -08:00
Zach Fox
a72ed27a25
CR feedback
2017-12-19 16:57:48 -08:00
Zach Fox
5da49d156e
Commerce: Fix the behavior of the 'cancel' button in Wallet Setup
2017-12-19 16:26:58 -08:00
Zach Fox
ed5da4f83b
Fix bug preventing 'get' buttons from working in marketplace
2017-12-19 15:07:50 -08:00
Zach Fox
18d5be147c
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist
2017-12-19 09:48:15 -08:00
David Kelly
4fc69f8067
Merge pull request #11988 from davidkelly/dk/soldOut
...
Handle sold out items a bit better
2017-12-19 07:43:57 -07:00
Brad Davis
2fcf11455b
Fixing edit state detection
2017-12-18 14:03:13 -08:00
Daniela Fontes
b392bafc5a
Merge Case 10632 and 10633.
2017-12-18 21:12:18 +00:00
Daniela Fontes
9381d21767
Merge branch 'Case10632' into Case10633
2017-12-18 21:08:30 +00:00
Brad Davis
9f7b6f543d
Merge remote-tracking branch 'upstream/master' into HEAD
2017-12-18 11:17:07 -08:00
Artur Gomes
80898d9336
Fix sections styling for Particle Explorer tab.
2017-12-18 18:36:32 +00:00
Daniela Fontes
fcdb9b6cbe
Particle Emitter 'Show Properties' button now changes to 'Hide Properties' when properties are already visible
2017-12-18 15:21:23 +00:00
David Rowe
5e19410293
Fix handshake satyhing on when release "x" if Ctrl or similar pressed
2017-12-17 15:23:40 +13:00
Brad Hefta-Gaub
95bfacb850
Merge pull request #11977 from ctrlaltdavid/21643
...
Enable user connection with "x" key when capslock is on
2017-12-15 15:22:00 -08:00
Brad Hefta-Gaub
6aebfd61c5
Merge pull request #11999 from luiscuenca/laserScaleFix
...
Make lasers scale with avatar
2017-12-15 15:21:01 -08:00
luiscuenca
53e1c57e3b
Make lasers scale with avatar
2017-12-15 13:46:15 -07:00
Zach Fox
94bd8d8673
Merge pull request #11991 from zfox23/commerce_fixBrokenBuyButtons
...
Fix broken Buy buttons on main Marketplace page
2017-12-14 12:48:09 -08:00
Zach Fox
74a5f0881f
Fix broken Buy buttons on Marketplace
2017-12-14 11:56:36 -08:00
David Kelly
a49ee46f54
Handle sold out items a bit better
2017-12-14 11:52:56 -07:00
Zach Fox
3764445272
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist
2017-12-13 14:12:08 -08:00
David Rowe
627ce8ab87
Enable user connection with "x" key when capslock is on
2017-12-14 08:52:21 +13:00
Brad Hefta-Gaub
9bbe696a87
Merge pull request #11971 from sethalves/possible-fix-for-tablet-freezing
...
possible fix for tablet freezing
2017-12-13 08:59:17 -08:00
Seth Alves
3a00d31c15
oops
2017-12-12 12:59:35 -08:00
Seth Alves
dba05ae8e2
try harder to keep setTimeout loop going in controller-dispatcher
2017-12-12 12:38:01 -08:00
David Rowe
25214aad23
Code review
2017-12-13 08:56:36 +13:00
David Rowe
380cd7aac6
Tune particle effects to be similar to before
2017-12-12 17:35:37 +13:00
David Rowe
4327906630
Reduce communications load when making a user connection
2017-12-12 16:39:49 +13:00
Seth Alves
2cd64ccd2c
merge from upstream
2017-12-11 10:14:30 -08:00
Zach Fox
b81cdf49ef
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist
2017-12-11 09:52:32 -08:00
Zach Fox
b5899f7a00
Merge pull request #11957 from zfox23/commerce_fixEditDependencies
...
Further remove dependencies of marketplaces.js on edit.js
2017-12-08 16:48:37 -08:00
Dante Ruiz
f4a9acab92
Merge pull request #11833 from druiz17/controllerDispatcher-interval
...
change controllerDispatcher to setTimeOut update
2017-12-08 16:36:46 -08:00
Zach Fox
a99072622a
Fix Create mode :|
2017-12-08 15:41:47 -08:00
Zach Fox
be737af79d
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_fixEditDependencies
2017-12-08 14:08:35 -08:00
Zach Fox
a81a981676
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist
2017-12-08 09:44:52 -08:00
Seth Alves
edd6c0ee76
Merge branch 'scale-wearables-with-avatar-3' of github.com:sethalves/hifi into scale-wearables-with-avatar-3
2017-12-08 07:19:45 -08:00
Seth Alves
d095d4ef44
Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3
2017-12-08 07:19:33 -08:00
Seth Alves
a7a6dee8e0
Merge pull request #11950 from hyperlogic/bug-fix/hand-scaling
...
Fix for hand controller avatar scaling.
2017-12-08 07:17:59 -08:00
Seth Alves
86a1bc75c9
Merge pull request #11897 from Delanir/Gizmos
...
IPD Secondary Task List: edit.js arrow orientation: Yaw, Pitch, Roll tools
2017-12-08 07:09:09 -08:00
Seth Alves
dfbd6bcd8d
Merge pull request #11933 from druiz17/fix-far-to-equip
...
fix far grab to equip transition
2017-12-08 07:04:54 -08:00
Seth Alves
a6a45bc359
Merge pull request #11936 from ElderOrb/FB10108
...
10108 marketplace category cannot scroll
2017-12-08 07:02:15 -08:00
Seth Alves
4659d22021
work around a crash when closing CREATE
2017-12-07 21:32:18 -08:00
Seth Alves
c4b2422f53
Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3
2017-12-07 19:40:52 -08:00
MandatoryMania
f1808ee126
Merge pull request #11943 from MandatoryMania/returnToMarketplace
...
return to main mktplace page from rez page
2017-12-07 19:14:37 -08:00
Anthony J. Thibault
542af47e9e
Fix for hand controller avatar scaling.
...
* Added getDomainMaxScale() and getDomainMinScale() to JS api.
* Updated scaleAvatar controller module to use this to prevent scaling past the limits.
* Made sure that getDomainMaxScale() getDomainMinScale() and getUnscaledEyeHeight are thread safe,
so that they can be invoked on the script thread.
* Added signals to Model class that can be used to let observers know when the Rig has finished initializing it's skeleton.
and also when the skeleton is no longer valid. These hooks are used to cache the unscaled eye height of the avatar.
2017-12-07 17:08:13 -08:00
Seth Alves
40412b80c6
Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3
2017-12-07 17:03:04 -08:00
Dante Ruiz
0286f4646a
Merge branch 'master' of github.com:highfidelity/hifi into controllerDispatcher-interval
2017-12-07 16:19:03 -08:00
Sam Gondelman
b05e1f8a32
Merge pull request #11847 from SamGondelman/overlayFlash
...
Cleanup Web3DOverlay and tablet home button
2017-12-07 14:06:56 -08:00
Dante Ruiz
4110295677
Merge branch 'master' of github.com:highfidelity/hifi into fix-far-to-equip
2017-12-07 13:42:26 -08:00
H Q
72ed3b077d
Addressed PR change requests
2017-12-07 11:28:40 -08:00
Zach Fox
b2bafed2bb
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist
2017-12-07 11:21:24 -08:00
Brad Hefta-Gaub
88ed15aaaa
Merge pull request #11942 from ctrlaltdavid/21633
...
Fix image overlay's subImage property's width and height support
2017-12-07 09:19:43 -08:00
Brad Hefta-Gaub
b91909011a
Merge pull request #11914 from 1P-Cusack/FogBugz/Case_7049
...
[Case 7049]: Remove unused fields and checkboxes from Edit.js
2017-12-07 09:18:26 -08:00
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