20944 commits

Author	SHA1	Message	Date
Brad Davis	8043caa9e9	Merge pull request #10925 from jherico/overlay_performance ... Fix terrible script performance when rendering load is too high	2017-07-08 14:19:14 -07:00
Brad Davis	cd11f5cfa6	More tweaks for improved script performance	2017-07-07 22:02:56 -07:00
Brad Davis	148eece065	Tweak frame timing to avoid overloading the main thread	2017-07-07 21:00:33 -07:00
Brad Davis	7e9ea596a0	Add more efficient overlay getters, don't use blocking calls	2017-07-07 21:00:31 -07:00
Stephen Birarda	420e9233b6	Revert "fix for invisible avatars after radius ignore"	2017-07-07 16:50:28 -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
Stephen Birarda	f07ce6d294	Merge pull request #10835 from birarda/bug/invisible-avatars ... fix for invisible avatars after radius ignore	2017-07-07 16:06:44 -07:00
Zach Fox	3d14d3755e	Merge pull request #10898 from 1P-Cusack/21425 ... Add View->Enter First Person Mode in HMD checkbox.	2017-07-07 14:01:36 -07:00
Andrew Meadows	57842ce5a5	Merge pull request #10878 from mnafees/21355 ... CR for Job #21355 - Clean up and remove menu hotkeys	2017-07-07 14:01:21 -07:00
1P-Cusack	77001712ab	Default 'Enter First Person Mode in HMD' to true.	2017-07-07 15:35:32 -04: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
Seth Alves	81cc46beb4	Merge pull request #10909 from jherico/overlay_crashes ... Fixing overlay crashes, for real	2017-07-07 07:11:52 -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
Brad Davis	f8b76d65ab	Fixing overlay crashes, for real	2017-07-06 18:01:26 -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
Clément Brisset	34e3f56002	Merge pull request #10843 from birarda/bug/user-activities-interface-only ... disable user activity logger in DS/AC/ac-client	2017-07-06 14:01:49 -07:00
Dante Ruiz	b0130896d1	fixed spamming from windowRoot.qml	2017-07-06 22:01:08 +01:00
Dante Ruiz	1fcb3b32d6	fixed letter cap	2017-07-06 20:55:19 +01:00
Seth Alves	0374d24b15	Merge pull request #10901 from druiz17/goto-keyboard-fix ... Fixed the keyboard not showing up for goto in HMD mode	2017-07-06 12:46:13 -07:00
Dante Ruiz	2d876377d5	keyboard know disappears when you click of the address line	2017-07-06 20:04:44 +01:00
Dante Ruiz	de5802418f	fixed some keybaord logic	2017-07-06 19:27:48 +01:00
Dante Ruiz	4e3dba1767	goto HMD keyboard fix	2017-07-06 19:12:52 +01:00
Dante Ruiz	9e4b5693c7	fixed merge conflicts	2017-07-06 18:49:46 +01:00
anshuman64	e384f6d1b7	Merge pull request #10866 from druiz17/vive-in-desktop ... Allowing Vive controllers and trackers to be used in desktop mode	2017-07-06 10:40:56 -07:00
Stephen Birarda	916f57772b	default the UAL off for all targets, enable manually for Interface	2017-07-06 10:21:07 -07:00
Dante Ruiz	6e1f9d275c	chnaged default head offset	2017-07-06 17:54:06 +01:00
David Kelly	1ccf0da7d8	Merge pull request #10897 from davidkelly/dk/cacheSwitchFix ... redo cache switch	2017-07-06 09:53:01 -07:00
Dante Ruiz	258c21838e	finished calibration-ui updates	2017-07-06 17:32:40 +01:00
Andrew Meadows	4fad9d9b1a	Merge pull request #10858 from jherico/trace_cores ... Additional threaded tracing of CPU cores	2017-07-06 08:23:21 -07:00
David Kelly	936c21e849	remove unnecessary cacheDir member	2017-07-06 07:24:58 -07:00
David Kelly	4a22fbca1b	redo cache switch	2017-07-05 17:01:31 -07:00
Dante Ruiz	6c15dffb9d	added new glyph	2017-07-06 00:45:59 +01:00
Brad Davis	7f1bc07d04	Trying to fix overlay crashes again	2017-07-05 14:30:01 -07:00
Dante Ruiz	b86a8b8338	Merge branch 'master' of github.com:highfidelity/hifi into vive-in-desktop	2017-07-05 18:27:33 +01:00
Mohammed Nafees	eb354a4333	Cleanup menu shortcut keys	2017-07-05 14:50:48 +05:30
Seth Alves	fad686571a	Merge pull request #10874 from jherico/overlay_mutex ... Restore mutex in overlay interface	2017-07-03 17:25:42 -07:00
Chris Collins	1f7d2b283a	Merge pull request #10872 from jherico/fix_laggy_overlays ... Don't use a blocking connection for a high-frequency script function	2017-07-03 14:58:32 -07:00
Brad Davis	97edbb7f37	Restore mutex in overlay interface	2017-07-03 14:49:57 -07:00
anshuman64	70b9e9b41e	Merge pull request #10849 from druiz17/calibration-ui-update ... Updated calibration UI visuals and added UserActivity events.	2017-07-03 12:42:09 -07:00
Brad Davis	6c86c297cb	Don't use a blocking connection for a high-frequency function like editOvleray	2017-07-03 12:40:52 -07:00
1P-Cusack	38baeabbe5	Add View->Enter First Person Mode in HMD checkbox. ... When checked, changing to an HMD display will switch the user to first person mode. WL 21425.	2017-07-03 15:21:40 -04:00
Seth Alves	70a7b302fc	Merge pull request #10860 from jherico/deadlock_guards ... Don't use blocking connections on the main thread	2017-07-03 09:05:56 -07:00
Dante Ruiz	063984f573	Merge branch 'master' of github.com:highfidelity/hifi into calibration-ui-update	2017-07-03 16:44:47 +01:00
Dante Ruiz	6f30cb1825	Merge branch 'master' of github.com:highfidelity/hifi into vive-in-desktop	2017-07-01 00:48:49 +01:00
Dante Ruiz	51792769b5	finished vive in desktop mode	2017-07-01 00:48:36 +01:00
Dante Ruiz	309a03230c	Merge branch 'calibration-ui-update' into vive-in-desktop	2017-06-30 23:43:59 +01:00
Dante Ruiz	577969481d	head puck working	2017-06-30 23:43:12 +01:00
Ryan Downe Karpf	ddce264dd9	Merge pull request #10819 from Menithal/21387 ... WL21387 - Avatar Bookmarks now save Attachment Data and scale PR#2	2017-06-30 14:57:04 -07:00