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
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
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
druiz17
fc41155ce1
saving work
2017-10-10 09:17:01 -07:00
Zach Fox
733df8391f
Round 2
2017-10-09 12:27:56 -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
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
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
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
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
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
Brad Hefta-Gaub
a1979a2600
Merge branch 'master' into RC-56
2017-10-03 18:16:21 -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
Howard Stearns
22f0ef33ed
Merge pull request #11496 from howard-stearns/certificate-properties
...
Certificate properties
2017-10-03 10:06:48 -07: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
