4094 commits

Author	SHA1	Message	Date
David Rowe	f53f8c14fc	Update wrist tool icon	2017-09-23 11:34:57 +12:00
David Rowe	e0658c7a2f	Merge branch 'master' into vr-edit-a	2017-09-22 15:18:14 +12:00
David Rowe	e4a126461b	Add extra Create palette items	2017-09-22 10:53:06 +12:00
David Rowe	a757012c10	Change default color to 100% white	2017-09-22 08:17:35 +12:00
Seth Alves	61efaf7fc2	Merge pull request #11420 from druiz17/fix-parenting-overlay-module ... nearParentGrab module now sets the correct previous parent id when switching grabbed overlays from one hand to another	2017-09-21 09:44:07 -07:00
David Rowe	906595e4fa	Automatically return to Tools menu after grouping or ungrouping	2017-09-21 16:15:06 +12:00
David Rowe	c05ccd2ed5	Merge branch 'master' into vr-edit-a	2017-09-21 14:08:16 +12:00
Anthony Thibault	03e278c5ae	Merge pull request #11416 from druiz17/stylus-pos ... Pull back the stylus position in hand.	2017-09-20 17:40:22 -07:00
druiz17	2c55419c60	change tablet forward offset	2017-09-20 16:49:45 -07:00
Seth Alves	90c97319ea	Merge pull request #11408 from druiz17/fix-tablet-input ... fixing/improving and cleanup tablet inputs	2017-09-20 16:36:07 -07:00
druiz17	949c343604	fixing nearGrabParentModule switching grabbed overlays	2017-09-20 15:34:01 -07:00
Thijs Wenker	7ea1968b33	Tip, Code Writer which comes standard with Windows 10, does enter tabs by default when using the tab key. >=)	2017-09-20 14:59:15 -07:00
Thijs Wenker	60a566768a	removed debug spam from makeUserConnection, to reactivate it set Settings.setValue('MAKE_USER_CONNECTION_DEBUG', true); and reload the script	2017-09-20 14:39:13 -07:00
druiz17	92f3dfe2ab	move the stylus back a bit	2017-09-20 14:23:43 -07:00
druiz17	c20c5ee2b5	fixed tablet grabbing issue	2017-09-20 14:10:10 -07:00
druiz17	2ce6dcf89d	fixing spelling error	2017-09-20 11:45:42 -07:00
druiz17	5d87036f32	make changes requests and slight fixes	2017-09-20 11:41:31 -07:00
druiz17	e78d8bc132	tablet on wiki planet	2017-09-20 09:11:06 -07:00
druiz17	9c66a25d83	fixing and cleanup tablet inputs	2017-09-19 17:03:53 -07:00
David Rowe	41647305ed	Rename selection manager object to avoid name clash with new API object	2017-09-20 11:11:18 +12:00
David Rowe	c56fda88fa	Merge branch 'master' into vr-edit-a	2017-09-19 16:17:04 +12:00
druiz17	9df3b6c211	change tablet spawn position	2017-09-18 13:29:05 -07:00
Anthony J. Thibault	0757f513af	Merge branch 'master' into feature/ant-man	2017-09-18 11:36:39 -07:00
Seth Alves	765031bf89	Merge pull request #11377 from vladest/create_resize ... Add resizable flag. Use the flag for Create only	2017-09-16 11:14:40 -07:00
Seth Alves	095cd03ee2	Merge pull request #11380 from ctrlaltdavid/fix-controller-typos ... Fix typos in controller modules disabler	2017-09-16 11:13:15 -07:00
Seth Alves	4fcbaf6f4d	Merge pull request #11374 from sethalves/fix-grab-entity-methods ... fix grab entity methods + jshint cleanups	2017-09-16 11:11:13 -07:00
David Rowe	e788f691c4	Merge branch 'master' into vr-edit-a	2017-09-16 15:59:08 +12:00
David Rowe	6c5a1c0460	Address laser and controller interactions with HUD overlays and tablet	2017-09-16 15:45:44 +12:00
David Rowe	18b71f0c0f	Fix typos in controller modules disabler	2017-09-16 15:34:53 +12:00
vladest	de4f34aacb	Add resizable flag. Use the flag for Create only	2017-09-15 21:49:38 +02:00
Seth Alves	0816a8af27	fix grab entity methods	2017-09-15 12:07:50 -07:00
Seth Alves	b67c571aaa	fix grab entity methods	2017-09-15 12:05:49 -07:00
Anthony J. Thibault	3f6c88e77f	Avatar Attachments now render correctly ... * moved Avatar::fixupModelsInScene off the newly created render thread back to the main thread. * updated Avatar::postUpdate to take a scene pointer, necessary for Avatar::fixupModelsInScene * updated developer/tests/avatarAttachementTest.js to account for recent changes in avatar attachment scale, commit 712aff7ad. * updated initialization of anim graph to use Model::isLoaded() instead of Model::initWhenReady() to know when the model was completely loaded.	2017-09-15 11:23:09 -07:00
Seth Alves	df80b7ecfa	stopNearTrigger, not end	2017-09-15 11:16:54 -07:00
Seth Alves	39e6605f6f	fix grab entity methods + jshint cleanups	2017-09-15 10:50:46 -07:00
David Rowe	455db1ac82	Tighten up handle scaling to keep handle 1-1 with hand/laser	2017-09-15 19:11:04 +12:00
David Rowe	1f63425e9f	Don't kick particle effects when apply physics	2017-09-15 13:58:58 +12:00
David Rowe	4b63d8b7d9	Don't kick polylines when apply physics	2017-09-15 13:48:01 +12:00
David Rowe	f02d057a83	Fix not kicking off physics if hand is inside entity	2017-09-15 13:43:53 +12:00
Anthony J. Thibault	f534ee5ad9	laser offset fix	2017-09-14 16:37:45 -07:00
David Rowe	9da3ed0ceb	Emissive Create palette models	2017-09-15 11:24:33 +12:00
David Rowe	b0c951a2c4	Merge branch 'master' into vr-edit-a	2017-09-15 11:09:39 +12:00
David Rowe	c6af82dedc	Increase maximum number of undo levels to 1000	2017-09-15 09:55:14 +12:00
David Rowe	f1572a165a	Fix history crash	2017-09-15 09:54:55 +12:00
Thijs Wenker	af4bc59307	clone local avatar entities	2017-09-14 23:31:51 +02:00
David Rowe	378793d18e	Proper color circle	2017-09-15 08:48:47 +12:00
Anthony J. Thibault	7959988622	Merge branch 'master' into feature/ant-man	2017-09-14 10:37:45 -07:00
Anthony J. Thibault	7c725756f1	IPD Fixes for controllerDispatcher and controllerModules	2017-09-14 10:36:05 -07:00
David Rowe	f22e2de525	Interim method for disabling controllerDispatcher lasers, grabbing, etc.	2017-09-14 17:21:45 +12:00
David Rowe	299a8078e3	Revert handControllerGrab.js related changes	2017-09-14 17:08:26 +12:00