79 commits

Author	SHA1	Message	Date
Atlante45	74edf6557f	turn off editModels by default	2014-08-04 12:05:31 -07:00
Brad Hefta-Gaub	211bed946f	Merge pull request #3232 from huffman/19783 ... Code Review for Job #19783	2014-08-01 16:34:50 -07:00
Ryan Huffman	054e832cf8	Fix misspelled variable names	2014-07-31 11:32:17 -07:00
Ryan Huffman	a670889ffb	Remove TODO comment	2014-07-31 10:44:36 -07:00
Ryan Huffman	85ed18fd41	Cleanup editModels.js	2014-07-31 10:43:44 -07:00
Ryan Huffman	3e2bb0f168	Add more complete error handling for import/export models	2014-07-31 10:40:45 -07:00
Ryan Huffman	6ecc12cdea	Fix export models not cancelling correctly	2014-07-31 01:11:05 -07:00
Ryan Huffman	6a53765a47	Rename buttons in editModels.js	2014-07-30 19:06:23 -07:00
Ryan Huffman	06e6505584	Update and add localModels overlay to editModels.js import/export	2014-07-30 18:39:44 -07:00
Atlante45	844e5d7e47	Merge branch 'master' of https://github.com/highfidelity/hifi into add_start_stop_animation_for_scripted_avatar ... Conflicts: assignment-client/src/Agent.cpp examples/editModels.js	2014-07-28 10:11:39 -07:00
Atlante45	b5dd9141a3	Fix the double entries in models' browsers	2014-07-25 16:12:40 -07:00
Ryan Huffman	d777e4be53	Merge branch 'master' of git://github.com/highfidelity/hifi into 19783 ... Conflicts: interface/src/scripting/WindowScriptingInterface.cpp interface/src/scripting/WindowScriptingInterface.h	2014-07-25 15:53:36 -07:00
Atlante45	f7c675f3e6	CR missing index++	2014-07-25 11:35:25 -07:00
Atlante45	0d039b1cdb	Fixed invokeMethod bug + removed debug	2014-07-23 14:38:37 -07:00
Atlante45	d4199e6092	Edit properties tweaks	2014-07-23 13:59:21 -07:00
Atlante45	c07ba9fec5	Added browser as a tool	2014-07-17 17:50:56 -07:00
Atlante45	7ab8b5a843	Added S3 browser	2014-07-17 17:12:54 -07:00
Atlante45	60f242118e	Code cleanup	2014-07-16 11:52:12 -07:00
Atlante45	f960b4fff3	new windows JS interface	2014-07-16 11:32:18 -07:00
Ryan Huffman	874b542c0c	Add import/export/paste model functionality to editModels.js	2014-07-09 04:13:53 -07:00
barnold1953	bf2959675f	First pass at laser oculus UI pointer	2014-07-03 16:09:54 -07:00
Atlante45	cce6132a07	Add sitting points to the model properties display	2014-06-25 11:50:30 -07:00
Atlante45	266dc6be3e	fixed tooltip not disapearing when deleting model	2014-06-19 18:09:17 -07:00
Atlante45	4a4efb0bfa	Don't glow models if you can't grab it	2014-06-19 11:11:08 -07:00
Atlante45	676141024a	Added angular size limit to hydras too.	2014-06-19 10:46:06 -07:00
Atlante45	641b9e8253	Set minimum angular size too model selection	2014-06-19 10:43:25 -07:00
Atlante45	900024eefe	More intuitive rotation UI	2014-06-18 14:22:46 -07:00
ZappoMan	ed32ca721a	fix bug	2014-06-18 12:19:01 -07:00
Clément Brisset	7597191081	Merge pull request #3042 from ZappoMan/editModelFeatures ... add support for changing the model URL of a model	2014-06-18 11:52:01 -07:00
ZappoMan	26075d9d26	add support for changing the model URL of a model	2014-06-18 11:29:56 -07:00
Atlante45	97dd695213	if model takes too much angular size, don't select it	2014-06-17 18:32:45 -07:00
Atlante45	4467ee266d	Added snapped/smoothed rotation for models + tooltip	2014-06-17 17:19:16 -07:00
Atlante45	b3b3a72946	Disable editModels.js mouse events when ALT is pressed. (no conflict with inspect.js)	2014-06-16 10:55:34 -07:00
Atlante45	69adf8d0dd	Removed extra debug, fix model jumping when releasing one of the two triggers.	2014-06-06 11:19:43 -07:00
Atlante45	9322e1f71b	More work on editModels	2014-06-05 17:36:56 -07:00
Atlante45	145a159233	Slight glow on laser intersection	2014-06-05 15:45:25 -07:00
Atlante45	79092e3e81	editModels now has 2 modes	2014-06-04 14:18:28 -07:00
Atlante45	15863198d1	change editModels icon	2014-06-04 13:52:31 -07:00
Atlante45	9ea53f8070	some testing with editModels	2014-06-04 11:38:46 -07:00
ZappoMan	cad5e12aad	make editVoxels.js and editModels.js play nice together with the delete menu item	2014-05-31 14:05:05 -07:00
ZappoMan	f92facea76	changed Models/Delete and Voxels/Delete to both use same menu item name of 'Delete' so that either option will correctly delete either.	2014-05-31 13:30:45 -07:00
Brad Hefta-Gaub	a257af76dc	Merge pull request #2966 from Atlante45/grab_attachements ... First pass at grabbing attachment	2014-05-30 19:46:03 -07:00
Atlante45	4ffd51d9c4	First pass at grabbing attachment	2014-05-30 18:40:50 -07:00
Andrzej Kapolka	be9703d46f	Merge pull request #2958 from Atlante45/click_drag_attach ... Update joints list everytime I try to attach	2014-05-30 14:15:43 -07:00
Atlante45	0b31971592	Update joints list everytime I try to attach	2014-05-30 10:42:54 -07:00
Brad Hefta-Gaub	c3b87504d9	Merge pull request #2957 from Atlante45/fix_for_editModel ... Fixed JS parse error	2014-05-30 10:24:54 -07:00
Atlante45	a7f10798b2	Fixed JS parse error	2014-05-30 10:23:36 -07:00
Atlante45	17e3bd6110	CR comments	2014-05-29 18:24:21 -07:00
Atlante45	b89d0a292c	code cleanup	2014-05-29 15:56:46 -07:00
Atlante45	fd0c195132	Code cleanup	2014-05-29 15:55:17 -07:00