Konstantin Käfer 3413ee536d Merge branch 'master' into sdf ...

Conflicts:
	include/llmr/map/tile_data.hpp
	include/llmr/shader/shaders.hpp
	src/map/map.cpp
	src/map/tile_data.cpp
	src/platform/platform.cpp
	src/shader/shaders.cpp

2014-03-21 13:36:32 +01:00

..

animation.hpp

add timeouts for panning,scaling,rotating

2014-02-21 11:31:24 +01:00

constants.hpp

move tile size to a cpp file

2014-03-11 12:12:05 +01:00

mat4.hpp

float[16] => std::array<float, 16>

2014-01-29 15:09:00 +01:00

math.hpp

port of collision class

2014-03-17 16:53:40 +01:00

noncopyable.hpp

c++

2014-02-06 10:33:46 +00:00

pbf.hpp

return meaningful error codes

2014-03-05 16:46:27 +01:00

raster.hpp

fixes #70: raster tile rendering as toggleable mode from vector

2014-03-18 16:57:17 -07:00

rect.hpp

port remainder of the the placement algorithm

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

std.hpp

move to vertex array objects

2014-02-05 18:06:16 +01:00

string.hpp

make bundle on mac os x and persist settings

2014-01-16 13:53:10 +01:00

texturepool.hpp

fixes #70: raster tile rendering as toggleable mode from vector

2014-03-18 16:57:17 -07:00

threadpool.hpp

we're not doing recursive locking

2014-03-03 13:05:01 +01:00

unitbezier.hpp

c++

2014-02-06 10:50:31 +00:00

variant.hpp

port remainder of the the placement algorithm

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

vec.hpp

port remainder of the the placement algorithm

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