44 commits

Author	SHA1	Message	Date
AndrewMeadows	d7234d5995	Merge pull request #3731 from ctrlaltdavid/20138 ... CR for Job #20138 - Repopulate example default models for "Upload URL" to better sized models	2014-11-04 11:08:47 -08:00
Ryan Huffman	2e8e31fce9	Update inspect tool behavior to pan correctly	2014-11-04 10:06:45 -08:00
Ryan Huffman	573e6f119f	Add entity camera options to settings	2014-11-04 10:06:17 -08:00
David Rowe	4fdc00948f	Repopulate example models in newEditEnties.js too	2014-11-04 09:39:37 -08:00
Ryan Huffman	fc977e21e6	Remove print statements	2014-11-04 09:14:14 -08:00
Ryan Huffman	a3fa1e4ce8	Merge branch 'master' of github.com:highfidelity/hifi into inspect-tool	2014-11-04 08:32:58 -08:00
Ryan Huffman	185b9ac545	Add Inspect tool to newEditEntities	2014-11-04 08:32:21 -08:00
AndrewMeadows	80a385b23a	Merge pull request #3710 from ZappoMan/lockAndMaterialProperties ... Improvements to Entities	2014-11-03 08:41:55 -08:00
ZappoMan	fecea5fe3c	fixes to the Model List feature in editModels.js and added it to new edit	2014-10-30 15:27:05 -07:00
Ryan Huffman	7ccacbd8ac	Remove old entity selection code and fix rotation bug	2014-10-30 14:57:23 -07:00
Ryan Huffman	e8f7c2c2ae	Fix issue with arrow keys moving objects when edit mode off	2014-10-29 11:20:19 -07:00
Brad Hefta-Gaub	caecf473ff	Merge pull request #3678 from huffman/entity-tool-fixes ... Entity tool updates and fixes	2014-10-28 15:24:21 -07:00
Ryan Huffman	af103b22ff	Remove extra print statements and whitespace	2014-10-28 13:42:40 -07:00
Ryan Huffman	76c3e9f483	Add support for undoing duplication and deletion commands	2014-10-28 13:42:02 -07:00
ZappoMan	8debb33c6a	default light properties	2014-10-28 12:44:57 -07:00
ZappoMan	c3cd733c2f	tweaks to edits for lights	2014-10-28 12:40:17 -07:00
Ryan Huffman	e21bf78d04	Remove cancel tool functionality	2014-10-28 11:21:26 -07:00
ZappoMan	7d2ef7923b	Merge branch 'master' of https://github.com/highfidelity/hifi into moreLightPropertiesAttempt2	2014-10-28 10:50:02 -07:00
Ryan Huffman	21b6a93fef	Add entity tool for movement using arrow keys	2014-10-28 10:12:17 -07:00
ZappoMan	5d7a0c2934	added light properties to edit tools	2014-10-27 14:34:43 -07:00
Ryan Huffman	e556886c72	Add entity copying and axis constraining to entity tools	2014-10-23 15:28:16 -07:00
Ryan Huffman	fde7b30501	Add Camera::modeUpdated()	2014-10-23 14:47:41 -07:00
Ryan Huffman	14555c4534	Add UndoStackScriptingInterface and support when editing entities	2014-10-22 14:54:04 -07:00
Ryan Huffman	0bda7699a6	Disable properties menu with multi-selection	2014-10-22 10:38:24 -07:00
Ryan Huffman	5b9806dc0d	Fix deletion with multi-selection	2014-10-22 10:37:17 -07:00
ZappoMan	2f9766e051	first cut at light entity	2014-10-22 08:41:31 -07:00
Ryan Huffman	d5c7c60553	Update entity edit tools ... Move editing functions into "tool" objects which contain onBegin, onMove, and onEnd functions. Add multi-selection Add local and world editing modes Fix XZ tool	2014-10-21 15:15:26 -07:00
Ryan Huffman	5139914ba9	Fix entity tools focus not always using latest entity position	2014-10-16 10:50:42 -07:00
Ryan Huffman	a05e2ea168	Add entityCameraTools.js	2014-10-14 13:15:28 -07:00
Ryan Huffman	f178de3b2e	Merge branch 'master' of github.com:highfidelity/hifi into entity-tools	2014-10-13 21:25:47 -07:00
Clément Brisset	f6f187e7f0	Merge pull request #3587 from ctrlaltdavid/20101 ... CR for Job #20101 - Upload model file function is broken	2014-10-13 16:16:49 -07:00
ZappoMan	2b6cd6d29a	add debugging for ryan's rotate problems	2014-10-13 11:33:06 -07:00
David Rowe	c6bf09f509	Fix model uploading for the case that haven't uploaded model before	2014-10-13 08:35:52 -07:00
ZappoMan	caac5881bf	correctly handle unselect and dont show highlight when other tool is active	2014-10-10 21:39:05 -07:00
ZappoMan	dfff16d9e8	make sure to not select other entities when clicking on a grab handle of a selected entity	2014-10-10 21:12:28 -07:00
Ryan Huffman	77890e4075	Add automatic resizing to natural dimensions in newEditEntities.js	2014-10-09 11:33:31 -07:00
ZappoMan	18f3a208f7	fix property edit dialog box	2014-10-08 19:29:07 -07:00
Leonardo Murillo	f0852ba283	Using new variable in all references to S3 bucket	2014-10-06 11:21:35 -06:00
ZappoMan	4ad10cb6cc	fix comment	2014-10-03 04:27:41 -07:00
ZappoMan	4af3968e01	move XZ translation into the selection tool so that it plays nice with stretchers	2014-10-03 03:03:48 -07:00
ZappoMan	370d01b1f5	implement up/down translation	2014-10-03 01:16:26 -07:00
ZappoMan	175e5d5f79	add ray picking to 3D overlays	2014-10-02 20:44:49 -07:00
ZappoMan	ab58a4e5b8	tweaks to translation, reduce redraws of selection handles	2014-10-02 17:58:18 -07:00
ZappoMan	4ed047cf98	first pass at newEditEntities.js	2014-10-02 15:15:52 -07:00