3611 commits

Author	SHA1	Message	Date
Olivier Prat	6dd6218b77	Reduced blur taps for better performance and limited normal attenuation distance	2018-04-10 14:30:36 +02:00
Olivier Prat	f6ffbef60d	Final intensity adjustments	2018-04-10 12:36:36 +02:00
Olivier Prat	2974e05cf2	Tweaked bloom intensity mix	2018-04-10 11:13:37 +02:00
Olivier Prat	3c4409c5e1	Merge with master	2018-04-10 09:16:08 +02:00
Stephen Birarda	1d76dea9f6	Merge pull request #12818 from highfidelity/RC66 ... Merge back RC66 to master	2018-04-06 10:43:01 -07:00
samcake	78053b8b48	Refix the normal map case foro translucents	2018-04-04 18:33:27 -07:00
John Conklin II	2e37b4a312	Merge pull request #12747 from Zvork/fade ... Update to Transitions debugging / editing script	2018-04-04 14:31:59 -07:00
Olivier Prat	e3908662fe	Merge branch 'master' of http://github.com/highfidelity/hifi into zeye	2018-04-04 09:50:37 +02:00
Simon Walton	7d16ca9c1c	Remove uses of addRepeatedMessageRegex() and its implementation ... Change to new log-message ID scheme.	2018-04-03 17:54:01 -07:00
Clément Brisset	3d4490f3fd	Merge pull request #12737 from highfidelity/RC66 ... RC66 mergeback	2018-04-03 15:39:16 -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
Olivier Prat	02cf15d115	Lightclusters no unpack position from zdb	2018-03-30 10:06:27 -04:00
Olivier Prat	6f7a1eaefa	Fixed correct inverse projection matrix when computing from Zeye	2018-03-29 18:05:43 -04:00
Olivier Prat	bd0e13463d	Fix on unpackDeferredPosition	2018-03-29 17:06:23 -04:00
Olivier Prat	e4416db06f	Added save/file dialog for transition configurations in transition editor	2018-03-28 16:54:53 -04:00
Olivier Prat	7fa5e384b9	Merge branch 'master' of http://github.com/highfidelity/hifi into fade	2018-03-28 11:21:07 -04: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
Olivier Prat	6b44d79f90	Proposal to improve fade editing with some extra visual cues	2018-03-20 17:48:41 -07:00
Olivier Prat	143a315f1d	Fade edited objects are now selected with ray picking	2018-03-20 15:29:50 -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
Olivier Prat	f0a7a9b21c	Merged with master	2018-03-20 10:24:41 -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
SamGondelman	4adc357534	apply taa to text and web entities/overlays	2018-03-13 11:57:14 -07:00
John Conklin II	5be2f0acc7	Merge pull request #12490 from Zvork/taa ... Temporal Anti-Aliasing	2018-03-13 09:03:50 -07:00
Brad Davis	9056ee0f14	Merge branch 'gl_common' into bindless	2018-03-12 11:27:30 -07: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
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
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	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
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	fc8f1c1e65	Resolving conflicts	2018-03-02 14:20:33 -08:00
Cristian Luis Duarte	76e4a5bef2	Android - Change for test, this cast should avoid crashes due to SIGSEV in ToneMappingDeferred::run inputs.get1().	2018-03-02 18:46:14 -03:00
samcake	b8fb97c824	Resolving conflicts	2018-03-02 10:36:55 -08:00
NissimHadar	000b08f7c0	Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork	2018-03-02 08:07:01 -08:00
NissimHadar	0f2cf8ea85	Re-implemented shadow controls.	2018-03-01 14:24:20 -08:00
samcake	a227cf1edb	Fixing bad key/pipeline pair	2018-03-01 10:49:58 -08:00
samcake	dc286544c5	Merging with nissim's pr	2018-02-28 17:54:54 -08:00
samcake	a7542d5b90	fixing the shadow	2018-02-28 17:46:22 -08:00
NissimHadar	5d7e6651a7	Use correct pixel shader.	2018-02-28 11:05:02 -08:00
NissimHadar	faad930e35	WIP.	2018-02-28 08:44:01 -08:00
NissimHadar	5764a21c4a	WIP.	2018-02-28 08:12:48 -08:00
Olivier Prat	bf70e1d4ee	Merge branch 'master' of http://github.com/highfidelity/hifi into taapre	2018-02-28 09:16:31 +01:00
NissimHadar	7cae04883e	WIP.	2018-02-27 17:19:02 -08:00
NissimHadar	f52f146db5	WIP.	2018-02-27 16:28:46 -08:00
David Rowe	a782b6779a	Merge branch 'master' into 21709 ... # Conflicts: # interface/src/ui/overlays/Overlays.h # interface/src/ui/overlays/Shape3DOverlay.cpp # libraries/entities/src/EntityItemProperties.cpp # libraries/entities/src/EntityScriptingInterface.h	2018-02-28 12:42:05 +13:00
NissimHadar	00f3682bbe	NOT WORKING YET.	2018-02-27 14:09:31 -08:00
Brad Davis	136ced98c3	Merge remote-tracking branch 'upstream/master' into android_dev	2018-02-27 13:44:00 -08:00
SamGondelman	cc53b338db	Merge remote-tracking branch 'upstream/master' into scriptableMaterials	2018-02-27 13:30:03 -08:00
SamGondelman	0fca56eef0	Revert "Merge pull request #12407 from NissimHadar/shadowControlsOffZvork" ... This reverts commit 3201d2ba21, reversing changes made to c0f20900a0.	2018-02-27 11:33:05 -08:00
SamGondelman	a4b04d9d43	merge	2018-02-27 10:08:30 -08:00
Brad Davis	6254e2b569	PR feedback	2018-02-27 09:11:40 -08:00
Brad Davis	f01c42dcc9	Fixing merged dual-quat pipelines	2018-02-27 08:54:46 -08:00
John Conklin II	48f0cded05	Merge pull request #12440 from humbletim/Leopoly_Phase1_010_graphics-scripting ... Leopoly_Phase1_010 Graphics Scripting	2018-02-27 07:53:25 -08:00
Olivier Prat	f356d9d9ee	Merge branch 'taa' into taapre	2018-02-27 10:17:26 +01:00
Olivier Prat	2eb7be26cf	Merged with master and fixed tablet NoAA flag	2018-02-27 10:16:25 +01:00
Olivier Prat	2d71d7da9f	Merge branch 'master' of http://github.com/highfidelity/hifi into taa	2018-02-27 09:11:43 +01:00
humbletim	d3bae87066	* remove unneeded Q_DECLARE_METATYPEs ... * CR feedback	2018-02-26 19:07:55 -05:00
Brad Davis	b9387f2a21	Merge remote-tracking branch 'upstream/master' into android_dev	2018-02-26 13:18:14 -08:00
SamGondelman	6fe2d46d7c	merge	2018-02-26 12:40:14 -08:00
Sam Gondelman	d1d6adf447	Merge pull request #12493 from sethalves/fix-shadows-on-osx-1 ... fix osx shadows	2018-02-26 11:46:43 -08:00
Anthony J. Thibault	f5fcaae283	Merge branch 'master' into bug-fix/entity-mat-avatar-dual-quaternions	2018-02-26 10:55:44 -08:00
Anthony J. Thibault	0404b722e4	Code review feedback	2018-02-26 10:00:32 -08:00
Brad Davis	3e552e5739	Fix warnings	2018-02-26 09:53:35 -08:00
Olivier Prat	12d7e89d7e	Switched back velocity buffer job to original place while I try to get more info on how/where that tablet is rendered	2018-02-26 18:13:41 +01:00
Olivier Prat	d288ebe79e	Moved velocity buffer job just before antialiasing job to be sure tablet model in HMD writes correct velocity and gets properly antialiased	2018-02-26 18:07:44 +01:00
Olivier Prat	c04bf095ec	Limited sharpen range	2018-02-26 16:48:10 +01:00
Olivier Prat	16cd1e3fd5	Adjusted bloom effect to work with antialiasing	2018-02-26 15:26:12 +01:00
Olivier Prat	419e064e65	Moved antialiasing before tonemapping	2018-02-26 14:57:59 +01:00
humbletim	3dbe5d79bb	fix windows punctilious warnings	2018-02-26 06:01:16 -05:00
humbletim	f824edd04e	* remove Model_temporary_hack ... * split gpuhelpers and mesh part * fix objwriter * more work on bufferview helpers * cr cleanup	2018-02-26 04:58:22 -05:00
SamGondelman	b56f755034	material reflection	2018-02-23 17:58:46 -08:00
Brad Davis	0550138609	Merge remote-tracking branch 'upstream/master' into android_dev	2018-02-23 12:48:10 -08:00
Olivier Prat	37fdf81f1b	Fix warnings on mac and ubuntu	2018-02-23 19:37:12 +01:00
Seth Alves	59bd05aa55	make shadow-related shader compile on osx	2018-02-23 09:22:34 -08:00
humbletim	058e4d1926	CR feedback; whitespace / remove unnecessary diffs	2018-02-23 09:12:33 -05:00
humbletim	f8fe06213d	CR feedback; whitespace / remove unnecessary diffs	2018-02-23 09:11:23 -05:00
Olivier Prat	6a550e983f	Disable sharpen with FXAA	2018-02-23 14:46:37 +01:00
Olivier Prat	095f426f31	Adjusted default sharpen	2018-02-23 14:43:22 +01:00