Leith Bade
|
de9eb00276
|
Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason
Conflicts:
.gitignore
gyp/mbgl-ios.gypi
gyp/mbgl-linux.gypi
gyp/mbgl-osx.gypi
include/mbgl/map/map.hpp
src/mbgl/map/map.cpp
src/mbgl/storage/caching_http_file_source.cpp
|
2014-12-05 23:16:49 +11:00 |
|
John Firebaugh
|
ff640132de
|
Move setAccessToken to CachingHTTPFileSource
|
2014-12-04 17:03:23 -08:00 |
|
John Firebaugh
|
0a942b6f14
|
Change Map::stop to use std::function<void()>
Fixes #685
|
2014-12-04 15:58:04 -08:00 |
|
John Firebaugh
|
13564fb876
|
Create GlyphStore up front
|
2014-12-04 15:26:54 -08:00 |
|
John Firebaugh
|
36500b9f95
|
Add CachingHTTPFileSource::clearLoop()
So loop state can be cleaned up in the appropriate thread.
This is a hack; loop needs to be externalized from Map.
Fixes #686
|
2014-12-04 15:26:54 -08:00 |
|
John Firebaugh
|
16fe8e64c4
|
Move setReachability to CachingHTTPFileSource
|
2014-12-04 15:14:40 -08:00 |
|
Konstantin Käfer
|
abafb52f37
|
make most headers private
|
2014-12-04 20:02:50 +01:00 |
|