Konstantin Käfer 9bb0146875 Merge branch 'master' into outdoors-style ...

Conflicts:
	bin/style.js

2014-05-19 15:52:42 +02:00

..

bucket_description.hpp

encode icon texture coordinate in buffer so we can render all pois with 1 draw call

2014-05-19 10:48:36 +02:00

class_description.hpp

rename point => icon

2014-05-15 14:51:02 +02:00

layer_description.hpp

don't try to render layers that do not produce anyting during the current render pass

2014-05-12 19:53:06 +02:00

properties.hpp

Merge branch 'master' into outdoors-style

2014-05-19 15:52:42 +02:00

sprite.hpp

fix texture binding

2014-05-19 14:18:29 +02:00

style_parser.hpp

rename point => icon

2014-05-15 14:51:02 +02:00

style.hpp

use sprite atlas

2014-05-19 10:48:36 +02:00

value.hpp

Revert "refs #166: fix for std::stoll et al. not handling strings"

2014-05-12 17:14:28 -07:00