3586 commits

Author	SHA1	Message	Date
David Rowe	c79931106d	Add basic element of slider	2017-08-09 12:06:35 +12:00
David Rowe	28f9f9e4d0	Add a "Physics" button and panel	2017-08-09 11:02:33 +12:00
David Rowe	22432671ca	Fix newly created entity not being grabbed	2017-08-09 09:26:33 +12:00
David Rowe	046ce353fd	Fix highlight overlay getting deleted	2017-08-08 21:56:01 +12:00
David Rowe	42284796a1	Remember swatch colors	2017-08-08 21:44:54 +12:00
David Rowe	0b8ea29193	Clear swatch with grip click	2017-08-08 20:37:41 +12:00
David Rowe	f88191b7b3	Merge branch 'master' into vr-edit-a	2017-08-08 16:43:20 +12:00
David Rowe	6621b43fae	Make some swatches start with "no color"; color them when clicked	2017-08-08 16:34:45 +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
David Rowe	1231491a72	Add color picker	2017-08-07 17:29:58 +12: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
David Rowe	0f44e36128	Fix buttons sometimes staying pressed	2017-08-05 18:04:39 +12:00
David Rowe	4e87c13020	Tidy group buttons' enabling	2017-08-05 17:52:54 +12:00
David Rowe	bff3ad342d	Tidy command and callback handling	2017-08-05 17:37:40 +12:00
David Rowe	e6456ca501	Tidy and fix options handling	2017-08-05 17:08:56 +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
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	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
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
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
David Rowe	110355796c	Add delete tool	2017-08-04 08:55:43 +12:00
David Rowe	e2dccc1420	Merge branch 'master' into vr-edit-a	2017-08-04 07:33:18 +12:00
Andrew Meadows	e465186511	Merge pull request #11048 from 1P-Cusack/21389 ... WL21389 PR1: Representation of collision shapes need updating (details below).	2017-08-03 09:04:31 -07:00
David Kelly	4b7779f0f5	add flag to outline render flags, fix pal.js/edit.js interaction	2017-08-03 07:57:21 -07:00
David Rowe	e29bed7f07	Don't auto-grab if trigger fully pressed when laser starts intersecting	2017-08-03 20:26:21 +12:00
David Rowe	1ba658ee45	Implement grouping and ungrouping	2017-08-03 19:52:39 +12: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
David Rowe	1e1cb3a02e	Fix scale tool highlight color	2017-08-03 13:24:38 +12:00