6184 commits

Author	SHA1	Message	Date
Dante Ruiz	070db2922d	fixed warning compile error	2017-07-13 18:40:38 +01:00
Dante Ruiz	bedd0628b9	allowed tablet to toggle when a dialog is open	2017-07-12 00:51:07 +01:00
Andrew Meadows	96b88dccd7	Merge pull request #10913 from samcake/orange ... Introducing the Stages to the render::Scene, Better scene update phase and getting away from the singleton model	2017-07-10 09:46:09 -07:00
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
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
Sam Gateau	156c20d01e	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2017-07-07 10:58:05 +02: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
Stephen Birarda	916f57772b	default the UAL off for all targets, enable manually for Interface	2017-07-06 10:21:07 -07:00
David Kelly	1ccf0da7d8	Merge pull request #10897 from davidkelly/dk/cacheSwitchFix ... redo cache switch	2017-07-06 09:53:01 -07: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	4a22fbca1b	redo cache switch	2017-07-05 17:01:31 -07:00
Mohammed Nafees	eb354a4333	Cleanup menu shortcut keys	2017-07-05 14:50:48 +05:30
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
Brad Davis	31d2c9980e	Merge pull request #10797 from ctrlaltdavid/21396 ... Make Leap Motion a plugin	2017-06-30 14:37:23 -07:00
Brad Davis	6fc82bb351	Switch to preprocessor macro for blocking invokes to capture function information	2017-06-30 11:36:24 -07:00
Brad Davis	8372d73fec	Additional thread safety	2017-06-30 09:15:06 -07:00
Brad Davis	b52dd7b822	Don't use blocking connections on the main thread	2017-06-29 20:45:17 -07:00
Brad Davis	8ec20ef042	Additional tracing of CPU cores	2017-06-29 13:16:15 -07:00
Sam Gateau	ca7e782566	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2017-06-29 10:54:27 +02:00
Thijs Wenker	e781f97ddc	Merge pull request #10846 from sethalves/fix-server-scripts-more ... make ResourceManager be owned by DependencyManager	2017-06-28 17:05:30 -07:00
Howard Stearns	3606418a22	Merge pull request #10836 from davidkelly/dk/scriptsSwitchBug ... minor fix for --scripts switch	2017-06-28 16:11:18 -07:00
Seth Alves	794495c197	make ResourceManager be owned by DependencyManager	2017-06-28 14:18:14 -07:00
David Kelly	48de8011b2	cr feedback	2017-06-28 14:15:29 -07:00
Sam Gateau	1e2b0ca91c	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2017-06-28 10:21:05 +02:00
Brad Davis	8130a91b8c	Cleanup entity dependencies	2017-06-27 19:15:49 -07:00
David Kelly	9417a176a1	make scripts tree show scripts in directory passed in with --scripts	2017-06-27 18:10:54 -07:00
David Kelly	01155ba4e3	this handles redirecting ktx_cache, data8, prepared	2017-06-27 08:47:54 -07:00
Sam Gateau	63835d0863	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2017-06-27 14:24:55 +02:00
Seth Alves	2f2a13ec27	Merge pull request #10799 from jherico/object_parent_warnings ... Fix warnings about creating QObjects with parents in different thread	2017-06-26 09:39:29 -07:00
Sam Gateau	75e457ce7c	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2017-06-26 10:05:04 +02:00
David Rowe	bed0e8ef87	Merge branch 'master' into 21396 ... # Conflicts: # interface/src/avatar/MySkeletonModel.cpp	2017-06-26 12:07:25 +12:00
Bradley Austin Davis	960017ddd7	Fix static plugin initialization on Linux	2017-06-24 22:22:47 -07:00
samcake	77650ac1b3	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2017-06-23 20:10:35 -07:00
Seth Alves	43ba5f3772	Merge pull request #10800 from hyperlogic/bug-fix/eyes-forward ... Fix for eye direction when no look at targets are present.	2017-06-23 14:32:21 -07:00
David Rowe	6e266dfbac	Merge branch 'master' into 21396	2017-06-24 09:19:12 +12:00
samcake	17e2140826	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2017-06-23 13:28:58 -07:00
Brad Davis	f1fe4ed7cc	Merge pull request #10804 from jherico/fix_deps_3 ... Remove dependency between codec plugins and UI	2017-06-23 12:51:35 -07:00
Brad Hefta-Gaub	dc649e84df	Merge pull request #10792 from jherico/qml_crashes ... Trying to fix QtQml/QtScript crashes	2017-06-23 12:41:43 -07:00
Brad Davis	fe7d4b1d23	Remove dependency between codec plugins and UI	2017-06-23 12:25:18 -07:00
Anthony J. Thibault	8f89ef0931	Fix for eye direction when no look at targets are present.	2017-06-23 10:52:23 -07:00
Brad Davis	416852c0cd	Fix warnings about creating QObjects with parents in different thread	2017-06-23 10:19:16 -07:00
David Rowe	9d0407cbdf	Merge branch 'master' into 21396	2017-06-23 16:52:04 +12:00
David Rowe	b26f5c5811	Clear finger joints when finger poses no longer being updated	2017-06-23 16:15:40 +12:00
samcake	20d8c11e28	ALmost there, getting eback everything to work with the light and background stages in the scene, not in deferredLighting Effect anymore	2017-06-22 17:54:16 -07:00
Brad Davis	4439de240a	Trying to fix QtQml/QtScript crashes	2017-06-22 16:39:57 -07:00
David Rowe	8682cee17a	Refactoring	2017-06-23 11:33:29 +12:00