136 commits

Author	SHA1	Message	Date
Jeff Clinton	75d26dc45f	Merge pull request #14659 from luiscuenca/addAvatarToAvatarCollisionOption ... Add menu checkbox to toggle collisions with other avatars	2019-01-07 08:58:09 -08:00
luiscuenca	d630fe9dbd	Add menu checkbox to toggle collisions with other avatars	2019-01-04 16:38:48 -07:00
Ryan Huffman	1da179dc04	Update avatar packager styling	2018-12-27 00:13:45 -08:00
Alexander Ivash	090bc4fc0d	FB19355 - When I have avatar entities as children of my avatar, the Avatar app is not consistent in displaying wearables	2018-12-05 23:33:34 +03:00
Howard Stearns	66ae01e0c3	Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging	2018-11-12 12:55:20 -08:00
Jeff Clinton	12b833d121	Merge pull request #14167 from ElderOrb/FB18859 ... Make material entities to be presented in avatarapp	2018-11-09 15:32:27 -08:00
Dante Ruiz	501746b156	3D Keyboard	2018-11-08 09:58:53 -08:00
Zach Fox	1ab1cb95d8	Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging	2018-11-08 09:57:10 -08:00
Zach Fox	e80468e423	Remove URL logging from JS and QML	2018-11-06 15:09:24 -08:00
Alexander Ivash	c6764c6244	cherry-picking	2018-11-06 14:21:14 +05:30
Zach Fox	b6344acc1d	Big checkpoint. be aware - things may be broken	2018-10-30 15:08:13 -07:00
Howard Stearns	e3b1e14db6	nix "buy" where possible.	2018-10-25 12:37:08 -07:00
John Conklin II	e21e7d30d7	Merge pull request #14126 from amantley/squattyPottyFix ... Sit State for the seated user in HMD: Squatty Potty Fix	2018-10-23 15:20:49 -07:00
Brad Hefta-Gaub	405b1d5725	Revert "Better imports for controls and styles"	2018-10-23 10:58:28 -07:00
amantley	3e8663f8e9	removed the dropdown from the avatar app, because it is in settings controls now	2018-10-22 22:31:26 -07:00
amantley	472ab1c613	Merge remote-tracking branch 'origin/squattyPottyFix' into squattyPottyFix	2018-10-22 17:50:56 -07:00
amantley	cce2f295a1	fixed conflict in myskeletonmodel.cpp	2018-10-22 17:49:30 -07:00
amantley	a427ddb235	removed extraneous print statements	2018-10-20 09:16:05 -07:00
amantley	55daeb11cd	moved the radio buttons on the avatar settings to even them out better. will be corrected I'm sure	2018-10-19 18:43:02 -07:00
amantley	070a517423	changed the recenterModel variables to userRecenterModel	2018-10-19 18:07:03 -07:00
amantley	a43985ef64	combo box for recenter model is added	2018-10-19 16:03:53 -07:00
amantley	0837f790eb	combo box changes	2018-10-19 07:46:16 -07:00
amantley	b9a2f19d30	made all the suggested corrections except the dropdown qml.	2018-10-18 16:39:50 -07:00
Alexander Ivash	a4987e494a	update imports	2018-10-18 21:05:20 +03:00
amantley	67afc86222	cleanup	2018-10-11 18:39:44 -07:00
Alexander Ivash	6e66f289fe	take 'materialData?materialName' cases into account	2018-10-09 23:08:14 +03:00
amantley	c4187f0d60	Merge remote-tracking branch 'upstream/master' into squattyPottyFix	2018-10-08 17:07:55 -07:00
Alexander Ivash	7d470cf161	FB18859 - Avatar App Bug when material entity is added as avatar entity	2018-10-09 01:59:41 +03:00
John Conklin II	afe6d97b00	Merge pull request #14100 from danteruiz/soft-entities-updates ... update soft entities and fix deadlock from qml.	2018-10-04 13:33:34 -07:00
Dante Ruiz	613a6ab8cd	removing unneeded code	2018-10-04 12:18:18 -07:00
Dante Ruiz	676293c880	trying another fix	2018-10-03 16:19:47 -07:00
Dante Ruiz	5734c24af4	another PR fix	2018-10-03 13:52:40 -07:00
Brad Davis	ffbb144a7c	Fix avatar thumbnails	2018-10-02 16:31:24 -07:00
Dante Ruiz	182c92b951	fix mac issue	2018-10-02 11:24:09 -07:00
John Conklin II	87b39f690c	Merge pull request #14106 from jherico/fix/mac_gl1 ... Fix some Mac rendering issues	2018-10-01 16:35:57 -07:00
Dante Ruiz	ad92b172cb	removing comment	2018-10-01 09:47:07 -07:00
amantley	1a0e2c6ea1	clean up for pr	2018-10-01 08:30:51 -07:00
Bradley Austin Davis	3dea4fd10a	Fix some Mac rendering issues	2018-09-27 19:21:50 -07:00
amantley	52355e53f1	adding the menu item to the avatar app for the sit state.	2018-09-27 16:44:55 -07:00
Dante Ruiz	c1c853790b	update soft entities and fix deadlock	2018-09-27 14:53:28 -07:00
Alexander Ivash	e5b7b7f12a	FB18061 - Avatar favorites cannot be moved to a different joint - At Save the wearable jumps to the original joint	2018-09-19 23:07:21 +03:00
Alexander Ivash	07739453c5	coding standards	2018-08-31 01:51:13 +03:00
Alexander Ivash	cb1855b0d7	filter out left/right hands from joints list in avatarapp ... should fix: FB17884 - Wearable disappears when added to some joints FB17885 - Changing werable joint moves the model and detaches from avatar body	2018-08-31 01:51:13 +03:00
Alexander Ivash	cfb820762d	bulk adjusting to coding guidelines	2018-08-22 00:42:01 +03:00
Alexander Ivash	9f92ff5de9	fix for duplicating wearables on saving ... note: the issue was caused by newly-introduced code converting between attachments & entities fix removes attachments-related code because attachments are deprecated and converted into entities on the fly	2018-08-18 16:38:35 +03:00
Alexander Ivash	3bcd6f4a25	take 'relayParentJoints' into account during wearables comparison	2018-08-18 16:33:30 +03:00
Alexander Ivash	877bce23d2	explicitely specify localRotations on joint change, otherwise it will be updated by engine	2018-08-18 16:32:31 +03:00
elderorb	ea22fdb400	Merge branch 'master' into FB17184	2018-08-16 02:08:47 +03:00
Alexander Ivash	c1ebadfdd8	adjust text in 'get wearables' popup	2018-08-11 00:43:39 +03:00
Alexander Ivash	9b9e30e829	add 'Tip: You can use hand controllers to grab and adjust your wearables' if in HMD	2018-08-10 20:14:15 +03:00