61663 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Olivier Prat	14275b1cf3	Added asserts in LightStage to catch shadow disappearance when domain is automatically reloaded	2017-11-15 15:42:04 +01:00
Olivier Prat	f47a3e7d2c	Moved draw frustum job to render DrawTask and made generic. A couple of fixes as requested by @samcake	2017-11-15 09:42:57 +01:00
Olivier Prat	bf46ccefaf	Merge branch 'master' of git://github.com/highfidelity/hifi into shadow	2017-11-15 08:59:36 +01:00
Stephen Birarda	557ee458ec	wait for node active socket before constructing packets	2017-11-14 17:08:01 -08:00
Howard Stearns	1c293c4c48	Merge pull request #11813 from zfox23/commerce_removeEditJSDependency ... Remove Marketplace's dependency on Edit.js for REZ/WEAR	2017-11-14 16:33:35 -08:00
Zach Fox	d6c244d1d5	Remove incorrect logic	2017-11-14 14:54:03 -08:00
Ken Cooke	9810d1582d	CR fixes	2017-11-14 14:36:37 -08:00
Zach Fox	f5994375cf	Remove Marketplace's dependency on Edit.js for rez	2017-11-14 14:29:49 -08:00
Stephen Birarda	05a38a78c5	don't send octree data without first query	2017-11-14 14:08:27 -08:00
luiscuenca	26e401a069	fix broken HMD notifications	2017-11-14 14:22:53 -07:00
John Conklin II	49abb441e6	Merge pull request #11807 from Atlante45/case8495 ... RC-59 patch - Disable mirror camera in HMD mode	2017-11-14 13:06:47 -08:00
Olivier Prat	5102c8e1b1	Merged with master	2017-11-14 21:56:00 +01:00
Olivier Prat	c5bd86a4bf	Disabled bloom by default	2017-11-14 21:54:40 +01:00
Zach Fox	c42003a374	Merge pull request #11794 from ElderOrb/FB4684_3 ... 4684 Add collapse button on the virtual keyboard	2017-11-14 12:22:42 -08:00
Atlante45	b31118fe00	CR	2017-11-14 11:41:43 -08:00
Atlante45	6b5b905b2a	Exit right away if the parent process died	2017-11-14 11:41:43 -08:00
Atlante45	462ec30cac	Utilise Windows Job Object so child dies w/ parent	2017-11-14 11:41:43 -08:00
Alexander Ivash	e201e203b8	8984 Opening tablet with "Enter" key displays the audio menu	2017-11-14 22:18:48 +03:00
David Back	4b8021bc4a	Merge pull request #11802 from dback2/mirrorfanciness2 ... prevent rendering HUD elements in secondary camera	2017-11-14 10:49:18 -08:00
luiscuenca	489e244342	More accurate scale from SensorToWorldScale	2017-11-14 09:56:23 -07:00
Thijs Wenker	788514adb0	Merge pull request #11806 from highfidelity/misslivirose-patch-1 ... Update .eslintrc.js	2017-11-14 01:21:27 +00:00
Nissim Hadar	b4b148367e	Removed Keylight attenuation from .js (as well as .html).	2017-11-13 16:07:20 -08:00
luiscuenca	7af1a5ca69	clean up unused lastmode	2017-11-13 16:04:03 -08:00
luiscuenca	5d4a3b65e4	Allow script to change to mirror camera in HMD	2017-11-13 16:04:03 -08:00
luiscuenca	8596d78aa6	Not posible to change to mirror mode using js	2017-11-13 16:04:03 -08:00
luiscuenca	d1318ae99e	8495 No mirror camera in HMD mode	2017-11-13 16:04:03 -08:00
Liv	94b925d9d5	Update .eslintrc.js	2017-11-13 15:53:33 -08:00
Zach Fox	0b6cc6ba2e	Merge pull request #11803 from zfox23/commerce_fixCertDisappearing ... Fix bug with disappearing certificate info	2017-11-13 12:13:45 -08:00
Stephen Birarda	21e49d1504	Merge pull request #11798 from Atlante45/feat/wizard-tweaks ... Wizard tweaks	2017-11-13 12:07:22 -08:00
Zach Fox	641c4656c4	Fix bug with disappearing certificate info	2017-11-13 10:53:16 -08:00
Seth Alves	9df11fb11a	Merge pull request #11787 from elisa-lj11/musvis ... Second fix to null file path return (specific to music visualizer)	2017-11-13 09:44:47 -08:00
Sam Gateau	4b14a7a820	Merge pull request #11799 from NissimHadar/hazeUIFix ... Removed Keylight attenuation from .js (as well as .html).	2017-11-13 09:18:29 -08:00
Ryan Downe Karpf	3ea6ecf104	Merge pull request #11747 from luiscuenca/case8495 ... 8495 No mirror camera in HMD mode	2017-11-13 09:09:34 -08:00
Olivier Prat	dd6b7b04c2	Merged with master	2017-11-13 14:33:59 +01:00
luiscuenca	d75c176fef	clean up unused lastmode	2017-11-13 06:10:17 -07:00
Ryan Downe Karpf	9ff4541ee3	Merge pull request #11782 from hyperlogic/remove-vs2010-inttypes-hack ... Remove hack for missing inttypes.h header on VS2010	2017-11-12 10:59:19 -08:00
Ryan Downe Karpf	f8b1c7978c	Merge pull request #11772 from 1P-Cusack/FogBugz/Case_6569 ... [Case 6569]: Silent failure is possible during Model Creation	2017-11-12 08:36:10 -08:00
Nissim Hadar	f629357ded	Removed Keylight attenuation from .js (as well as .html).	2017-11-11 18:58:12 -08:00
Ken Cooke	89dbbb44ed	Merge pull request #11780 from kencooke/audio-codec-update ... Audio codec update for all platforms (includes Android)	2017-11-11 11:33:33 -08:00
Atlante45	8f133fc7fa	Congratulation page styling fixes	2017-11-10 18:12:43 -08:00
Atlante45	067436a743	CR	2017-11-10 18:12:33 -08:00
David Back	163de649bf	prevent rendering HUD elements in secondary camera	2017-11-10 17:44:09 -08:00
luiscuenca	262dc091ce	7589 Fix notifications shrink with avatar	2017-11-10 17:22:41 -07:00
Atlante45	9cd8f372f2	Fix race condition	2017-11-10 16:21:06 -08:00
Atlante45	796909d366	Permissions page tweaks	2017-11-10 16:19:49 -08:00
Atlante45	2782ae03c5	Add back buttons	2017-11-10 15:48:44 -08:00
Atlante45	c047a1d0a4	Rework perms wizard page	2017-11-10 15:48:44 -08:00
Sam Gateau	ecf67cc331	Merge pull request #11650 from Zvork/outline ... Multiple Outline Groups	2017-11-10 15:45:03 -08:00
Andrew Meadows	469b68011c	Merge pull request #11566 from hyperlogic/bug-fix/div-by-zero ... div by zero fixes, detected by address sanitizer	2017-11-10 13:47:40 -08:00
Sam Gateau	f857b37d2e	Merge pull request #11758 from NissimHadar/hazeUIFix ... Improved Haze UI in Create menu	2017-11-10 11:58:06 -08:00