1693 commits

Author	SHA1	Message	Date
vladest	5b033e021a	Merge branch 'master' into modal_dialogs_async	2017-09-16 12:30:07 +02:00
Seth Alves	8a49edbecb	code review	2017-09-15 10:08:35 -07:00
Seth Alves	d89f2b77da	rework ScriptEngine lifetimes using 'smart' pointers	2017-09-14 10:42:21 -07:00
vladest	38295ab73f	Merge conflicts	2017-08-28 16:58:30 +02:00
Andrew Meadows	4d7700b774	Merge pull request #11243 from SamGondelman/sharks ... Fix ray pick crash on shutdown	2017-08-25 09:01:14 -07:00
SamGondelman	abaccf9edd	crash on shutdown	2017-08-24 16:00:36 -07:00
Brad Davis	e817d3ced4	Threaded rendering & entity rendering refactor	2017-08-24 13:34:34 -07:00
Elisa Lupin-Jimenez	44f1f340e1	Merge pull request #11147 from elisa-lj11/blocks ... Adding Blocks Tablet App to Marketplace	2017-08-18 15:06:18 -07:00
Sam Gondelman	cbf2bb3a61	Merge pull request #10980 from SamGondelman/sharks ... Reduce laser pointer lag	2017-08-18 13:14:38 -07:00
Elisa Lupin-Jimenez	2b44608ece	Merge branch 'master' of https://github.com/highfidelity/hifi into blocks	2017-08-17 10:18:40 -07:00
Zach Fox	ecd1f13197	Allow users to take a snapshot from the secondary camera	2017-08-16 15:34:06 -07:00
SamGondelman	86cc938a47	Merge remote-tracking branch 'upstream/master' into sharks	2017-08-16 09:54:12 -07:00
vladest	8326600274	Merge branch 'master' into modal_dialogs_async	2017-08-16 13:48:47 +02:00
Liv	aea5f170f2	Merge branch 'master' of https://github.com/highfidelity/hifi into feat/domain-setup	2017-08-15 13:58:22 -07:00
SamGondelman	9bb7e66859	separate raypickscriptinginterface, cleanup	2017-08-15 13:36:41 -07:00
Elisa Lupin-Jimenez	3d7995da34	Merge branch 'master' of https://github.com/highfidelity/hifi into blocks	2017-08-15 10:01:24 -07:00
vladest	63e907e7b6	Merge branch 'master' into modal_dialogs_async	2017-08-12 13:04:52 +02:00
SamGondelman	4c55849290	merge from master	2017-08-10 15:43:23 -07:00
Seth Alves	ff83a8158b	cancel effects of --replaceAvatarURL when avatar is changed with preference dialog	2017-08-10 13:49:48 -07:00
Elisa Lupin-Jimenez	1ac9536f95	Downloading blocks from marketplace in own asset folder	2017-08-09 15:56:07 -07:00
vladest	556569819d	1st stage of moving to async dialogs	2017-08-09 14:00:19 +02:00
SamGondelman	42147640e2	remove LaserPointerManager as a dependency	2017-08-07 14:18:56 -07:00
Liv Erickson	da70071b5a	Merge branch 'master' into feat/domain-setup	2017-08-07 10:04:54 -07:00
Elisa Lupin-Jimenez	ebc28a6557	Renamed isBlocks to isZip, added debug print for non-entity files	2017-08-04 16:58:33 -07:00
Elisa Lupin-Jimenez	06ff766952	Drag zip cleaned up, marketplaces stylized, back button fixed	2017-08-04 16:58:33 -07:00
Elisa Lupin-Jimenez	ed1ed4f3e0	Blocks drag does not work yet	2017-08-04 16:57:48 -07:00
Elisa Lupin-Jimenez	ca6a323d54	Can drag blocks zip folder into hifi and upload the .obj	2017-08-04 16:57:48 -07:00
Brad Davis	86e3489167	Updates from Threaded Rendering project	2017-08-04 15:22:14 -07:00
Brad Hefta-Gaub	9b3be6d164	Merge pull request #10808 from humbletim/21400 ... WL 21400 -- Setting that lets you switch from cursor to reticle	2017-07-27 13:16:58 -07:00
Liv	57b27a7bb7	change packet type to be sourced, change from packet list to single packet	2017-07-25 20:17:20 -07:00
Liv	32ddffd9c8	Move logic for confirmation into Application.cpp for handling files directly	2017-07-24 18:09:32 -07:00
Seth Alves	3670a04d8e	switch bare pointers to AudioInjector objects to be QSharedPointers	2017-07-11 14:24:58 -07:00
David Kelly	936c21e849	remove unnecessary cacheDir member	2017-07-06 07:24:58 -07:00
Brad Davis	b52dd7b822	Don't use blocking connections on the main thread	2017-06-29 20:45:17 -07:00
David Kelly	48de8011b2	cr feedback	2017-06-28 14:15:29 -07:00
David Kelly	01155ba4e3	this handles redirecting ktx_cache, data8, prepared	2017-06-27 08:47:54 -07:00
humbletim	c10475186c	add support for switching cursor from arrow to reticle	2017-06-23 18:48:29 -04:00
David Kelly	94a33fea94	new switches to override avatarURL	2017-06-21 16:03:05 -07:00
Brad Davis	ed6620fc51	Merge pull request #10718 from jherico/frame_thread ... Cleanup and refactoring	2017-06-19 13:31:44 -07:00
Vladyslav Stelmakhovskyi	b8bb8026ca	Merge branch 'master' into fix_tablet_buttons_qt59	2017-06-17 22:30:00 +02:00
Vladyslav Stelmakhovskyi	5a0783c38c	Send mouse events before touch event. It seems the order is important for Qt 5.9	2017-06-17 22:24:27 +02:00
Brad Davis	fece438602	Cleanup and refactoring	2017-06-15 18:58:56 -07:00
Zach Pomerantz	a8f69bb2e0	Merge branch 'master' of github.com:highfidelity/hifi into audio/parity	2017-06-13 17:41:52 -04:00
Zach Pomerantz	b37a0239b0	up to reverb (needs cherry-picking)	2017-06-12 18:00:52 -04:00
NeetBhagat	c3621d7c32	Resolved two issues: ... 1) While in HMD mode -> open Tablet -> Click Desktop. Desktop mode will be on. 2) Menu sync problem while switching modes.	2017-06-06 22:31:14 +05:30
NeetBhagat	6228ff19bf	Resolve the reviewed comments of @ZappoMan	2017-06-02 15:23:21 +05:30
NeetBhagat	58142817a1	Resolve the review comments of @ZappoMan.	2017-05-31 19:18:14 +05:30
volansystech	212627bd5d	Merge branch 'master' into 21255	2017-05-29 17:51:45 +05:30
volansystech	0920dbc1a8	Resolve the comments of @ZappoMan.	2017-05-29 15:53:33 +05:30
Zach Pomerantz	03d3666c0c	show menu after requesting it	2017-05-28 17:34:11 -04:00