Sam Gateau
02bcbe6d5f
Merge pull request #11512 from AndrewMeadows/more-profile-details
...
expose performance hot spot in stats details
2017-10-04 18:34:19 -07: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
Clément Brisset
c43deabe88
Merge pull request #11502 from misslivirose/fix/demo-ac
...
Updating placeholder.js to use a url that points to example scripts
2017-10-04 17:33:53 -07:00
SamGondelman
3a6e84e681
trying to fix model issue
2017-10-04 17:26:12 -07: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
Chris Collins
e5405ef5df
Merge pull request #11525 from SamGondelman/models
...
Try to improve performance without messing up model loading
2017-10-04 16:42:51 -07:00
Zach Fox
9d51d40af4
Merge pull request #11489 from vladest/login_dialog_rework
...
Login dialog rework
2017-10-04 15:47:44 -07:00
David Rowe
63e7521711
Merge branch 'master' into vr-edit-a
2017-10-05 11:29:49 +13:00
Atlante45
f8aa3d72de
Update macOS build guide
2017-10-04 15:21:52 -07: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
Clément Brisset
8dd00e80ac
Merge pull request #11334 from NickShaffner/patch-1
...
brew tap homebrew/versions no longer works. (or is needed)
2017-10-04 14:41:45 -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
SamGondelman
215193ad90
try to improve performance
...
(cherry picked from commit a5f5f9fc5d
2017-10-04 13:50:35 -07:00
samcake
d773b40a63
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2017-10-04 13:25:14 -07:00
SamGondelman
a5f5f9fc5d
try to improve performance
2017-10-04 12:05:13 -07:00
Andrew Meadows
e3ea013d5f
Merge pull request #11518 from SamGondelman/avatarRay
...
Fix calling AvatarManager.findRayIntersection() from script
2017-10-04 12:04:30 -07:00
Zach Fox
0f9df93097
Merge pull request #11524 from zfox23/commerce_fixBuyingFreeItems
...
Fix buying free items using Commerce system
2017-10-04 11:59:40 -07:00
SamGondelman
477dfdff1e
wip hud layering and fix crashes
2017-10-04 11:45:21 -07:00
vladest
86e8076362
Fix puntuation mode
2017-10-04 20:30:25 +02:00
Zach Fox
1ed10ecf59
Fix passphrase crash
2017-10-04 11:05:17 -07:00
samcake
d7333d3fa3
Merging with master
2017-10-04 10:55:38 -07:00
vladest
073fa81d5b
Merge branch 'master' into login_dialog_rework
2017-10-04 19:37:38 +02:00
vladest
0a505617df
Implemented single keyboard instance for all Tablet login dialog items
2017-10-04 19:33:36 +02:00
Seth Alves
3ec9f0c496
Merge branch 'master' of github.com:highfidelity/hifi into import-av-entities
2017-10-04 09:38:33 -07:00
Zach Fox
fcafbef109
Fix buying free items using Commerce system
2017-10-04 09:34:32 -07:00
Andrew Meadows
cfc4696585
Merge pull request #11516 from druiz17/hud-module-fix
...
fix hudOverlayPointer logic
2017-10-04 08:19:53 -07:00
Brad Hefta-Gaub
a1979a2600
Merge branch 'master' into RC-56
2017-10-03 18:16:21 -07:00
anshuman64
d6f31369ee
Merge pull request #11519 from druiz17/rc-equip
...
RC- fixing grabbing and tablet bugs
2017-10-03 17:27:11 -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
Seth Alves
75d2a2bd47
Merge pull request #11517 from SamGondelman/registration
...
Fix entities with registration points rendering in the wrong place
2017-10-03 16:09:27 -07:00
anshuman64
1a49b11821
Merge pull request #11514 from druiz17/rc-grab-attachment
...
Allow the ability to grab attachments
2017-10-03 16:01:20 -07:00
SamGondelman
fa838e4715
merge from master
2017-10-03 15:53:33 -07:00
SamGondelman
0614fd9b4f
fix AvatarManger::findRayIntersection from script thread
2017-10-03 15:31:49 -07:00
SamGondelman
fc6e5df2cb
fix text/web registration point usage
2017-10-03 15:02:21 -07:00
SamGondelman
c9d2d40e1e
possibly fix registration offset issue
2017-10-03 14:44:11 -07:00
druiz17
6b3d89d18f
fix hudlaser module
2017-10-03 14:13:37 -07:00
Seth Alves
6040c4a3e8
Merge branch 'master' of github.com:highfidelity/hifi into import-av-entities
2017-10-03 14:06:01 -07:00
Sam Gondelman
10e85e7ab0
Merge pull request #11515 from SamGondelman/threePose3
...
Fix Local T-Pose
2017-10-03 13:52:38 -07:00
Anthony Thibault
2dc080479c
Merge pull request #11513 from hyperlogic/bug-fix/set-compund-shape-url-deadlock
...
Bug fix for deadlock in ModelEntityItem::setCompundShapeURL()
2017-10-03 13:31:01 -07:00
Seth Alves
05e173a1d0
Merge branch 'master' of github.com:highfidelity/hifi into import-av-entities
2017-10-03 13:11:03 -07:00
Seth Alves
ea4068f1f9
Merge pull request #11478 from vladest/fix_menu_linux
...
Added workaround to enable menu bar under Linux
2017-10-03 13:10:34 -07:00
druiz17
33e9a71000
grab attachments
2017-10-03 12:51:51 -07:00
SamGondelman
a6f2545511
fix local t pose
2017-10-03 12:51:37 -07:00
vladest
6fddf49988
Merge branch 'master' into login_dialog_rework
2017-10-03 21:39:38 +02:00
Andrew Meadows
46e809bbb2
use a better variable name
2017-10-03 12:35:03 -07:00
Andrew Meadows
ef326a3851
expose performance hot spot in stats details
2017-10-03 12:35:02 -07:00
Anthony J. Thibault
1389c2e31d
Bug fix for deadlock in ModelEntityItem::setCompundShapeURL()
...
The fix was to prevent ModelEntityItem::hasCompoundShapeURL() from taking
a readlock on the entity, instead a finer grained lock (ThreadSafeValueCache)
is made around the _compoundShapeURL QString.
2017-10-03 12:15:23 -07:00
