452 commits

Author	SHA1	Message	Date
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
Philip Rosedale	5c564cb2cb	Added FWD button as grab controller (so PrioVR will work)	2014-05-22 09:55:08 -07:00
Philip Rosedale	f0a1d2a172	Move with grab button	2014-05-22 07:24:30 -07:00
Brad Hefta-Gaub	0c3f574302	Merge pull request #2890 from Atlante45/no_voxel_tool_selected ... Made voxelTools unselected by default to avoid accidental voxelEdit at l...	2014-05-21 11:01:31 -07:00
Atlante45	9b3b5201c9	Made voxelTools unselected by default to avoid accidental voxelEdit at login	2014-05-21 10:39:26 -07:00
Brad Hefta-Gaub	6bb4664611	Merge pull request #2884 from polac/19521 ... Code Review for Job #19521	2014-05-20 17:02:30 -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
Mika Impola	cc1bd5d63b	Fixed cropping of the image.	2014-05-17 21:24:29 +03:00
Mika Impola	fd3e871242	Updating button position when window is resized.	2014-05-17 21:04:27 +03:00
Atlante45	0edcd732fe	Added rotation and scale to overlay anchers	2014-05-16 17:36:27 -07:00
Philip Rosedale	5dcd942e8e	removed dead code	2014-05-16 09:44:03 -07:00
Philip Rosedale	4532c93419	debug off	2014-05-16 09:36:55 -07:00
Philip Rosedale	25f1e180f5	revert test change	2014-05-16 09:34:54 -07:00
Philip Rosedale	85b94ff71c	added dead zone to pitch in hydra move, animated models show up where you are	2014-05-16 09:20:15 -07:00
Philip Rosedale	ad4556ab56	Merge branch 'master' of https://github.com/worklist/hifi	2014-05-15 21:58:09 -07:00
Atlante45	61fd09e0bd	Add ability to anchor an overlay	2014-05-15 16:24:31 -07:00
Mika Impola	aac73c3665	Script to make your avatar sit down.	2014-05-15 21:44:45 +03:00
Philip Rosedale	951109594e	Merge branch 'master' of https://github.com/worklist/hifi	2014-05-15 09:29:01 -07:00
Philip Rosedale	ca6571188c	Merge branch 'master' of https://github.com/worklist/hifi	2014-05-14 14:02:17 -07:00
ZappoMan	0a8dc78c96	tweaks to animation script example	2014-05-14 13:08:32 -07:00
ZappoMan	7c44162209	animated model example	2014-05-14 13:00:35 -07:00
ZappoMan	18de6dddec	Merge branch 'master' of https://github.com/worklist/hifi into modelserver	2014-05-14 12:21:44 -07:00
Atlante45	53d7aeab4f	Fixed typo	2014-05-14 12:02:38 -07:00
Philip Rosedale	4732cbb575	Merge branch 'master' of https://github.com/worklist/hifi	2014-05-14 11:54:17 -07:00
Philip Rosedale	394985ef45	Switched to Halo gun in gun.js, work in progress on hydraMove to add flying	2014-05-14 11:52:01 -07:00
Atlante45	4f93858849	Merge branch 'master' of https://github.com/highfidelity/hifi into mouse_handling_in_editModels	2014-05-14 10:41:29 -07:00
Atlante45	5ef71d6a35	Full mouse handling	2014-05-14 10:40:50 -07:00
Ryan Huffman	dca555a8d4	Merge branch 'master' of git://github.com/highfidelity/hifi into 19614	2014-05-14 09:58:59 -07:00
Ryan Huffman	02676848c6	Fix order of components in streetAreaExample.js	2014-05-14 09:58:04 -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
ZappoMan	a56567a369	add support for adjustable FPS	2014-05-13 09:27:31 -07:00
Atlante45	37700c6ad3	Fixed prompt size	2014-05-12 17:10:19 -07:00
Atlante45	261eefd05b	Merge branch 'master' of https://github.com/highfidelity/hifi into mouse_handling_in_editModels	2014-05-12 14:09:26 -07:00
ZappoMan	5309c5ad8b	add more properties to animated models	2014-05-12 13:44:44 -07:00
ZappoMan	ed6f828b36	Merge branch 'master' of https://github.com/worklist/hifi into modelserver	2014-05-12 09:14:04 -07:00
Philip Rosedale	ea1bcd13a4	Updated guitar with more chords, key triggers	2014-05-09 17:39:03 -07:00
ZappoMan	106c8bffd8	first cut at animations in models	2014-05-09 16:08:06 -07:00
Atlante45	05283cd904	Merge branch 'master' of https://github.com/highfidelity/hifi into mouse_handling_in_editModels	2014-05-09 11:43:33 -07:00
Philip Rosedale	a7f44bf207	double fisted gun action	2014-05-09 00:16:11 -07:00
Philip Rosedale	4a1672957e	guitar is now auto-attached	2014-05-08 23:23:44 -07:00
Philip Rosedale	95f6bcbbd6	finish air guitar, gun initial position on hand tweak	2014-05-08 22:54:35 -07:00
Atlante45	cd78be7d25	Some work on mouse tools for editModels.js	2014-05-08 16:47:18 -07:00
Andrzej Kapolka	c02b708ee5	Provide the option to avoid making duplicate attachments.	2014-05-08 15:54:30 -07:00
Brad Hefta-Gaub	9c54576aca	Merge pull request #2814 from PhilipRosedale/master ... More arrow controls to move camera in mirror mode, new guitar chords	2014-05-07 20:02:28 -07:00