4243 commits

Author	SHA1	Message	Date
SamGondelman	f60b272f11	fix crash	2019-01-07 17:24:07 -08:00
Sam Gondelman	db3187ec6c	Merge branch 'master' into propFix	2019-01-07 14:57:38 -08:00
Adam Smith	7e75ed5daa	Merge pull request #14586 from SamGondelman/NOverlays8 ... Case 20322, Case 12279, Case 15803: Improve PolyLines to support glow and faceCamera	2019-01-07 14:53:27 -08:00
Shannon Romano	6eaec12df7	Merge pull request #14658 from Atlante45/feat/stats ... Only keep aggregated thread stats for Avatar Mixer	2019-01-07 10:17:26 -08:00
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
Shannon Romano	4e5d275768	Merge pull request #14632 from thoys/feat/avatarTools/avatarPackager ... MS19925: Avatar Packager	2019-01-04 16:22:06 -08:00
luiscuenca	d630fe9dbd	Add menu checkbox to toggle collisions with other avatars	2019-01-04 16:38:48 -07:00
Thijs Wenker	94146ab997	CR fixes	2019-01-04 23:59:22 +01:00
Clement	cfbb4e29d1	Only keep aggregated thread stats	2019-01-04 14:51:58 -08:00
SamGondelman	1452d237e2	trying to fix avatar entity issue	2019-01-04 14:34:46 -08:00
Shannon Romano	3faf12b141	Merge pull request #14637 from howard-stearns/data-url-for-web-entity ... data url for web entity	2019-01-04 14:21:55 -08:00
Thijs Wenker	b105607cb2	Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager	2019-01-04 21:13:29 +01:00
Thijs Wenker	a3f72a7a08	Merge branch 'feat/avatarTools/avatarPackager' of github.com:thoys/hifi into feat/avatarTools/avatarPackager	2019-01-04 21:10:35 +01:00
Seth Alves	b9217e2767	Merge pull request #14655 from danteruiz/unknown-steamvr-headsets ... omit unknown device names from clear-story data	2019-01-04 10:09:20 -08:00
Ryan Huffman	c2ceeb3d76	Apply AvatarPackager code review cleanup	2019-01-04 09:41:31 -08:00
Thijs Wenker	8625037285	Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager	2019-01-04 15:29:07 +01:00
Antonina Savinova	4414579a6e	Merge pull request #14591 from Atlante45/feat/stats ... Fix network stats to use low-level values	2019-01-03 16:54:03 -08:00
Sam Gondelman	0e6eecc64b	Update PacketHeaders.h	2019-01-03 15:20:55 -08:00
Sam Gondelman	5a6f9eb9e3	Merge branch 'master' into NOverlays8	2019-01-03 15:11:48 -08:00
Dante Ruiz	f5de217b4c	removing debug statment	2019-01-03 13:40:44 -08:00
Thijs Wenker	c95da0a595	Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager ... # Conflicts: # interface/src/Application.cpp	2019-01-03 22:17:54 +01:00
SamGondelman	4cd1cd6606	merge with master	2019-01-03 12:56:41 -08:00
Dante Ruiz	fe1a8a6b76	omit unknown device names from clear story	2019-01-03 11:46:03 -08:00
Clement	a0ede77e4f	Fix typo	2019-01-03 10:04:38 -08:00
Clement	9475a31f1b	Record ACK data in stats	2019-01-03 10:04:38 -08:00
Clement	f163bbc0d5	Sample connections stats every seconds	2019-01-03 10:04:38 -08:00
Clement	c5b60594b6	Record more detailed stats on Retransmit/duplicate	2019-01-03 10:04:38 -08:00
Seth Alves	ad1235ce94	also bump entity protocol version	2019-01-03 08:19:13 -08:00
Seth Alves	78aff6e95c	grab js api; send grab information through trait system	2019-01-03 08:17:52 -08:00
Thijs Wenker	725a14ce80	Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager	2019-01-03 11:06:19 +01:00
SamGondelman	ea11497a67	Merge remote-tracking branch 'upstream/master' into NOverlays7	2019-01-02 18:09:19 -08:00
Sam Gondelman	aeafb3c9a7	Merge pull request #14569 from SamGondelman/NOverlays6 ... Case 20281: Add missing Text Entity properties	2019-01-02 18:07:37 -08:00
Thijs Wenker	cb91a4bc6d	Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager	2019-01-03 00:10:22 +01:00
Antonina Savinova	4838a9107a	Merge pull request #14624 from davidkelly/dk/17207 ... ACs don't need to call into flagtimeForConnecitonStep	2019-01-02 13:41:30 -08:00
howard-stearns	af65e59ba3	Recognize data: URLs in Web entities.	2018-12-27 14:34:59 -05:00
Thijs Wenker	ea901aa179	Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager	2018-12-21 14:11:57 +01:00
SamGondelman	bb030660bd	Merge remote-tracking branch 'upstream/master' into NOverlays4	2018-12-20 13:26:23 -08:00
Thijs Wenker	79a9c82168	Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager	2018-12-20 18:56:33 +01:00
David Kelly	2c647462b1	ACs don't need to call into flagtimeForConnecitonStep	2018-12-20 10:15:44 -07:00
SamGondelman	05e0fb464e	new improved polylines	2018-12-19 15:01:49 -08:00
Sam Gondelman	e890fc6980	Merge branch 'master' into NOverlays3	2018-12-19 11:37:10 -08:00
Adam Smith	828672343a	Merge pull request #14523 from SamGondelman/NOverlays2 ... Case 20131: Cleanup some Entity Properties	2018-12-19 11:33:24 -08:00
Ryan Huffman	720cd90dc7	Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager	2018-12-18 13:17:28 -08:00
SamGondelman	6094a2f0a0	add back line entities, undo polyline changes temporarily	2018-12-14 15:41:11 -08:00
Ryan Huffman	78c4c2599e	Add start of marketplace uploading and project file list	2018-12-13 13:27:31 -08:00
SamGondelman	b261665072	working on lines	2018-12-12 09:39:01 -08:00
SamGondelman	250baa9c72	add missing properties to text entities	2018-12-11 15:42:24 -08:00
SamGondelman	fd8245e258	Merge remote-tracking branch 'upstream/master' into NOverlays6	2018-12-11 10:46:39 -08:00
Shannon Romano	a3c870ed90	Merge pull request #14479 from sabrina-shanman/hfm_mimetype ... (case 20037) Add robust MIME type detection for loading models in ModelCache	2018-12-11 18:41:55 +00:00
Sam Gondelman	d21d764131	Merge branch 'master' into NOverlays4	2018-12-06 12:48:05 -08:00