59 commits

Author	SHA1	Message	Date
ZappoMan	a019b70e58	Merge branch 'master' of https://github.com/worklist/hifi into experimentalStoreModel ... Conflicts: tests/octree/CMakeLists.txt tests/octree/src/ModelTests.cpp tests/octree/src/main.cpp	2014-06-24 15:59:17 -07:00
Atlante45	266dc6be3e	fixed tooltip not disapearing when deleting model	2014-06-19 18:09:17 -07:00
ZappoMan	fb34d13305	more work on optimized storeModel()	2014-06-19 14:30:44 -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
Atlante45	c7b636365c	Don't attach to joints in range when I grab	2014-05-29 15:50:23 -07:00
Atlante45	980e873a13	Better prints in editModels	2014-05-29 15:02:09 -07:00
Atlante45	b34453647b	editModels click/drag/attach tweaks	2014-05-29 14:34:10 -07:00
Atlante45	372ddc92fd	Added attaching of model to MyAvatar when close enough	2014-05-28 16:00:37 -07:00
Atlante45	285bd0d2f2	Switched to findRayIntersection	2014-05-27 15:50:39 -07:00
Atlante45	37a939588f	Mode sure the closest model is always selected	2014-05-23 11:28:48 -07:00
Atlante45	53141ff1c1	Glow when grabbed with the mouse (for now)	2014-05-23 11:10:56 -07:00
ZappoMan	519f5539d9	also support deleting mouse selected model	2014-05-22 14:37:34 -07:00
ZappoMan	b5056dcd3a	fix broken mouse edit	2014-05-22 13:01:02 -07:00
ZappoMan	66b9d582a8	fix broken mouse edit	2014-05-22 12:43:23 -07:00
ZappoMan	b9e73a6ef7	added delete support to edit models	2014-05-22 12:23:01 -07:00
ZappoMan	b228da34a5	slight DRY	2014-05-18 20:43:27 -07:00
ZappoMan	31ae7ceaff	added isLocked() to lock the ground plane in hq	2014-05-18 20:31:55 -07:00
Atlante45	0edcd732fe	Added rotation and scale to overlay anchers	2014-05-16 17:36:27 -07:00
Atlante45	61fd09e0bd	Add ability to anchor an overlay	2014-05-15 16:24:31 -07:00
Atlante45	5ef71d6a35	Full mouse handling	2014-05-14 10:40:50 -07:00
Atlante45	624ae4732f	Fixes to PickRay check	2014-05-13 14:58:34 -07:00
Atlante45	701bc63bd1	Removed old toolbar	2014-05-13 14:34:08 -07:00
Atlante45	c59358ac96	First cut at editModels with the mouse	2014-05-13 14:10:01 -07:00
Atlante45	37700c6ad3	Fixed prompt size	2014-05-12 17:10:19 -07:00