3013 commits

Author	SHA1	Message	Date
samcake	9fceaad38b	Merging with master	2017-12-04 14:20:10 -08:00
Bradley Austin Davis	e4220aa44e	Fixing warnings in android build	2017-11-28 14:32:30 -08:00
Bradley Austin Davis	d6072f2bf2	Add bullet and draco to precompiled libraries	2017-11-28 11:32:34 -08:00
samcake	1514cdfb2f	extend the set of interface for multi highlight	2017-11-21 17:59:45 -08:00
samcake	e0740b323d	keep debuging the seelction highlight	2017-11-17 18:11:18 -08:00
Sam Gateau	6889c9d6d1	Merge branch 'master' of https://github.com/highfidelity/hifi into light	2017-11-15 18:49:30 -08:00
Sam Gateau	3f5b21ec22	Merge pull request #11559 from Zvork/bloom ... Bloom	2017-11-15 15:11:31 -08:00
samcake	932089115e	Merge branch 'master' of https://github.com/highfidelity/hifi into light	2017-11-15 12:51:01 -08:00
Sam Gateau	2c51e516eb	Merge pull request #11744 from Zvork/shadow ... Shadow caster culling fix	2017-11-15 09:49:39 -08:00
John Conklin II	8592f3fd4d	Merge pull request #11764 from luiscuenca/case7587 ... 7587 Lasers resize with avatar	2017-11-15 09:31:45 -08:00
samcake	78ac609752	Merge branch 'master' of https://github.com/highfidelity/hifi into light	2017-11-15 09:12:18 -08:00
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
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
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
samcake	fd46aa15ff	adding occluded/visisble to highlight outline	2017-11-13 17:23:21 -08:00
Olivier Prat	dd6b7b04c2	Merged with master	2017-11-13 14:33:59 +01:00
David Back	163de649bf	prevent rendering HUD elements in secondary camera	2017-11-10 17:44:09 -08:00
Sam Gateau	ecf67cc331	Merge pull request #11650 from Zvork/outline ... Multiple Outline Groups	2017-11-10 15:45:03 -08:00
Olivier Prat	8b6a2eeb24	Merge branch 'master' of git://github.com/highfidelity/hifi into shadow	2017-11-10 10:19:32 +01:00
Olivier Prat	4f7ed38e98	Fixed potential link errors on Mac	2017-11-09 11:26:08 +01:00
luiscuenca	1791ed01ca	add width param to vertex shader	2017-11-08 18:35:26 -07:00
samcake	aecfefe72a	Merge branch 'master' of https://github.com/highfidelity/hifi into light	2017-11-08 15:49:05 -08:00
samcake	af1180255e	fixes from code review	2017-11-08 11:45:40 -08:00
samcake	75ce61c3a6	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2017-11-08 11:30:53 -08:00
Olivier Prat	bbcb0b2d9b	Fixed highlight in stereo mode, including HMD (testing on simulator)	2017-11-08 13:49:18 +01:00
Olivier Prat	f996435ac8	Merge branch 'master' of git://github.com/highfidelity/hifi into highlight	2017-11-08 11:41:21 +01:00
Olivier Prat	39604363ea	Optimized performance of bloom by reducing blur resolution and merging some downsampling passes with blur passes	2017-11-08 11:38:20 +01:00
Olivier Prat	91d8435a99	Merge branch 'master' of git://github.com/highfidelity/hifi into bloom	2017-11-08 08:17:55 +01:00
samcake	f5e1add694	Merge branch 'master' of https://github.com/highfidelity/hifi into light	2017-11-07 17:41:36 -08:00
Sam Gateau	3ef9ce0af6	Merge pull request #11732 from NissimHadar/hazeMaskFix ... Haze mask fix	2017-11-07 17:37:24 -08:00
samcake	0718763ed1	Adjust syntax	2017-11-07 17:31:15 -08:00
luiscuenca	ee3900be4f	Corrections	2017-11-07 18:26:41 -07:00
luiscuenca	332cb48a41	Lasers and teleport scale with avatar	2017-11-07 16:57:55 -07:00
samcake	6481e0f713	Address cauterized cluster matrices issue	2017-11-07 12:52:23 -08:00
Olivier Prat	0bbd1edc0a	Fixed fluttering highlight bug by attaching only stencil when drawing outline	2017-11-07 18:26:15 +01:00
Olivier Prat	ffa46b487a	Only non empty selections are now linked to highlight passes	2017-11-07 17:07:37 +01:00
Olivier Prat	9817cb4c44	Added highlight configuration in HighlightStageSetup job	2017-11-07 15:35:43 +01:00
Olivier Prat	3cc445ff02	Renamed outline to highlight	2017-11-07 11:07:25 +01:00
Olivier Prat	9e6472b577	Added OutlineStyleStage	2017-11-06 15:55:57 +01:00
Sam Gateau	fcb3cee092	exploring how to to expose occluded/unoccluded outline styles	2017-11-05 11:48:12 -08:00
samcake	053052a95d	removing warnings	2017-11-03 13:28:20 -07:00
Olivier Prat	fcf1c301b6	Merge branch 'master' of git://github.com/highfidelity/hifi into bloom	2017-11-03 18:12:15 +01:00
Olivier Prat	79c2da3dcb	Removed cull functor from shadow render task as it is inadapted for the shadow's orthographic projection	2017-11-03 16:52:29 +01:00
Olivier Prat	fbcb2924e8	Merge branch 'master' of git://github.com/highfidelity/hifi into shadow	2017-11-03 15:08:15 +01:00
Olivier Prat	e0fd71f246	Merged from master	2017-11-03 14:39:42 +01:00
Olivier Prat	4b598a6e24	Working stencil mask with object bounding boxes	2017-11-03 14:26:36 +01:00
Sam Gateau	390f5b53ca	cleaning more code	2017-11-02 23:55:44 -07:00