3579 commits

Author	SHA1	Message	Date
Sam Gateau	d3fccc4104	Merge pull request #12881 from SamGondelman/scaleAssert ... Minimum entity dimension (1mm)	2018-04-23 13:40:53 -07:00
Sam Gateau	d1e2e9ce71	Merge pull request #12921 from SamGondelman/precisionq ... Fix AMD shader compilation	2018-04-23 10:17:35 -07:00
SamGondelman	ac7e8623bf	quiet shader warnings	2018-04-20 18:25:30 -07:00
SamGondelman	d59f368ad6	hide menu, fix shaders	2018-04-20 17:38:38 -07:00
John Conklin II	11f509e57a	Merge pull request #12873 from Zvork/haze ... Fix for weird color shifting of teleportation target in Rust domain	2018-04-19 14:11:47 -07:00
Olivier Prat	c8bef8651f	Fixed weird specular on hair an teleportation target! Was a stupid mistake...	2018-04-19 10:04:38 +02:00
Stephen Birarda	c4ad93bafb	Merge pull request #12782 from SimonWalton-HiFi/qregexp ... Replace LogHandler repeated regex scheme with assigned ID tracking scheme	2018-04-18 17:28:48 -07:00
Olivier Prat	1c9d1f6c48	Merge branch 'master' of http://github.com/highfidelity/hifi into haze	2018-04-18 09:06:23 +02:00
John Conklin II	86c9b8c61d	Merge pull request #12892 from SimonWalton-HiFi/batch-compile-shaders ... Batch compile shaders	2018-04-17 15:47:32 -07:00
SamGondelman	901301485b	reorganizing shader defines to fix compilation errors	2018-04-17 15:11:56 -07:00
Simon Walton	b2e736da70	Remove commented-out code	2018-04-16 11:57:14 -07:00
Sam Gateau	19aa49832b	Merge pull request #12750 from SamGondelman/androidPrimitives ... Forward pipelines for primitives	2018-04-16 11:18:56 -07:00
Olivier Prat	f9cc4994df	Merge branch 'master' of http://github.com/highfidelity/hifi into haze	2018-04-16 14:00:33 +02:00
Olivier Prat	9ad9c070f8	Some small shader optimizations	2018-04-16 08:50:18 +02:00
Simon Walton	b469cdfda2	More shaders to deferred compile scheme	2018-04-13 17:52:33 -07:00
SamGondelman	c8afaf27e5	Merge remote-tracking branch 'upstream/master' into scaleAssert	2018-04-13 17:30:03 -07:00
Simon Walton	1ab31d9116	Defer some shader compilation to a batch job - WIP	2018-04-13 15:38:48 -07:00
Olivier Prat	8ef25301cb	Fixed some shader program link errors	2018-04-13 17:14:19 +02:00
Olivier Prat	190e9313c7	Sorted out the mix between eye space and world space vectors in translucent object shading	2018-04-13 15:38:55 +02:00
John Conklin II	9123c05eb3	Merge pull request #12859 from samcake/one ... Fix a bug when switching shadow on/off in front of mirror	2018-04-12 15:25:05 -07:00
SamGondelman	284364683d	Merge remote-tracking branch 'upstream/master' into scaleAssert	2018-04-12 14:46:40 -07:00
SamGondelman	9f3a431c5d	minimum entity dimension	2018-04-12 14:12:52 -07:00
Sam Gateau	20ae247185	Merge pull request #12784 from Zvork/zeye ... Potential bug correction when constructing eye position from Z-buffer depths in shaders	2018-04-12 11:10:09 -07:00
Olivier Prat	2adac241d0	Fixed incorrect fragment to eye dir computation in haze	2018-04-12 15:11:10 +02:00
SamGondelman	e0b2c076ef	cleanup and fix forward procedural rendering	2018-04-11 13:03:57 -07:00
Sam Gateau	167db14bdb	restoring the sampler desc layout to fix ktx cache and fixing the bug shadow when turning global shadow on off	2018-04-11 00:00:11 -07:00
SamGondelman	d841eeb6e9	Merge remote-tracking branch 'upstream/master' into androidPrimitives	2018-04-10 16:52:08 -07:00
SamGondelman	0c069574c5	forward pipelines for primitives	2018-04-10 15:56:08 -07: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
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