999 commits

Author	SHA1	Message	Date
Seth Alves	60895872ca	Merge pull request #11123 from vladest/attachment_speedup ... Remove snap to item. Add caching for scrolling speedup	2017-08-07 13:18:50 -07:00
Seth Alves	af1e27dc36	Merge pull request #11053 from hyperlogic/feature/secondary-pose-support ... Improved support for Vive Trackers on biceps	2017-08-07 13:11:48 -07:00
vladest	3a013bf86e	Remove snap to item. Add caching for scrolling speedup	2017-08-05 13:28:08 +02:00
Anthony J. Thibault	98bbe887b9	Merge branch 'master' into feature/secondary-pose-support	2017-08-04 16:11:13 -07:00
vladest	9058a8e2ca	Cleanup top menu on menu reinstantiation	2017-08-04 16:36:00 +02:00
vladest	b049b0f415	Merge conflicts	2017-08-03 19:43:42 +02:00
druiz17	6680be2a03	Merge pull request #11103 from vladest/fix_toolbar_apps_switch ... Fix toolbar apps switch	2017-08-02 12:59:31 -07:00
vladest	7d361c69c2	Audio mic bar show only rectangle on mouse over	2017-08-02 19:52:47 +02:00
vladest	4330e31212	Toolbar mode: 1. Fixed switching between different apps. 2. Fixed switching from Create	2017-08-02 16:32:09 +02:00
Anthony J. Thibault	2383933252	Merge branch 'master' into feature/secondary-pose-support	2017-07-31 10:55:40 -07:00
vladest	e30e0b1a5f	Make sure Tablet will be shown with opened running scripts dialog. Fixed potential stack corruption	2017-07-31 16:45:21 +02:00
utkarshgautamnyu	f407bf6f5a	Merge pull request #11064 from highfidelity/bug/6513 ... Enabled multiple selection and deletion in Asset Browser	2017-07-28 09:46:34 -07:00
Anthony J. Thibault	6c2b6674bb	load and save shoulderConfig to settings.	2017-07-27 17:33:54 -07:00
utkarshgautamnyu	1beec26003	Update TabletAssetServer.qml	2017-07-27 15:55:55 -07:00
utkarshgautamnyu	4680911264	Enabled multiple selection and multiple deletion in asset browser	2017-07-27 14:47:30 -07:00
Anthony J. Thibault	78c6564174	Merge branch 'master' into feature/secondary-pose-support	2017-07-27 09:09:32 -07:00
Anthony J. Thibault	8dc9714282	Pass armCircumference and shoulderWidth to qml.	2017-07-27 09:08:34 -07:00
utkarshgautamnyu	71ddf1e7c1	Removed Compound Collision type	2017-07-26 10:20:17 -07:00
utkarshgautamnyu	24f4468fd5	added additional collision types to asset browser in tablet mode	2017-07-25 17:12:13 -07:00
utkarshgautamnyu	65192aa620	added additional collision types to asset browser and new model dialog	2017-07-25 17:12:13 -07:00
Anthony J. Thibault	572213daaf	Added shoulder config to Controller Settings UI ... All offset values in Controller Settings UI are now in cm.	2017-07-25 17:05:07 -07:00
Andrew Meadows	9d1fba3a3b	Merge pull request #10821 from ctrlaltdavid/21418 ... Don't execute body of controllers' plugin update methods if not enabled	2017-07-25 08:51:17 -07:00
Ryan Huffman	9421e6ebb6	Merge pull request #11029 from cain-kilgore/dominant-hands ... WL 21453 - Add a "Dominant Hand" setting	2017-07-25 08:01:31 -07:00
Cain Kilgore	f9204a7034	Now it should appear..	2017-07-25 09:03:47 +01:00
Stephen Birarda	26be7e1a01	Merge pull request #10999 from birarda/bug/html-path-on-mac-build ... fix create tab load on OS X	2017-07-24 10:12:40 -07:00
Stephen Birarda	3936ee93f0	use default scripts path in EditTabView to fix load on OS X	2017-07-19 16:34:04 -07:00
utkarshgautamnyu	ce5ff23e70	made changes to size of content to dosplay 'choose file' button	2017-07-19 16:15:34 -07:00
Chris Collins	e99683fdcf	Merge pull request #10985 from jherico/audio_deadlock ... Trying to resolve QML / Audio deadlocks	2017-07-18 12:40:03 -07:00
Brad Davis	aab56cf2a9	Trying to resolve QML / Audio deadlocks	2017-07-17 16:21:28 -07:00
Dante Ruiz	93d1725b3c	make cursor position change based on mouse click position	2017-07-14 19:30:35 +01:00
Zach Fox	a9197509d8	Merge pull request #10965 from CainFoool/avatar-scaler ... WL 21422 - Add a scale slider for avatar size	2017-07-14 10:30:33 -07:00
Cain Kilgore	f91a8c0f53	Merge branch 'master' of https://github.com/highfidelity/hifi into avatar-scaler	2017-07-13 21:25:39 +01:00
Cain Kilgore	247e7b8bed	indentation!!!	2017-07-13 19:25:31 +01:00
Cain Kilgore	43782a29c7	Avatar Scaler - WIP	2017-07-12 22:04:58 +01:00
Zach Fox	d786820670	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-07-11 16:16:37 -07:00
Zach Fox	ea62ef165c	Fix image container background	2017-07-10 16:13:45 -07:00
Zach Fox	4a74522884	Ensure tablet button shows up; protections for controller mapping	2017-07-10 15:16:16 -07:00
David Kelly	b87d69b15d	Insure spectator camera preview is up when reopening tablet	2017-07-10 13:16:08 -07:00
Dante Ruiz	89a072cfee	fixed hmd keyboard for goto	2017-07-10 19:05:07 +01:00
David Kelly	1c9c36a8c8	Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into dk/hmdPreview	2017-07-10 10:22:31 -07:00
David Kelly	4843b91f47	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-07-10 09:50:17 -07:00
druiz17	6e44c95d53	Merge pull request #10906 from druiz17/audio-qml-fix ... Made the output audio listview dynamically change height base on content size	2017-07-07 16:48:15 -07:00
Zach Fox	dbb48cd1aa	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-07-07 16:03:04 -07:00
Zach Fox	e222753aac	Merge pull request #10911 from zfox23/PAL_adminFix2 ... Set admin status even if QML can't find user in PAL	2017-07-07 10:24:53 -07:00
Seth Alves	fc8b7c7cc5	Merge pull request #10904 from druiz17/window-root-spam ... fixed log spamming from windowRoot.qml in toolbar mode	2017-07-07 07:17:08 -07:00
Zach Fox	ee9cdaff90	Set admin status even if QML can't find user in PAL	2017-07-06 23:26:40 -07:00
David Kelly	b41c470064	first cut, still stereo	2017-07-06 15:59:24 -07:00
Dante Ruiz	1ac415aa14	dynamic listview height	2017-07-06 23:50:32 +01:00
druiz17	b4182fe7ac	Merge pull request #10899 from druiz17/calibration-update-2.0 ... Updates to the Calibration UI	2017-07-06 14:24:45 -07:00
Dante Ruiz	b0130896d1	fixed spamming from windowRoot.qml	2017-07-06 22:01:08 +01:00