21056 commits

Author	SHA1	Message	Date
Howard Stearns	17fcfad957	Merge pull request #10875 from highfidelity/spectator-camera ... Spectator Camera	2017-07-13 13:57:18 -07:00
Seth Alves	59d88cb564	Merge pull request #10941 from sethalves/audio-injector-smart-pointers ... Audio injector smart pointers	2017-07-13 11:00:02 -07:00
David Kelly	60751f07bd	Merge pull request #10961 from davidkelly/dk/hmdPreviewFix ... hmd preview fix	2017-07-13 10:32:33 -07:00
Brad Hefta-Gaub	b063c2f45d	Merge pull request #10942 from AndrewMeadows/cleanup-entity-transmission ... Cleanup OctreeSendThread::packetDistributor()	2017-07-13 09:58:28 -07:00
David Kelly	4b3cf5ee2e	Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into dk/hmdPreviewFix	2017-07-12 16:50:51 -07:00
David Kelly	88a449c1af	Fixes hmd preview when resizing	2017-07-12 16:49:26 -07:00
Zach Fox	dc1b4b5324	New icons	2017-07-12 16:48:04 -07:00
Zach Fox	8553277c56	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-07-12 14:18:50 -07:00
Seth Alves	59ad3d50ec	Merge branch 'master' of github.com:highfidelity/hifi into audio-injector-smart-pointers	2017-07-12 12:45:58 -07:00
Seth Alves	ddf2312dc6	code review	2017-07-12 12:45:52 -07:00
Zach Fox	bd4fe416b4	Cleanup; no magic numbers for default cam params	2017-07-12 12:08:36 -07:00
Zach Fox	9fe6fbd811	View frustums are strange.	2017-07-12 11:37:18 -07:00
Andrew Meadows	364600c447	fix rendering of simulation ownership debug icons	2017-07-12 11:12:47 -07:00
Zach Fox	79cf242fc9	Make far clip plane distance equal to main camera's	2017-07-12 10:51:14 -07:00
Stephen Birarda	f6d9a79fb5	Revert "Revert "fix for invisible avatars after radius ignore""	2017-07-12 10:36:53 -07:00
Tingjin	80916b62bb	Remove unnecessary code ... Remove two lines of unnecessary code.	2017-07-11 20:52:28 -07:00
Seth Alves	c52e7e180a	use const AudioInjectorPointer& in some places	2017-07-11 19:42:03 -07:00
Seth Alves	dbd46fc4b8	Merge branch 'master' of github.com:highfidelity/hifi into audio-injector-smart-pointers	2017-07-11 17:48:29 -07:00
Zach Fox	d786820670	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-07-11 16:16:37 -07:00
Andrew Meadows	782155e9ea	Merge pull request #10876 from Atlante45/fix/ac-crash ... Fix AC crash (buffer overflow)	2017-07-11 14:26:08 -07:00
Seth Alves	ead461dca7	Merge branch 'master' of github.com:highfidelity/hifi into audio-injector-smart-pointers	2017-07-11 14:25:12 -07:00
Seth Alves	3670a04d8e	switch bare pointers to AudioInjector objects to be QSharedPointers	2017-07-11 14:24:58 -07:00
Dante Ruiz	2f192fd48a	added scroll fix for qt 5.6	2017-07-11 21:19:06 +01:00
Dante Ruiz	01ca192613	fixed tablet scrolling	2017-07-11 21:16:13 +01: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	fcf4bfd59a	spacing issue	2017-07-10 13:25:33 -07:00
David Kelly	b87d69b15d	Insure spectator camera preview is up when reopening tablet	2017-07-10 13:16:08 -07:00
druiz17	78ba2102f4	Merge pull request #10931 from druiz17/fix-goto-hmd-keyboard ... Fixed goto hmd keyboard not entering text	2017-07-10 12:50:01 -07:00
Seth Alves	d957b970dd	Merge pull request #10918 from misslivirose/feat-add-skeleton-changed-signal ... Add signal for avatar skeleton changing	2017-07-10 11:35:24 -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
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
Sam Gateau	4edea433ce	Rename the _pipeline into _shapePipeline in the render::Args	2017-07-10 12:16:53 +02: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
Brad Davis	7e9ea596a0	Add more efficient overlay getters, don't use blocking calls	2017-07-07 21:00:31 -07:00
Zach Fox	d0c521d7b4	Add clarifying comment.	2017-07-07 19:19:48 -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	e537c494e5	Prevent Image3DOverlays from drifting	2017-07-07 16:04:08 -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	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
Liv	060e3a9c5a	Add signal for avatar skeleton changing	2017-07-07 11:48:12 -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