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

Conflicts:
	bin/style.js

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

..

geometry

fix texture binding

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

map

Merge branch 'master' into outdoors-style

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

platform

fix for retina screens

2014-05-19 11:13:22 +02:00

renderer

use sprite atlas

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

shader

fix for retina screens

2014-05-19 11:13:22 +02:00

style

Merge branch 'master' into outdoors-style

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

text

use separate trees for horizontal and curved labels

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

util

fix texture binding

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

llmr.hpp

remove concept of settings object from library

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