3569 commits

Author	SHA1	Message	Date
samcake	fa35d659dc	Merge branch 'master' of https://github.com/highfidelity/hifi into upstream-workload	2018-04-03 17:56:41 -07:00
Clément Brisset	3d4490f3fd	Merge pull request #12737 from highfidelity/RC66 ... RC66 mergeback	2018-04-03 15:39:16 -07:00
samcake	59a081bcdb	merge with upstream	2018-03-30 18:08:38 -07:00
Sam Gateau	d5496d68fd	FIx the mac crash when in front of a mirror by using the VIewFrustum stack correctly	2018-03-30 16:58:41 -07:00
Brad Davis	0e7ee95c95	Merge remote-tracking branch 'upstream/master' into bindless	2018-03-21 19:16:55 -07:00
Brad Davis	ae8df7e24e	Merge remote-tracking branch 'origin/gl_common' into HEAD	2018-03-21 12:35:17 -07:00
John Conklin II	2d63afbe28	Merge pull request #12588 from SamGondelman/shapeTex ... Materials on primitives	2018-03-21 12:08:24 -07:00
John Conklin II	283aff71ec	Merge pull request #12612 from jherico/gl_common ... Break out common GL and GLES code into a single shared library	2018-03-21 11:28:24 -07:00
Sam Gateau	a7533e5287	Merge pull request #12675 from SamGondelman/hotfix ... Model behaves correctly if missing material	2018-03-20 14:27:21 -07:00
Stephen Birarda	0074c0470d	Merge pull request #12524 from birarda/feat/runtime-beside-exe ... switch back to app-local VC runtimes and UCRT	2018-03-20 14:07:27 -07:00
Brad Davis	f77228bbfe	Fixing missing m_pi define	2018-03-20 09:58:47 -07:00
SamGondelman	444534f4ff	model behaves correctly if missing material ... (cherry picked from commit 1e89debc4e)	2018-03-16 15:51:37 -07:00
SamGondelman	984a48316d	CR	2018-03-16 13:51:29 -07:00
SamGondelman	e59af8892a	make same changes to gles backend from taa pr	2018-03-14 12:09:59 -07:00
SamGondelman	3b877db992	fix hud sphere	2018-03-13 14:58:29 -07:00
samcake	2af88c11f2	Merge branch 'master' of https://github.com/highfidelity/hifi into workload-master	2018-03-13 13:35:31 -07:00
SamGondelman	4adc357534	apply taa to text and web entities/overlays	2018-03-13 11:57:14 -07:00
samcake	f8acca76e2	Merge branch 'master' of https://github.com/highfidelity/hifi into workload-master	2018-03-13 09:31:50 -07:00
John Conklin II	5be2f0acc7	Merge pull request #12490 from Zvork/taa ... Temporal Anti-Aliasing	2018-03-13 09:03:50 -07:00
samcake	69fe1ace0b	THe View rings are rendering corectly, let s ship it	2018-03-12 11:59:03 -07:00
Brad Davis	9056ee0f14	Merge branch 'gl_common' into bindless	2018-03-12 11:27:30 -07:00
Sam Gateau	9e7260839c	Better rendering of the view circles	2018-03-12 01:05:07 -07:00
samcake	4a7d3e8e0e	REndering the view rings better	2018-03-09 17:49:50 -08:00
samcake	e8b5a875d6	REndering the view rings better	2018-03-09 17:40:58 -08:00
Sam Gateau	f087bb7623	Adjust the freeze view and start drawing the views better	2018-03-09 01:38:00 -08:00
Olivier Prat	da6bd92ff6	Merged with master	2018-03-09 10:07:25 +01:00
David Rowe	b461a422c6	Merge branch 'master' into 21709	2018-03-09 14:18:42 +13:00
Brad Davis	09996e0b65	Bindless texture work cleanup	2018-03-08 16:01:18 -08:00
samcake	a0db5c6135	Merge with master	2018-03-08 15:35:58 -08:00
Stephen Birarda	2158acecf4	tell cmake we are fine ignoring generated for CMP0071	2018-03-08 12:39:40 -08:00
NissimHadar	fda32e4aa4	Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork	2018-03-08 12:16:36 -08:00
NissimHadar	a703b5a3b5	Added check to correct crashing when selecting ambient occlusion from menu.	2018-03-08 12:15:26 -08:00
Brad Hefta-Gaub	d2e264ab32	Merge pull request #12583 from samcake/punk ... Fix Local lights not showing anymore	2018-03-08 10:31:58 -08:00
Sam Gondelman	1e9cfe29f2	Merge pull request #12388 from highfidelity/android ... Android Tip	2018-03-08 10:18:35 -08:00
Sam Gateau	ceb38dbc97	Merge branch 'workload' of https://github.com/highfidelity/hifi into workload	2018-03-07 18:54:21 -08:00
Sam Gateau	dc122b4ce8	Merge branch 'master' of https://github.com/highfidelity/hifi into master-workload	2018-03-07 18:14:44 -08:00
Brad Davis	d858d34523	Update material binding	2018-03-07 17:27:47 -08:00
Brad Davis	ddd60ded03	Merge remote-tracking branch 'upstream/master' into bindless_master	2018-03-07 16:04:35 -08:00
Sam Gondelman	f51a35455a	Merge pull request #12515 from SamGondelman/scriptableMaterials ... Material reflection	2018-03-07 14:29:31 -08:00
SamGondelman	96e48a0162	warnings	2018-03-07 13:50:51 -08:00
SamGondelman	19e4fb2355	materials on primitives	2018-03-07 12:22:17 -08:00
David Rowe	a62b6b7150	Merge branch 'master' into 21709	2018-03-07 17:34:53 +13:00
samcake	4a91ac11c9	Adding controls of the regions	2018-03-06 18:19:02 -08:00
samcake	923c81ae28	Swap order of the ZoneRendererJob with DrawLocalLights to fix the local lights	2018-03-06 17:38:27 -08:00
Cristian Luis Duarte	bde2ba9272	Merge remote-tracking branch 'gcgithub/android_bubble_fix' into android_experimental_joystick_fixed	2018-03-06 22:02:23 -03:00
Brad Davis	f9605cffb1	Target available mip	2018-03-06 11:20:54 -08:00
Sam Gateau	7e96608699	introducing the first stage of the workload engine to setup view and expand the view definition	2018-03-06 01:35:16 -08:00
Brad Davis	8bfc610cfb	Merge remote-tracking branch 'upstream/master' into android	2018-03-05 11:48:58 -08:00
NissimHadar	1eb0dde3d2	Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork	2018-03-05 11:36:39 -08:00
samcake	660c4c30e9	Representing the view spheres	2018-03-02 18:22:51 -08:00