156 commits

Author	SHA1	Message	Date
David Rowe	958c6f48c2	Maintain relative spacing among toolbars as the window is resized	2016-04-23 18:16:20 +12:00
David Rowe	3aec67bb36	Position default toolbar buttons bottom center of screen ... Expand edit toolbar horizontally.	2016-04-23 16:05:34 +12:00
David Rowe	7b9e6b52fb	Merge branch 'master' into 20872 ... Conflicts: interface/resources/qml/hifi/dialogs/RunningScripts.qml	2016-04-22 13:19:47 +12:00
Ryan Huffman	712c0bdf9d	Update 'model' icon in edit.js	2016-04-20 10:00:38 -07:00
David Rowe	c7f5b356bb	Fix entity not being highlighted in list when created	2016-04-15 17:18:04 +12:00
David Rowe	bda2f455e5	Add buttons to entities list that toggle locked and visible	2016-04-15 16:26:34 +12:00
David Rowe	f28b37481f	Fix only entity name being updated in entity list after an edit	2016-04-15 13:24:49 +12:00
James B. Pollack	ab7f8f27fe	clear stuff from edit	2016-04-12 16:22:53 -07:00
Brad Davis	ae82298e1b	Working on the App JS <-> HTML JS communication	2016-03-28 10:09:22 -07:00
David Rowe	ebe13b7b93	Fix edit toolbar's upload button	2016-03-17 14:44:57 +13:00
David Rowe	62b24e6626	Explicitly enable button-down behavior in scripts	2016-03-17 11:49:49 +13:00
David Rowe	3a28772729	Regularize toolbar margins and make draggable from all four sides	2016-03-16 10:29:26 +13:00
David Rowe	a5e0d93dd5	Update directory, edit, and marketplace toolbar buttons	2016-03-16 10:29:25 +13:00
David Rowe	3991c984a8	Remove voxels button from edit.js toolbar	2016-03-16 10:29:23 +13:00
Seth Alves	04e36f925a	use local message	2016-03-08 10:30:49 -08:00
Seth Alves	0b6f52f508	use local messaging to disable mouse-grab when edit.js is active	2016-03-08 10:27:34 -08:00
James B. Pollack	482964d8ad	hide this for now	2016-03-07 20:37:14 -08:00
PhilipRosedale	08eacc436f	Fixed rayPlane test again	2016-02-29 10:13:01 -08:00
PhilipRosedale	cee79c8274	Fixed bug in rayPlane test	2016-02-28 15:44:23 -08:00
PhilipRosedale	e9aed83920	suppress debug messages	2016-02-28 12:41:40 -08:00
PhilipRosedale	1d681a2461	Add angular size and azimuth limits to object XZ translation	2016-02-28 12:00:13 -08:00
PhilipRosedale	47504a068e	remove unused code	2016-02-26 16:58:38 -08:00
PhilipRosedale	7fd88793dc	drag relative to plane where pointer collided selection box	2016-02-26 16:58:17 -08:00
Zach Pomerantz	b68213f9bf	Reintroduce grid to edit.js	2016-02-18 15:48:25 -08:00
James B. Pollack	f2445e81e0	Merge pull request #7110 from ericrius1/particlesInEdit2 ... Particles in edit	2016-02-16 18:33:01 -08:00
ericrius1	ad43e4ff6d	Fixed multiple particle tabs appearing	2016-02-16 12:56:34 -08:00
ericrius1	46907f446b	Listening for page loaded event instead of set timeout === less lag	2016-02-16 11:42:01 -08:00
ericrius1	46679b29f7	particle tab deleted when particle system deleted	2016-02-16 11:11:58 -08:00
ericrius1	f98941e80f	switching between particle entities	2016-02-15 12:52:05 -08:00
ericrius1	85d8fc2944	particle image	2016-02-15 11:56:41 -08:00
Zach Pomerantz	b8e8859761	Remove image color in edit.js ... This removes the warning generated by ImageOverlay.qml for the unhandled property, color.	2016-02-15 11:51:11 -08:00
ericrius1	3adc88aa70	need to fix icon	2016-02-15 11:11:23 -08:00
ericrius1	e4d4044a2b	particleExplorer works in edit tab	2016-02-15 09:41:47 -08:00
ericrius1	b92c5555fe	Merge branch 'master' into particlesInEdit2	2016-02-15 09:14:37 -08:00
Bradley Austin Davis	c1d45b0c78	Remove declarative form creation from WindowScriptingInterface	2016-02-03 14:50:59 -08:00
Ryan Huffman	57d92bcfa6	Stop creation of GridTool altogether in edit.js	2016-02-02 10:13:24 -08:00
Ryan Huffman	dad36b73fc	Disable gridTool in edit.js	2016-02-02 09:57:52 -08:00
ericrius1	25d5904d2d	trying to destroy web window	2016-02-01 15:23:54 -08:00
ericrius1	0bd6d22611	going to destroy entire page and recreate	2016-02-01 14:46:09 -08:00
ericrius1	81f95c6fc7	better starting values for particles	2016-02-01 12:48:40 -08:00
ericrius1	84f862d9c1	receiving web event from particle gui	2016-02-01 12:23:39 -08:00
Ryan Huffman	9a2af26906	Fix 'Import Entities' causing error when cancelling	2016-01-29 14:12:27 -08:00
ericrius1	1a7887520d	in progress	2016-01-28 16:38:24 -08:00
ericrius1	804f82f2f1	good progress- can create particle entity from menu	2016-01-28 15:57:35 -08:00
ericrius1	2acc88261f	added particles	2016-01-28 13:14:36 -08:00
Andrew Meadows	73805e831b	zero velocities when entities cease to be dynamic	2016-01-25 14:05:48 -08:00
Brad Davis	ae6cba85e8	More atmosphere removal	2016-01-21 15:15:16 -08:00
Brad Davis	b6272b7824	Migrate tool window to overlay/QML	2016-01-13 15:40:37 -08:00
Brad Hefta-Gaub	ddd9b0826b	Merge pull request #6798 from ericrius1/menuTweaks ... separating out marketplace icon from edit toolbar and making directory icon from directory.js movable and persistent	2016-01-11 12:20:12 -08:00
ericrius1	7e7424ec2b	Removed marketplace icon from edit menu	2016-01-08 16:22:10 -08:00