21316 commits

Author	SHA1	Message	Date
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
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
Armads	dff4e6e32c	WL21423 Changing order of camera setup steps	2017-08-03 15:40:38 -04:00
vladest	b049b0f415	Merge conflicts	2017-08-03 19:43:42 +02:00
David Kelly	4b7779f0f5	add flag to outline render flags, fix pal.js/edit.js interaction	2017-08-03 07:57:21 -07:00
Armads	24718e2424	WL21423 Camera mode on startup is determined by user settings and HMD status	2017-08-03 09:03:23 -04:00
Brad Davis	5a7a6bab70	Remove PDB files, eliminate sixense	2017-08-02 14:08:46 -07:00
seefo	106b0ad8bb	Added Vive pucks as an input channel	2017-08-02 13:08:43 -07:00
druiz17	6680be2a03	Merge pull request #11103 from vladest/fix_toolbar_apps_switch ... Fix toolbar apps switch	2017-08-02 12:59:31 -07:00
vladest	7d361c69c2	Audio mic bar show only rectangle on mouse over	2017-08-02 19:52:47 +02:00
vladest	2d4396ac8e	Merge branch 'master' into fix_toolbar_apps_switch	2017-08-02 16:34:49 +02:00
vladest	4330e31212	Toolbar mode: 1. Fixed switching between different apps. 2. Fixed switching from Create	2017-08-02 16:32:09 +02:00
David Kelly	588afaaa85	unused variable...	2017-08-01 16:59:42 -07:00
Anthony Thibault	8a87ebd2a8	Merge pull request #11036 from AndrewMeadows/walkabout ... fix bugs preventing avatar from walking on spherical planet	2017-08-01 16:36:35 -07:00
David Kelly	762b409814	unused variable	2017-08-01 16:20:33 -07:00
David Kelly	479d6abc58	Merge remote-tracking branch 'upstream/context-overlays' into contextOverlays_renderMOde	2017-08-01 16:18:20 -07:00
David Kelly	6ae516c46a	Merge remote-tracking branch 'upstream/context-overlays' into contextOverlays_renderMOde	2017-08-01 15:45:34 -07:00
anshuman64	9bf4977e09	Merge pull request #11096 from humbletim/21487 ... WL 21487: Fix Camera behavior in Mirror mode	2017-08-01 14:59:06 -07:00
anshuman64	97b4fd4032	Merge pull request #11071 from vladest/fix_menu_landscape ... Fix Landscape mode, when menu pushed in Create mode	2017-08-01 11:29:15 -07:00
humbletim	3a9b8c02a6	* disable Avatar "follow" / recentering behavior when using HMD + "View > Mirror" ... * restore access to "View > Mirror" from HMD mode	2017-08-01 13:41:28 -04:00
Brad Davis	bea91be521	Fix for potential crash in JS console	2017-07-31 17:50:30 -07:00
David Kelly	b371c875c4	undo tab mapping to bring up tablet, for now	2017-07-31 14:46:26 -07:00
David Kelly	43c8079f03	temporary inspectionMode setting to turn ContextOverlays completely off/on	2017-07-31 13:55:43 -07:00
David Kelly	bd7c4b3b26	Merge remote-tracking branch 'upstream/master' into context-overlays	2017-07-31 13:14:53 -07:00