Konstantin Käfer 915e89bee8 Merge branch 'master' into symbols ...

Conflicts:
	src/renderer/painter_text.cpp

2014-08-06 15:32:48 +02:00

..

composite_shader.cpp

rename llmr => mbgl

2014-07-16 18:53:56 -07:00

composite.fragment.glsl

fix alpha blending + add depth/stencil buffers

2014-05-21 18:34:41 +02:00

composite.vertex.glsl

fix alpha blending + add depth/stencil buffers

2014-05-21 18:34:41 +02:00

dot_shader.cpp

rename llmr => mbgl

2014-07-16 18:53:56 -07:00

dot.fragment.glsl

squashed stylequest merge

2014-05-07 10:37:25 -07:00

dot.vertex.glsl

squashed stylequest merge

2014-05-07 10:37:25 -07:00

gaussian_shader.cpp

rename llmr => mbgl

2014-07-16 18:53:56 -07:00

gaussian.fragment.glsl

use sigma 1 for blur by default

2014-05-26 15:35:08 +02:00

gaussian.vertex.glsl

use sigma 1 for blur by default

2014-05-26 15:35:08 +02:00

icon_shader.cpp

fix icon rendering

2014-08-06 12:36:19 +02:00

icon.fragment.glsl

fix black border around icon

2014-08-06 14:35:57 +02:00

icon.vertex.glsl

fix icon rendering

2014-08-06 12:36:19 +02:00

line_shader.cpp

implement line-blur and fix retina antialiasing

2014-08-05 14:17:00 -07:00

line.fragment.glsl

implement line-blur and fix retina antialiasing

2014-08-05 14:17:00 -07:00

line.vertex.glsl

squashed stylequest merge

2014-05-07 10:37:25 -07:00

linejoin_shader.cpp

rename llmr => mbgl

2014-07-16 18:53:56 -07:00

linejoin.fragment.glsl

drawing lines with triangles

2014-02-11 15:51:54 +01:00

linejoin.vertex.glsl

get point shader to work on ios

2014-02-11 17:58:33 +01:00

outline_shader.cpp

rename llmr => mbgl

2014-07-16 18:53:56 -07:00

outline.fragment.glsl

add antialiased line shader

2014-01-17 16:52:41 +01:00

outline.vertex.glsl

remove all mentions of degenerate things

2014-02-13 16:37:16 +01:00

pattern_shader.cpp

rename llmr => mbgl

2014-07-16 18:53:56 -07:00

pattern.fragment.glsl

textured fills

2014-02-03 22:51:21 +01:00

pattern.vertex.glsl

textured fills

2014-02-03 22:51:21 +01:00

plain_shader.cpp

rename llmr => mbgl

2014-07-16 18:53:56 -07:00

plain.fragment.glsl

remove opacity (use color instead)

2014-04-15 18:42:23 -04:00

plain.vertex.glsl

cut down on redundant gl uniform changes

2014-02-13 16:21:51 +01:00

raster_shader.cpp

rename llmr => mbgl

2014-07-16 18:53:56 -07:00

raster.fragment.glsl

remove accidental bias value

2014-06-05 08:45:34 +02:00

raster.vertex.glsl

first draft at blurring

2014-05-23 18:30:49 +02:00

shader.cpp

rename llmr => mbgl

2014-07-16 18:53:56 -07:00

text_shader.cpp

fix icon rendering

2014-08-06 12:36:19 +02:00

text.fragment.glsl

add textshader

2014-03-21 14:26:25 +01:00

text.vertex.glsl

fix rotation range check in text shader

2014-05-19 17:35:55 -04:00