21338 commits

Author	SHA1	Message	Date
Elisa Lupin-Jimenez	d3c76c99c2	See all markets button working again	2017-08-09 17:28:05 -07:00
Elisa Lupin-Jimenez	a2e407f786	fixed merge conflicts in marketplacesInject.js	2017-08-09 15:59:20 -07:00
Elisa Lupin-Jimenez	1ac9536f95	Downloading blocks from marketplace in own asset folder	2017-08-09 15:56:07 -07:00
Howard Stearns	cc634a2d1b	Merge pull request #11148 from zfox23/commerce_singleSetting ... New commerce mode now depends on 1 setting; bugfixes; Tablet -> TAB key	2017-08-09 13:25:10 -07:00
howard-stearns	f1ab91edd1	PR feedback	2017-08-09 12:41:16 -07:00
howard-stearns	a726b01263	remove duplicated line	2017-08-09 12:11:12 -07:00
howard-stearns	7414bf0d9a	oops. didn't test what I thought I did	2017-08-09 12:09:03 -07:00
howard-stearns	1cf81495ab	basic commerce infrastructure	2017-08-09 11:50:52 -07:00
Zach Fox	33fa8c4f86	Fix bugs and also change to single setting	2017-08-09 11:44:09 -07:00
Elisa Lupin-Jimenez	17acf0520d	Download from blocks in marketplace working	2017-08-09 11:08:14 -07:00
howard-stearns	9349e72eeb	Merge branch 'master' of https://github.com/highfidelity/hifi into buy	2017-08-09 10:00:36 -07:00
Elisa Lupin-Jimenez	d599753771	Started blocks download catch, fixed a debug typo	2017-08-08 18:43:35 -07:00
Zach Fox	4f85923517	Tons of fixes and improvements!	2017-08-08 17:58:41 -07:00
Zach Fox	03729bf165	Actually fix context menu	2017-08-08 16:38:12 -07:00
Zach Fox	871a5ff1ab	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_CheckoutQMLInvestigation	2017-08-08 15:53:22 -07:00
Zach Fox	69fc69cffb	Comment fix and overlay click fix	2017-08-08 15:52:59 -07:00
Zach Fox	7d26d2d88b	Switch and fix overlay clicks	2017-08-08 14:29:44 -07:00
Zach Fox	1493a310af	Beginning of stack stuff	2017-08-07 17:02:24 -07:00
Zach Fox	45424f0cfe	Prototype V1	2017-08-07 16:25:42 -07:00
Zach Fox	7e922cb2c2	Layout	2017-08-07 16:16:17 -07:00
Zach Fox	517128a939	More steps	2017-08-07 16:03:42 -07:00
Seth Alves	60895872ca	Merge pull request #11123 from vladest/attachment_speedup ... Remove snap to item. Add caching for scrolling speedup	2017-08-07 13:18:50 -07:00
Seth Alves	af1e27dc36	Merge pull request #11053 from hyperlogic/feature/secondary-pose-support ... Improved support for Vive Trackers on biceps	2017-08-07 13:11:48 -07:00
howard-stearns	9bad26c2db	stub files	2017-08-07 12:51:30 -07:00
Zach Fox	07a4beac73	Fix the crash	2017-08-07 10:28:36 -07:00
Seth Alves	c570d483d8	Merge pull request #11113 from elisa-lj11/zip_drag ... Zip drag (needs review)	2017-08-07 03:17:31 -07:00
Seth Alves	8798e47f99	Merge pull request #11117 from hyperlogic/bug-fix/misc-crash-fixes ... Crash fixes for avatars without Hips, and web overlays	2017-08-06 18:48:07 -07:00
vladest	134bad9534	fixed typo leads to lost touch or mouse release events	2017-08-06 19:09:40 +02:00
vladest	3a013bf86e	Remove snap to item. Add caching for scrolling speedup	2017-08-05 13:28:08 +02:00
Elisa Lupin-Jimenez	a246c59277	changed debug print for unsupported entity files	2017-08-04 16:59:21 -07:00
Elisa Lupin-Jimenez	8c9ce82986	Fixed Mac and Ubuntu platform build issue (hopefully)	2017-08-04 16:58:33 -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	692aa4c4b9	Clara download working again, still can drag in Blocks zip	2017-08-04 16:58:15 -07:00
Elisa Lupin-Jimenez	c6d5b1a5e6	Removed extraneous print statements	2017-08-04 16:58:15 -07:00
Elisa Lupin-Jimenez	c3d943ff72	Drag zip folder works	2017-08-04 16:57:48 -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
Anthony J. Thibault	98bbe887b9	Merge branch 'master' into feature/secondary-pose-support	2017-08-04 16:11:13 -07:00
Brad Davis	86e3489167	Updates from Threaded Rendering project	2017-08-04 15:22:14 -07:00
Brad Hefta-Gaub	57f62f59fb	Merge pull request #11110 from Armads/WL21423 ... Camera mode on startup is determined by user settings and HMD status	2017-08-04 13:16:34 -07:00
Brad Hefta-Gaub	0f85769098	Merge pull request #11116 from vladest/fix_menu_caps ... Cleanup top menu on menu re instantiation	2017-08-04 12:37:14 -07:00
Brad Hefta-Gaub	0d0a1af166	Merge pull request #11085 from jherico/script_console_crash ... Fix for potential crash in JS console	2017-08-04 11:44:20 -07:00
Anthony J. Thibault	9fdc044ae1	Crash fix for web3d overlays that are not the tablet.	2017-08-04 11:19:59 -07:00
Anthony J. Thibault	85500841fb	Crash fix for avatars that are missing "Hips", "Head" and other required joints.	2017-08-04 11:19:09 -07:00
vladest	9058a8e2ca	Cleanup top menu on menu reinstantiation	2017-08-04 16:36:00 +02:00
anshuman64	83e50f894a	Merge pull request #11106 from seefo/tracked-objects ... Added Vive pucks as an input channel and added new puck-attach script	2017-08-03 17:03:45 -07:00
Howard Stearns	71ce5a6494	Merge pull request #11016 from highfidelity/context-overlays ... Context Overlays	2017-08-03 16:28:14 -07:00
druiz17	27f508ad9b	Merge pull request #11088 from vladest/fix_opened_running_scripts ... Fix opened running scripts	2017-08-03 13:09:50 -07:00
Chris Collins	6d57b4df38	Merge pull request #11108 from jherico/installer_remove_pdb ... Fix installer issues	2017-08-03 12:51:58 -07:00