72 commits

Author	SHA1	Message	Date
Seth Alves	72ebae72c0	allow adding entities with model urls that end in .obj	2015-03-07 20:22:32 -08:00
Ryan Huffman	9247ccd7b3	Remove ExportMenu.js and ModelImporter.js	2015-03-05 13:55:22 -08:00
Ryan Huffman	08b905095d	Remove Paste Models and rename Import/Export to Entities	2015-03-05 13:54:27 -08:00
Ryan Huffman	a2617b2c96	Update editEntities import/export	2015-03-05 13:52:59 -08:00
Ryan Huffman	26e3b331ee	Update editEntities.js lock checking to use event instead of polling	2015-03-02 10:42:09 -08:00
Ryan Huffman	0638459052	Add permission-checking to edit entities	2015-03-02 09:51:41 -08:00
Ryan Huffman	3c5f11e6ed	Add initial support for multi-selection in properties window	2015-02-26 14:23:11 -08:00
Ryan Huffman	c9818c184a	Update editEntities to turn off when switching domains	2015-02-24 10:47:55 -08:00
Ryan Huffman	97e70920ce	Move handling of add model buttons to mouseRelease	2015-02-17 08:23:39 -08:00
Ryan Huffman	d1f7a730ad	Make add-model button non-selectable	2015-02-17 08:23:11 -08:00
Brad Hefta-Gaub	f6ff0665ca	Merge pull request #4286 from huffman/fix-nat-dims ... Fix "reset to natural dimensions" when dimensions not known	2015-02-13 16:31:34 -08:00
Ryan Huffman	2df850eb8d	Fix natural dimensions check	2015-02-13 15:02:16 -08:00
Ryan Huffman	0495833ca6	Disallow entity models to be reset to natural dimensions if unknown	2015-02-13 15:00:37 -08:00
Brad Hefta-Gaub	59b2c38eb1	Merge pull request #4277 from huffman/fix-select-box ... Update editEntities to not select new entity when edit tools are off	2015-02-13 10:50:11 -08:00
Ryan Huffman	a3d09e6adc	Fix edit grid not showing up	2015-02-12 13:18:58 -08:00
Ryan Huffman	51ce8c7100	Update editEntities to not select new entity when edit tools are off	2015-02-12 13:09:37 -08:00
Andrew Meadows	5bb504ad55	Merge pull request #4268 from huffman/remove-upload-model ... Remove upload from file from editEntities.js	2015-02-12 08:57:22 -08:00
Ryan Huffman	957686e12e	Remove upload from file from editEntities.js	2015-02-11 09:04:56 -08:00
Ryan Huffman	6eca8610b6	Increase entity-resize timeout to 2 minutes	2015-02-10 15:54:04 -08:00
Ryan Huffman	9997ef1b97	Increase size of text entity	2015-02-10 14:23:00 -08:00
Ryan Huffman	1e11e658a8	Update drag/drop distance to be based on cameraManager.enabled rather than camera mode	2015-02-05 10:18:34 -08:00
Ryan Huffman	2343da0a8a	Update drag/drop distance while in non-independent mode	2015-02-05 10:16:51 -08:00
Ryan Huffman	41720dbc4b	Add drag-drop functionality for placing entities	2015-02-05 10:07:31 -08:00
Ryan Huffman	efed79d76c	Update the default properties for text entities	2015-02-04 13:37:11 -08:00
Ryan Huffman	36238bb5df	Update editEntities to use left click for select	2015-02-04 10:43:55 -08:00
Ryan Huffman	09752589b8	Reenable on/off button	2015-02-04 10:43:28 -08:00
Ryan Huffman	4fbc7a5dcd	Add focus easing and auto-focus to menu and settings	2015-02-04 10:42:01 -08:00
Ryan Huffman	01a00b5127	Disable editEntities always-on	2015-02-04 10:40:50 -08:00
Ryan Huffman	e2b6be2a92	Fix focus behavior when selecting an item without shift	2015-02-03 11:58:39 -08:00
Ryan Huffman	7f0fdbe23e	Make auto-focus in editEntities always use ease-on-focus	2015-02-03 11:50:58 -08:00
Ryan Huffman	814d585086	Make the entity list always visible	2015-02-03 11:44:38 -08:00
Ryan Huffman	ba5a96f541	Add Window.setFocus	2015-02-03 11:44:22 -08:00
Ryan Huffman	a98829ed8a	Fix editEntities.js automatically turning on	2015-01-30 13:12:00 -08:00
Ryan Huffman	0d1488e44f	Fix editEntities.js includes	2015-01-30 10:03:37 -08:00
Ryan Huffman	77c78689d1	Merge branch 'master' of github.com:highfidelity/hifi into edit-always-on	2015-01-30 09:28:09 -08:00
Ryan Huffman	cddce8f795	Update editEntities to always be on + use right click for select	2015-01-30 09:21:27 -08:00
Ryan Huffman	5d8825f5eb	Remove call to gridTool.mousePressEvent	2015-01-30 08:56:37 -08:00
Ryan Huffman	d06d8b8f01	Merge branch 'master' of github.com:highfidelity/hifi into revert-grid ... Conflicts: examples/libraries/gridTool.js	2015-01-29 17:27:58 -08:00
Ryan Huffman	eb69720af4	Update when grid tool window is shown	2015-01-29 16:58:48 -08:00
Brad Hefta-Gaub	f5e092c0d2	Merge pull request #4187 from huffman/parallel-script-loading ... Parallel script loading	2015-01-29 13:26:37 -08:00
Ryan Huffman	a775476cfa	Remove editEntities move-by-arrow-key completely	2015-01-28 12:21:50 -08:00
Ryan Huffman	135c8c1bdf	Disable move entity by arrows	2015-01-28 12:19:54 -08:00
Ryan Huffman	5633be0e92	Add ability to move orbit camera using keys	2015-01-28 12:19:42 -08:00
Ryan Huffman	e1ca6d5048	Disable editentities auto-off when moving avatar	2015-01-28 12:16:28 -08:00
Ryan Huffman	1ba398c0e3	Remove blank line	2015-01-27 15:57:27 -08:00
Ryan Huffman	defb796c1e	Update editEntities to auto-focus on selection	2015-01-27 15:56:24 -08:00
Ryan Huffman	4fd5f74365	Update editEntities.js to load includes in parallel	2015-01-22 14:14:49 -08:00
Ryan Huffman	3a287a08ab	Fix removal of entity list menu item	2015-01-20 12:43:49 -08:00
Ryan Huffman	891f6fa513	Move entity list to edit menu	2015-01-20 12:40:16 -08:00
Ryan Huffman	8202c84c79	Add entity list menu option	2015-01-20 12:37:39 -08:00