2732 commits

Author	SHA1	Message	Date
David Rowe	f88191b7b3	Merge branch 'master' into vr-edit-a	2017-08-08 16:43:20 +12:00
Dante Ruiz	38db4a6f47	fixed create spinner not appearing	2017-08-07 20:03:55 +01:00
Chris Collins	4acccb6ace	Merge pull request #11118 from cain-kilgore/chat-char-limit ... WL 21493 - Update the Chat.js to indicate when a message is too long	2017-08-07 09:52:57 -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	f898a05014	Merge pull request #11122 from ElderOrb/case6760 ... fix for 6760: Create Mode turns to Portrait when Reopening tablet	2017-08-06 19:02:47 -07:00
David Rowe	5d1732c5aa	Merge branch 'master' into vr-edit-a	2017-08-05 20:45:12 +12:00
beholder	06c9378b03	fix for 6760: Create Mode turns to Portrait when Reopening tablet	2017-08-05 04:07:04 +03:00
anshuman64	22afb25d44	Capitalize "ENTER VR"	2017-08-04 17:19:26 -07:00
Elisa Lupin-Jimenez	c2cb7573c5	Removed commented out blocks code	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	9d2be28a8a	troubleshooting Blocks injection	2017-08-04 16:58:15 -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
Cain Kilgore	f79a8b3cb5	Merge branch 'master' of https://github.com/highfidelity/hifi into chat-char-limit	2017-08-04 23:34:44 +01: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 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
Howard Stearns	71ce5a6494	Merge pull request #11016 from highfidelity/context-overlays ... Context Overlays	2017-08-03 16:28:14 -07:00
David Rowe	e2dccc1420	Merge branch 'master' into vr-edit-a	2017-08-04 07:33:18 +12:00
David Kelly	4b7779f0f5	add flag to outline render flags, fix pal.js/edit.js interaction	2017-08-03 07:57:21 -07:00
Brad Hefta-Gaub	0f73496a44	Merge pull request #11055 from misslivirose/fix-chat-bubble-length ... Fix chat bubble length	2017-08-02 23:29:09 -07:00
vladest	638eeede43	Merge conflict	2017-08-02 20:07:06 +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
Anthony J. Thibault	1b6feb63c8	Fix for crash when attempting to teleport while avatar was loading ... The fix had two parts. * Make Avatar::getAbsoluteDefaultJointXXXInObjectFrame thread safe * Make teleport.js handle a zero foot offset more gracefully, to prevent the avatar from teleporting into the floor.	2017-08-01 18:40:43 -07:00
David Kelly	6ae516c46a	Merge remote-tracking branch 'upstream/context-overlays' into contextOverlays_renderMOde	2017-08-01 15:45:34 -07:00
Seth Alves	b9456ab7b6	Merge pull request #11081 from Menithal/21464 ... Fixed Particle Editor Update event	2017-08-01 15:11:33 -07:00
Seth Alves	184c3d855d	Merge pull request #11061 from TurnMeUp-OG/21470 ... Fix tablet focus issue when property menu is open and field is selected	2017-08-01 15:10:26 -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
David Kelly	bd7c4b3b26	Merge remote-tracking branch 'upstream/master' into context-overlays	2017-07-31 13:14:53 -07:00
Menithal	6020154867	Removed some whitespaces to trigger new build	2017-07-31 22:49:11 +03:00
Liv Erickson	ed9ea17917	remove semi-colon	2017-07-31 08:02:18 -07:00
Matti Lahtinen	5fab6c37a3	Removed stray variable test	2017-07-31 08:56:04 +03:00
Menithal	734330dc06	Fixed Particle Editor Update event ... Particle Editor was agressively refreshing when ever a particle was be ing up dated Added a flag check to make sure the particle was always using the latest version	2017-07-29 15:48:31 +03:00
David Rowe	52bb4a0f77	Merge branch 'master' into vr-edit-a	2017-07-27 20:37:46 +12:00
Chris Collins	ef67029837	Merge pull request #10912 from amvmoody/21374 ... WL 21374: Allow lights/particles to be dragged by icon	2017-07-26 22:07:36 -07:00
Zach Fox	8a7561d61b	IT'S WORKING SOB SOB SOB	2017-07-26 16:35:55 -07:00
Zach Fox	39cb0bc357	WHYYYY DOESN'T THIS WORK	2017-07-26 16:14:35 -07:00
Zach Fox	1336a59b6c	Stupid bracket	2017-07-26 15:14:58 -07:00
Zach Fox	17c7e38fce	Bugfixes?	2017-07-26 15:02:52 -07:00
Zach Fox	3a05219c59	Closer still	2017-07-26 14:10:41 -07:00
Liv	256853f79b	syntax and clarification on magic number 2 as half height	2017-07-26 13:28:52 -07:00
Liv	5bd6dac66c	wrap text if longer than 1m text entity	2017-07-26 13:24:56 -07:00
Zach Fox	65c28ca821	Bugfixes	2017-07-26 13:17:51 -07:00
Zach Fox	9147bc21d0	Getting there.	2017-07-26 11:41:27 -07:00
utkarshgautamnyu	71ddf1e7c1	Removed Compound Collision type	2017-07-26 10:20:17 -07:00
scromie@turnmeupgames.com	33ff5917be	fix	2017-07-26 19:34:20 +03:00
Zach Fox	9020607ccf	First pass	2017-07-25 17:54:46 -07:00
utkarshgautamnyu	65192aa620	added additional collision types to asset browser and new model dialog	2017-07-25 17:12:13 -07:00