74001 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Gabriel Calero	e9fe0c85f2	Fix merge	2018-11-13 11:03:46 -03:00
Gabriel Calero	3d4893aba2	Merge remote-tracking branch 'upstream/master' into android_new_login	2018-11-13 10:43:36 -03:00
Alexander Ivash	b16efb2afb	set minimum shoulder width to 25 cm (based on discussion with Tony)	2018-11-13 19:06:10 +05:30
Alexander Ivash	3a62184afd	specify min/max/stepsize	2018-11-13 19:06:09 +05:30
Alexander Ivash	95c51c2ffa	unfocus spinboxes on finishing editing	2018-11-13 19:05:20 +05:30
Alexander Ivash	37bb3586ea	show spinbox suffix in separate control to: disallow editing it & allow to pass validator	2018-11-13 19:05:16 +05:30
Alexander Ivash	a9ff1f4ecd	add onscreen keyboard into 'Calibration' tab of Settings=>Controls dialog	2018-11-13 19:03:50 +05:30
David Rowe	e12833da23	Fix entities not loading when Interface doesn't have focus ... Reverts https://github.com/highfidelity/hifi/pull/14286	2018-11-13 14:50:02 +13:00
David Back	b3ccce9a3f	merge follow-up	2018-11-12 17:30:21 -08:00
Howard Stearns	7da440a886	Merge pull request #14385 from howard-stearns/inventory-icons-again ... new inventory icons, and align message waiting light in items tab	2018-11-12 17:05:06 -08:00
David Back	c5023b1086	Merge branch 'feat/ui-updates' of github.com:huffman/hifi into newPropertySliders	2018-11-12 17:03:07 -08:00
Howard Stearns	c520e9de35	Merge pull request #14384 from roxanneskelly/Case19808 ... Case19808 - Sys tray need to remove wallet and market --> inventory	2018-11-12 17:02:34 -08:00
Ryan Huffman	a787f55506	Remove dead code and cleanup JS styling for entity properties redesign	2018-11-12 16:50:45 -08:00
Ryan Huffman	a020a09e8c	Remove redundant dimensions in default entity properties	2018-11-12 16:50:45 -08:00
Ryan Huffman	25df605459	Update the styling for the Entity Properties window	2018-11-12 16:50:45 -08:00
Sam Gondelman	f68706e72f	Merge pull request #14252 from gcalero/enable_aec_by_default ... Enabled AEC by default (bug 19210)	2018-11-12 16:15:33 -08:00
sabrina-shanman	93c7578f54	Convert hfm::Serializer to use hifi-namespaced types	2018-11-12 16:12:21 -08:00
sabrina-shanman	5b6e2aae5a	Remove/move some unused serializer imports	2018-11-12 16:12:21 -08:00
sabrina-shanman	8e0fb0f9c4	Remove unused alternate read functions in FBXSerializer	2018-11-12 16:12:21 -08:00
sabrina-shanman	f971294d6d	Make HFMSerializer return a smart pointer to an HFMModel	2018-11-12 16:12:21 -08:00
sabrina-shanman	5a9af5b2c3	Correct the folder location in the FBXSerializer header/source top comment	2018-11-12 16:12:21 -08:00
sabrina-shanman	baa8cdb054	Remove combineParts from the Serializer interface	2018-11-12 16:12:21 -08:00
sabrina-shanman	0cbe0bd266	Add missing copyright comment and header guard to OBJSerializer.h	2018-11-12 16:12:20 -08:00
sabrina-shanman	00f2b4eeb9	Make the existing model serializers based on HFMSerializer	2018-11-12 16:12:20 -08:00
sabrina-shanman	0271f7d334	Create the HFMSerializer interface class	2018-11-12 16:12:20 -08:00
sabrina-shanman	83cc90ace0	Re-name GLTFReader to GLTFSerializer and do the same for other model readers	2018-11-12 16:12:20 -08:00
Jeff Clinton	ab8ba2daad	Merge pull request #14230 from amantley/shoulderSpaceFix ... Hand Azimuth improvement	2018-11-12 16:00:26 -08:00
Simon Walton	6ee837d47c	OctreeDataUtils - use new json from DS also; allow upload of large domains	2018-11-12 15:43:09 -08:00
John Conklin II	0370c60398	Merge pull request #14358 from AndrewMeadows/fix-capsuleY ... Case 18436: consistent handling of CapsuleShape dimensions	2018-11-12 15:25:42 -08:00
amantley	f2f4a55c19	removed cruft	2018-11-12 15:07:14 -08:00
sabrina-shanman	753557736e	Merge branch 'master' into hfm_library	2018-11-12 15:03:30 -08:00
Howard Stearns	3431bdbb0e	new inventory icons, and align message waiting light in items tab	2018-11-12 14:51:32 -08:00
Gabriel Calero	0aaf92ce79	Fix UI issue: login confirmation sometimes does not appear	2018-11-12 19:51:28 -03:00
amantley	bcd651a65d	adding the member variable to keep track of the orig bind matrices to fbx.h	2018-11-12 14:39:48 -08:00
amantley	3f732baf86	Merge remote-tracking branch 'upstream/master' into avatarPipelineOffsets	2018-11-12 14:38:17 -08:00
John Conklin II	ec4f2f781d	Merge pull request #14352 from Atlante45/feat/solo-source ... [master] Add audio soloing feature	2018-11-12 14:07:30 -08:00
NissimHadar	5d47efa0b8	Merge branch 'MAC' of https://github.com/NissimHadar/hifi into MAC	2018-11-12 14:01:30 -08:00
NissimHadar	07515eab68	Merge branch 'master' of https://github.com/highfidelity/hifi into MAC	2018-11-12 14:00:46 -08:00
NissimHadar	6e3ead0c5f	Merge branch 'master' of https://github.com/highfidelity/hifi into MAC	2018-11-12 14:00:24 -08:00
r3tk0n	597f83e6d5	HoMerge branch 'master' of https://github.com/highfidelity/hifi into 19550-oculus-store-v2	2018-11-12 13:58:37 -08:00
Roxanne Skelly	762033580d	And remove another url log item.	2018-11-12 13:48:08 -08:00
Roxanne Skelly	7a14cb1bbc	Remove additional url logging message.	2018-11-12 13:36:14 -08:00
SamGondelman	df1a848811	fix fade out	2018-11-12 12:58:40 -08:00
Howard Stearns	66ae01e0c3	Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging	2018-11-12 12:55:20 -08:00
Simon Walton	8c347fae70	Fixes for domain server use of changed OctreeDataUtils	2018-11-12 12:45:01 -08:00
Jamil Akram	6511b60aa4	Merge pull request #14264 from ctrlaltdavid/M19085 ... Fix AvatarManager.getPalData() returning data for just a single avatar	2018-11-12 12:27:58 -08:00
NissimHadar	050a13433b	Merge branch 'MAC' of github.com:NissimHadar/hifi into MAC	2018-11-12 12:20:32 -08:00
David Back	bdded0d67a	Merge branch 'master' of https://github.com/highfidelity/hifi into newPropertySliders	2018-11-12 12:20:27 -08:00
David Back	0781171912	Merge branch 'newPropertySliders' of github.com:dback2/hifi into newPropertySliders	2018-11-12 12:20:05 -08:00
NissimHadar	05033b7da1	Echo status to screen	2018-11-12 12:19:32 -08:00