Konstantin Käfer 5135c59b71 Merge branch 'master' into outdoors-style ...

Conflicts:
	bin/style.js
	src/map/map.cpp

2014-05-13 16:18:52 +02:00

..

geometry

do not use shared pointers for buffers

2014-03-25 13:41:20 +01:00

map

Merge branch 'master' into outdoors-style

2014-05-13 16:18:52 +02:00

platform

fix comment

2014-05-02 10:30:52 +02:00

renderer

only paint layer if it has data

2014-05-12 19:08:59 +02:00

shader

squashed stylequest merge

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

style

abort rendering early if the style is disabled

2014-05-13 15:15:54 +02:00

text

implement alwaysVisible

2014-03-24 17:38:10 +01:00

util

move weak_ptr list of tile_data objects to a map for faster lookups

2014-05-13 12:01:29 +02:00

llmr.hpp

remove concept of settings object from library

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