58294 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Brad Hefta-Gaub	95c28b2fa1	Merge pull request #11119 from highfidelity/anshuman64-entervr ... Capitalize "ENTER VR"	2017-08-04 18:03:20 -07:00
mukulHF	1ce1e29368	Update DesktopLetterboxMessage.qml	2017-08-04 17:44:43 -07:00
mukulHF	7aad4af533	Update LetterboxMessage.qml	2017-08-04 17:44:16 -07:00
anshuman64	22afb25d44	Capitalize "ENTER VR"	2017-08-04 17:19:26 -07:00
David Rowe	23fab65f27	Tidying	2017-08-05 12:08:36 +12:00
David Rowe	24f36c1ae5	Default current color and remember current color over tool/app toggles	2017-08-05 12:07:33 +12:00
Elisa Lupin-Jimenez	a246c59277	changed debug print for unsupported entity files	2017-08-04 16:59:21 -07:00
Elisa Lupin-Jimenez	af432087e3	small revisions to bracketing/variable name	2017-08-04 16:58:33 -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	c2cb7573c5	Removed commented out blocks code	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	9d2be28a8a	troubleshooting Blocks injection	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
Elisa Lupin-Jimenez	4570814145	Added Blocks to marketplace window	2017-08-04 16:56:30 -07:00
Elisa Lupin-Jimenez	a7dd6a5a41	Changed marketplaces message to be more discoverable	2017-08-04 16:56:30 -07:00
Anthony J. Thibault	98bbe887b9	Merge branch 'master' into feature/secondary-pose-support	2017-08-04 16:11:13 -07:00
Cain Kilgore	f79a8b3cb5	Merge branch 'master' of https://github.com/highfidelity/hifi into chat-char-limit	2017-08-04 23:34:44 +01:00
Brad Hefta-Gaub	cce0ba9596	Merge pull request #11043 from jherico/threaded_render_checkpoint ... Updates from Threaded Rendering project	2017-08-04 15:28:00 -07:00
Brad Davis	0e508432c4	PR comments	2017-08-04 15:27:33 -07:00
Cain Kilgore	c8ebc299f5	Limited Max Length of the Chat Box to 256 - as this exceeds Message. max.	2017-08-04 23:25:26 +01: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	8f98d0b7c8	Merge pull request #11114 from ElderOrb/case6677 ... 6677: Change "Desktop" App to Say "Exit VR"	2017-08-04 13:09:47 -07:00
beholder	d05e1677c3	6677: Change "Desktop" App to Say "Exit VR"	2017-08-04 23:04:15 +03: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
Dante Ruiz	9be60ee658	made more requested changes	2017-08-04 17:57:53 +01:00
Dante Ruiz	b72ac63662	Merge branch 'master' of github.com:highfidelity/hifi into bug-lock-default-scripts	2017-08-04 17:19:06 +01:00
vladest	9058a8e2ca	Cleanup top menu on menu reinstantiation	2017-08-04 16:36:00 +02:00
David Rowe	ceba5769e0	Apply color to entities when click them	2017-08-04 18:07:42 +12:00
David Rowe	75b481adab	Update icon color as current color is changed	2017-08-04 17:52:53 +12:00
David Rowe	d0143c2c19	Add color swatch buttons and "current color" circle	2017-08-04 17:33:00 +12:00
David Rowe	ed497afdc3	Add "Color" tool button, icon, and empty options panel	2017-08-04 14:08:57 +12:00
David Rowe	2237290b2e	Add labels to buttons	2017-08-04 13:22:48 +12:00
Anthony Thibault	732d0de48d	Merge pull request #10976 from humbletim/21446 ... WL 21446: Add doppleganger "move-as-you-move" roomscale functionality	2017-08-03 17:22:49 -07: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
seefo	67b5921079	Changed puck-attach to make tracked entities collisionless	2017-08-03 16:01:12 -07:00
seefo	498ac5d0ab	Updated version of puck-attach.js	2017-08-03 15:08:06 -07:00
David Rowe	4d8226ac02	Abstract out some common constants missing from the API	2017-08-04 09:23:40 +12:00
Chris Collins	ddb7d0f1ba	Merge pull request #11112 from kencooke/audio-gate-bugfix ... Possible fix for "screeching noise" after audio input device changes	2017-08-03 13:55:47 -07:00
David Rowe	110355796c	Add delete tool	2017-08-04 08:55:43 +12: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