Young Hahn 2d0b3482ec Merge branch 'master' into linebreak ...

Conflicts:
	src/map/tile_parser.cpp
	src/text/glyph_store.cpp

2014-05-30 09:00:29 -04:00

..

collision.hpp

ignore flipped glyphs when placing labels for perf

2014-05-27 18:49:18 +03:00

glyph_store.hpp

add text letterSpacing

2014-05-30 04:02:23 -04:00

glyph.hpp

Merge branch 'master' into linebreak

2014-05-30 09:00:29 -04:00

placement.hpp

parse maxWidth, lineHeight and alignment, pass to FontStack::getShaping

2014-05-30 00:07:22 -04:00

rotation_range.hpp

port remainder of the the placement algorithm

2014-03-19 18:58:50 +01:00

types.hpp

remove some leftover code

2014-05-27 18:19:24 +03:00