2961 commits

Author	SHA1	Message	Date
Sam Gateau	ecf67cc331	Merge pull request #11650 from Zvork/outline ... Multiple Outline Groups	2017-11-10 15:45:03 -08:00
Olivier Prat	4f7ed38e98	Fixed potential link errors on Mac	2017-11-09 11:26:08 +01: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
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
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
samcake	053052a95d	removing warnings	2017-11-03 13:28:20 -07: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
Sam Gateau	c11f46a8d3	cleaning more code	2017-11-02 23:35:18 -07:00
Sam Gateau	421aacd8eb	Yes	2017-11-02 22:45:19 -07:00
Sam Gateau	70134d67eb	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2017-11-02 19:49:22 -07:00
Sam Gateau	f097d66721	YEp it s working	2017-11-02 19:49:01 -07:00
samcake	d33c75865e	Removing unecessary test	2017-11-02 18:11:13 -07:00
samcake	83bfa1c5f2	Progressing on the cluster updates	2017-11-02 17:57:46 -07:00
Nissim Hadar	d8191e3bd2	Fixed Mask test.	2017-11-02 12:45:18 -07:00
Andrew Meadows	db9c3cc103	make Model::scaleToFit() public not protected	2017-11-02 12:31:36 -07:00
Sam Gateau	56510abd1e	Trying to set the ClusterBuffer in the render loop instead of the game loop	2017-11-02 03:45:27 -07:00
Olivier Prat	f2444f9a30	Merge branch 'master' of git://github.com/highfidelity/hifi into outline	2017-11-02 09:25:07 +01:00
Nissim Hadar	2e6c849b63	Added comment.	2017-11-01 20:31:44 -07:00
Nissim Hadar	67552d2b7d	Change stencil mask used with Haze.	2017-11-01 17:39:37 -07:00
Nissim Hadar	03d2ca19b9	Moving consts into mode::Haze namespace.	2017-10-31 13:46:58 -07:00
Nissim Hadar	f3147fc24f	Merge branch 'master' into hazeZone	2017-10-30 21:41:23 -07:00
Nissim Hadar	3ddf970be3	Removed haze init variables from the model namespace.	2017-10-30 21:40:14 -07:00
Nissim Hadar	636f7858a3	Removed _degs and _m suffixes.	2017-10-30 19:45:08 -07:00
Nissim Hadar	b00db6a68f	Correction.	2017-10-30 19:20:49 -07:00
Nissim Hadar	1357877618	Replaced separate RGB components of colours with vec3's.	2017-10-30 12:41:09 -07:00
Nissim Hadar	5fc68cae0d	Converted Haze initialization values to static.	2017-10-30 11:51:19 -07:00
Olivier Prat	3a977f6039	Disabled stereo in batch when using full screen outline	2017-10-27 22:59:23 +02:00
Nissim Hadar	420b0f321c	Merge branch 'master' into hazeZone	2017-10-27 09:14:53 -07:00
Nissim Hadar	66c31caf4b	Refactoring of the haze	2017-10-27 09:08:58 -07:00
Olivier Prat	4cbee72eae	Fixed warning on Mac and Ubuntu	2017-10-27 17:50:22 +02:00
Olivier Prat	4cadcd79bf	Return full viewport when scissor is disabled and items in outline group	2017-10-27 17:07:19 +02:00
Olivier Prat	bced566510	Merged from master and disable scissor testing with define macro until I figure out how to make it work in stereo	2017-10-27 10:45:43 +02:00
Andrew Meadows	2710dca37c	fix rendering of Circles and Quads	2017-10-26 22:58:50 -07:00
Sam Gateau	6051a3913f	Merge pull request #11684 from NissimHadar/bugFix8610 ... Bug fix 8610	2017-10-26 10:55:29 -07:00
Nissim Hadar	2ec62ecc9b	Reduced haze background blend range to 27,000 metres.	2017-10-25 15:12:01 -07:00
Nissim Hadar	bfab466827	Bug 8610.	2017-10-25 14:13:53 -07:00
Nissim Hadar	8d11ace1a6	Bug 8610.	2017-10-25 13:46:59 -07:00
Andrew Meadows	2d0b94817c	Merge pull request #11336 from 1P-Cusack/21389_PR2 ... WL21389 PR2: Representation of collision shapes need updating (details below).	2017-10-25 10:41:21 -07:00
Brad Hefta-Gaub	ef78711b7b	Merge pull request #11663 from AndrewMeadows/shape-sharing ... fix incorrect collision shape sharing for some ModelEntityItem configurations	2017-10-24 21:04:57 -07:00