Commit graph

8122 commits

Author SHA1 Message Date
RebeccaStankus
5831eb261f Changed calculation of overlay size 2019-10-14 16:08:01 -07:00
RebeccaStankus
4720c64af8 Merge branch 'master' of github.com:highfidelity/hifi into ouputMutedOverlay 2019-10-14 13:02:54 -07:00
Zach Fox
a1b6b0af35
Merge pull request #16336 from ctrlaltdavid/DEV-1867
DEV-1867: Fix toolbarTest.js
2019-10-14 11:50:59 -07:00
Rebecca Stankus
4ac87ef503 Moved position of settings app 2019-10-11 16:20:37 -07:00
Rebecca Stankus
377ffe9698 Fixed calculation of overlay position 2019-10-11 16:02:55 -07:00
David Rowe
5292dddc39 Rewrite toolbarTest.js 2019-10-12 10:10:41 +13:00
Zach Fox
3f00c524fb DEV-2379: Modify Shadow-related tooltips in Create 2019-10-10 11:47:40 -07:00
Zach Fox
a5caa36f07
Merge pull request #16318 from MiladNazeri/dev-2082/cannont-click-yourself-in-third-person-for-nametag
dev-2082/cannot-click-yourself-in-third-person-for-nametag
2019-10-09 19:34:00 -04:00
Seth Alves
1ce3cebe1f force LOD to be 20-20 on android, and force lodAngleDeg to 0.248 2019-10-09 14:04:44 -07:00
milad
77d17e0ff7 removed extra disconnect function 2019-10-09 13:26:53 -07:00
milad
e2fee5361d updated startup/shutdown 2019-10-09 13:09:38 -07:00
milad
06244338d6 updated nametags to work in selfie mode 2019-10-09 12:36:44 -07:00
Maia Hansen
ad863a1cef
Merge pull request #16313 from RebeccaStankus/controllerSignals
Added flag to ensure mouse event signals are not connected twice
2019-10-08 15:58:24 -07:00
RebeccaStankus
092424569d Added flag to ensure mouse event signals are not connected twice 2019-10-08 12:01:47 -07:00
Zach Fox
9feab869ad DEV-2350: Prevent duplicate default scripts from running 2019-10-08 14:48:19 -04:00
Shannon Romano
921cec872b
Merge pull request #16300 from hyperlogic/bug-fix/mat4-forward-right-up-fixes
Fix for Mat4.getForward, getRight and getUp
2019-10-04 17:00:43 -07:00
Anthony J. Thibault
e3f799d039 Fix for Mat4.getForward, getRight and getUp
It should match the results from the same methods on the Quat class.
2019-10-04 13:59:38 -07:00
Zach Fox
6bfca4e587 DEV-2275: Move 'input device muted' banner and make it slightly smaller 2019-10-02 11:48:50 -07:00
Shannon Romano
38574cd66b
Merge pull request #16245 from luiscuenca/implementPointAt
DEV-442: Implement directional blending node for point reaction
2019-10-01 11:46:30 -07:00
luiscuenca
02d889ba6e
account for point target validity 2019-09-30 11:35:00 -07:00
Sam Gateau
57f8095506 Pass 4 on cleaning up that pr, put the SortFIlterModel.qml in the new skit/qml lib, setting the opacityMappMode correctly from script 2019-09-27 12:00:45 -07:00
Sam Gateau
24cc302a8b second pass of cleaning on the code to make it ready for merge 2019-09-26 16:56:00 -07:00
Sam Gateau
dc40c530a3 INstrumenting the code more... 2019-09-25 17:53:59 -07:00
luiscuenca
0aab2ed07f
Disable head look at when pointing 2019-09-25 12:37:24 -07:00
Sam Gateau
3e3c4c2e70 Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2019-09-24 18:58:29 -07:00
Sam Gateau
0d9cd69d94 SImplifying Page.js, and adding a REsourceInspector 2019-09-24 18:10:57 -07:00
luiscuenca
ad79393e1f
Implement point at directional blend and API 2019-09-24 17:55:38 -07:00
Sam Gateau
2a78fc7b38 Remove the auto refresh list of resource because it takes too much time, instead user has to press refresh button 2019-09-24 14:29:09 -07:00
Sam Gateau
8aaa5deb11 Clean up the sort and filter system 2019-09-24 12:37:01 -07:00
Sam Gateau
d940e70564 Adding a proper SortFilterModel 2019-09-24 00:31:16 -07:00
Sam Gateau
3e17c1007a understanding the delegateModelGroup mechanism... 2019-09-23 18:14:45 -07:00
RebeccaStankus
982bdf5c98 Prereq work for 'Reduce User Friction' 2019-09-23 16:49:16 -07:00
Sam Gateau
3c2809b9ed Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2019-09-21 08:52:13 -07:00
Sam Gateau
4480d56433 Rendering just the overlay layer and improving the resoruceCache inspector to sort 2019-09-20 19:00:03 -07:00
dante ruiz
fe2a4c3600 fix fix-snap-html-issue 2019-09-19 18:20:08 -07:00
Sam Gateau
ee5de175eb Better monitoring of the resource loading in flights 2019-09-19 16:56:55 -07:00
Sam Gateau
819c942056 Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-09-19 09:01:19 -07:00
Sam Gateau
a87db2636c SOme stuff workbetter 2019-09-18 18:25:42 -07:00
Zach Fox
59184edc89 DEV-521: Update Emoji window's search field to display emoji's name during hover 2019-09-18 13:37:46 -07:00
Sam Gateau
c0660329a3 Exposing the REsource Caches through a bit of ui, adding MaterialCache to the family 2019-09-17 18:06:08 -07:00
Sam Gateau
802326d4da Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-09-12 17:01:37 -07:00
Sam Gateau
133a8b7d5e a bunch of changes to debug why... 2019-09-11 18:21:44 -07:00
Zach Fox
3cfb4db36e
Merge pull request #16177 from MiladNazeri/DEV-565/Reconsider-the-emoji-pop-sound-on-the-out-animation
DEV-565/Reconsider-the-emoji-pop-sound-on-the-out-animation
2019-09-11 15:35:04 -07:00
milad
4c340746c5 removed references to the emoji destroy sound 2019-09-11 12:50:49 -07:00
milad
275350c2fa removed sound from the out 2019-09-11 12:38:29 -07:00
Zach Fox
e9eb07d388 BUGZ-1339: Disable the Emote Indicator animation to prevent it from being 'jittery' 2019-09-11 10:20:59 -07:00
milad
d32438586a added flag for flying 2019-09-10 16:06:50 -07:00
milad
bb0b51116a cr1 2019-09-06 11:29:29 -07:00
milad
b352d53083 removed space made on accident 2019-09-06 11:00:14 -07:00
milad
1d8bbc3529 removed startup time var 2019-09-06 10:55:35 -07:00