Konstantin Käfer 4ad3a1ee76 Merge branch 'master' into blur ...

Conflicts:
	src/shader/shaders_gl.cpp
	src/shader/shaders_gles2.cpp

2014-05-26 17:30:31 +02:00

..

geometry

first shot at composited blending

2014-05-21 10:55:09 +02:00

map

disallow/undo rotation at low zooms and near world edge

2014-05-23 18:24:58 -07:00

platform

foundations of delegate/callback API

2014-05-23 18:32:55 -07:00

renderer

move a view calls to generic functions

2014-05-26 16:33:38 +02:00

shader

first draft at blurring

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

style

add isVisible function to Properties

2014-05-26 15:34:50 +02:00

text

use separate trees for horizontal and curved labels

2014-05-16 16:06:24 -04:00

util

support for style transitions

2014-05-22 12:46:53 -07:00

llmr.hpp

remove concept of settings object from library

2014-04-30 13:47:03 +02:00