295 commits

Author	SHA1	Message	Date
Marcus Llewellyn	f5fcb90cac	Revert "Removed obsolete default scripts + more branding changes."	2020-01-16 18:51:49 -06:00
Kasen IO	336b5e275b	Removed obsolete default scripts + more branding changes.	2020-01-12 23:13:01 -05:00
Simon Walton	6e23924ed9	Add screenshare zone-property - WIP	2019-11-25 13:22:35 -08:00
Shannon Romano	a5943f8ac8	Merge pull request #16443 from ctrlaltdavid/DEV-2646 ... DEV-2646: Use Alt to clone entities on Mac	2019-11-19 14:02:10 -08:00
milad	2fc0f01928	added natural dimensions after loading	2019-11-15 15:16:09 -08:00
milad	87adae6c6f	cr	2019-11-15 12:48:32 -08:00
MiladNazeri	481e239a37	Update scripts/system/create/edit.js ... Co-Authored-By: Zach Fox <fox@highfidelity.com>	2019-11-15 12:43:25 -08:00
milad	4ae3c67493	added Entities.isLoaded	2019-11-15 11:45:05 -08:00
David Rowe	7fbc9f5c5c	emove the "acceleration" entity property from the Create app	2019-11-15 12:11:15 +13:00
David Rowe	45eda40466	Enable Alt action for cloning on Mac	2019-11-13 10:48:08 +13:00
Shannon Romano	895619c71f	Merge pull request #16461 from ctrlaltdavid/DEV-2649 ... DEV-2649: Fix entities list "filter to frustum" eye button	2019-11-08 10:28:24 -08:00
Shannon Romano	79df071c23	Merge pull request #16468 from RebeccaStankus/webEntities ... Made web entities not grabbable by default	2019-11-08 10:27:44 -08:00
Sabrina Shanman	9180a639df	Merge pull request #16440 from ctrlaltdavid/DEV-2648 ... DEV-2648: Fix Cmd-click multi-select in entity list on Mac	2019-11-07 14:06:39 -08:00
Sabrina Shanman	deceb16a9b	Merge pull request #16451 from ctrlaltdavid/DEV-2650 ... DEV-2650: Remove "user" icon from Entities List	2019-11-07 13:59:28 -08:00
Rebecca Stankus	4173cc46e2	Made web entities not grabbable by default	2019-11-06 14:11:17 -08:00
Zach Fox	a2f784d225	DEV-2695: Update Zone Haze floor and ceiling mins and maxes in the UI	2019-11-06 11:26:10 -08:00
David Rowe	eeceec35d6	Fix entities list "filter to frustum" button	2019-11-06 12:22:45 +13:00
David Rowe	5fb18566fe	Use Alt to clone entities on Mac	2019-11-06 09:55:16 +13:00
David Rowe	a8173e9477	Remove "user" icon from Entity List	2019-11-05 13:55:31 +13:00
David Rowe	7db99cce6b	Fix Cmd-clone entities on Mac	2019-11-02 12:07:11 +13:00
David Rowe	4e12750255	Typo	2019-11-02 11:00:16 +13:00
David Rowe	3bb65edafb	Fix Cmd-click multi-select in entity list on Mac	2019-11-02 09:51:21 +13:00
Zach Fox	3f00c524fb	DEV-2379: Modify Shadow-related tooltips in Create	2019-10-10 11:47:40 -07:00
Ryan Huffman	8b2c935f92	Merge pull request #15921 from ctrlaltdavid/ctrl-duplicate ... Make Create app use Ctrl key to duplicate entities instead of Alt	2019-07-23 08:52:22 -07:00
David Rowe	f2d591dbe9	Take no action if Alt is pressed at mouse-down	2019-07-12 21:28:44 +12:00
David Rowe	db1137fa0f	Use Ctrl to duplicate entities instead of Alt	2019-07-12 21:27:33 +12:00
SamGondelman	6ce809fb2a	merge with master	2019-07-11 09:01:30 -07:00
Zach Fox	4dfbc489e8	Merge branch 'master' of github.com:highfidelity/hifi into SUI/emoteAppPrototype	2019-07-09 15:40:16 -07:00
SamGondelman	29dbbc49ad	Merge remote-tracking branch 'upstream/master' into bias	2019-07-09 15:38:13 -07:00
RebeccaStankus	714a3f6b08	Fixed path to tabletAssetServer in HMD, simplifiedUI system folder	2019-07-09 13:02:54 -07:00
Zach Fox	d622e53458	Some comments; changed the code to be backwards compatible	2019-07-08 17:10:11 -07:00
RebeccaStankus	352f9590b1	Fixed Qt.resolvedUrl format	2019-07-05 16:23:29 -07:00
SamGondelman	72f52b069e	cleanup, fix shadow qml	2019-07-03 16:21:47 -07:00
Sam Gondelman	0d9f639331	Merge branch 'master' into bias	2019-07-03 10:20:16 -07:00
SamGondelman	692c776be5	expose shadow bias and max distance wip	2019-07-02 15:18:28 -07:00
SamGondelman	fa416adaf6	adding unlit property to text, fixing transparency, normals, other cleanup	2019-07-02 10:28:36 -07:00
RebeccaStankus	d8daee49a8	Fixed bad path to gridControls	2019-06-25 16:31:21 -07:00
RebeccaStankus	e9777dc40f	Merge branch 'master' of github.com:highfidelity/hifi into create	2019-06-25 09:28:43 -07:00
RebeccaStankus	6aca2fcf07	Working on new file structure	2019-06-24 14:01:51 -07:00
RebeccaStankus	e7cec0f11f	Fixed dialogs imports	2019-06-20 15:07:39 -07:00
RebeccaStankus	f5fa44dc21	Revert "Changed icons path to be relative" ... This reverts commit e277070423.	2019-06-19 12:06:34 -07:00
RebeccaStankus	e277070423	Changed icons path to be relative	2019-06-19 11:17:52 -07:00
RebeccaStankus	30dd667b17	Changed qml import method	2019-06-19 10:40:32 -07:00
RebeccaStankus	3b53e34c95	fixing paths	2019-06-18 11:35:00 -07:00
RebeccaStankus	5a49ac9a22	moved files	2019-06-17 16:45:54 -07:00