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

..

bucket_description.hpp

add text letterSpacing

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

class_description.hpp

first shot at composited blending

2014-05-21 10:55:09 +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

fallback to default properties instead of not rendering when we don't have a style

2014-05-30 13:36:53 +02:00

sprite.hpp

incorporate the color and draw circle dots if we don't have an icon

2014-05-19 16:19:51 +02:00

style_parser.hpp

make PropertyTransitions optional

2014-05-28 10:49:56 +02:00

style.hpp

a few preliminary speed improvements

2014-05-27 12:08:36 +02:00

value.hpp

generalize stylesheet parse function

2014-05-26 12:30:27 +02:00