4211 commits

Author	SHA1	Message	Date
Sam Gondelman	5a6f9eb9e3	Merge branch 'master' into NOverlays8	2019-01-03 15:11:48 -08:00
SamGondelman	4cd1cd6606	merge with master	2019-01-03 12:56:41 -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
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
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
SamGondelman	bb030660bd	Merge remote-tracking branch 'upstream/master' into NOverlays4	2018-12-20 13:26:23 -08: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
SamGondelman	6094a2f0a0	add back line entities, undo polyline changes temporarily	2018-12-14 15:41:11 -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
Sam Gondelman	2291c7e5fb	Merge branch 'master' into NOverlays3	2018-12-06 12:37:18 -08:00
Sam Gondelman	533e0e0326	Merge branch 'master' into NOverlays2	2018-12-06 12:29:38 -08:00
Sam Gondelman	b690faeb12	Merge branch 'master' into NOverlays	2018-12-06 11:29:06 -08:00
Sam Gondelman	c38a6966a9	Merge branch 'master' into NOverlays4	2018-12-06 11:25:43 -08:00
Sam Gondelman	a7c083e97a	Merge branch 'master' into NOverlays2	2018-12-06 11:24:27 -08:00
Sam Gondelman	d30dd4c26c	Merge branch 'master' into NOverlays3	2018-12-06 11:23:50 -08:00
Adam Smith	08d6e35d4d	Merge pull request #14372 from SamGondelman/decals ... Case 19798: 3D projected Material Entities and materialRepeat option	2018-12-06 11:13:46 -08:00
SamGondelman	305cb6d323	grid entities	2018-12-03 18:04:34 -08:00
SamGondelman	3ce6f7f3d6	real image entities	2018-12-03 11:50:59 -08:00
SamGondelman	1fd8a21f8e	cleanup	2018-12-03 11:07:54 -08:00
sabrina-shanman	b809eed01f	Merge branch 'master' into hfm_mimetype	2018-11-28 15:06:04 -08:00
sabrina-shanman	2387641cbb	Store the MIME type in HTTPResourceRequest::onRequestFinished()	2018-11-26 16:09:41 -08:00
SamGondelman	e282d51883	CR	2018-11-26 01:15:07 -05:00
birarda	23857ea8c2	ensure packets are added to loss list after timeout	2018-11-19 17:40:55 -08:00
Dante Ruiz	f17723c216	disable interstitial for master	2018-11-14 14:50:38 -08:00
SamGondelman	079d1dcbd6	convert clientOnly to entityHost and add local entities	2018-11-14 11:25:37 -08:00
Jeff Clinton	6c90d7ed11	Merge pull request #14343 from ElderOrb/FB19514 ... FB19514 - Interface crashes on attempt to apply new animation url via…	2018-11-13 14:59:50 -08:00
Brad Hefta-Gaub	bb2239c0bd	Merge pull request #14359 from howard-stearns/no-url-logging ... remove urls from logs in Interface	2018-11-13 13:19:30 -08:00
Brad Hefta-Gaub	6e2024350d	Merge pull request #14282 from gcalero/android_new_login ... Change Android login flow (MS case 19470)	2018-11-13 12:02:10 -08:00
Howard Stearns	ad7266062d	Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging	2018-11-13 10:33:27 -08:00
John Conklin II	85e5c1d6ef	Merge pull request #14363 from SimonWalton-HiFi/scale-avatar-joint-translations ... Send avatar-joint translations at world scale	2018-11-13 10:04:30 -08:00
Howard Stearns	545b85bc9d	Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging	2018-11-13 09:55:54 -08:00
Howard Stearns	fc62700587	Merge branch 'no-url-logging' of github.com:howard-stearns/hifi into no-url-logging	2018-11-13 09:55:09 -08:00
Gabriel Calero	3d4893aba2	Merge remote-tracking branch 'upstream/master' into android_new_login	2018-11-13 10:43:36 -03: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
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
Howard Stearns	66ae01e0c3	Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging	2018-11-12 12:55:20 -08:00
Brad Hefta-Gaub	22dd958582	Merge pull request #14297 from jherico/feature/vcpkg ... Case 19807: Switch to vcpkg for many dependencies on all non-mobile platforms	2018-11-12 09:52:02 -08:00
SamGondelman	b3abd97707	projected materials and repeat property	2018-11-09 10:47:07 -08:00
Zach Fox	5cf2041c65	Remove unused variable	2018-11-09 10:38:20 -08:00
Brad Davis	8c4f0ec774	Vcpkg migration	2018-11-08 12:28:06 -08:00