Leith Bade
70057e1b8e
Merge branch 'master' of https://github.com/mapbox/mapbox-gl-native into android-mason
...
Conflicts:
gyp/common.gypi
include/mbgl/geometry/vao.hpp
include/mbgl/platform/event.hpp
include/mbgl/platform/gl.hpp
platform/default/http_request_baton_curl.cpp
src/storage/response.cpp
2014-11-09 00:35:52 +11:00
Leith Bade
160712274d
Fix Linux build
2014-11-08 13:10:16 +11:00
Leith Bade
c0bcd1e260
Add cache path variable from Java
...
Use cache path for db location
Add Assetbridge to extract asset files to cache path
Fix SSL by using extracted ca bundle
Use file:// style URL using extracted styles
2014-11-08 12:49:46 +11:00
Leith Bade
0ac4247f72
Temp disable SSL cert validation
2014-11-08 08:44:39 +11:00
Konstantin Käfer
01d4cdbb02
clean up poll handle data in close() function so that assert() won't fail
2014-11-06 13:21:46 +01:00
Konstantin Käfer
3303db79d9
fix undefined value
...
[skip ci]
2014-11-06 13:05:52 +01:00
Konstantin Käfer
3038cdbbf3
fix various issues in curl bindings related to tile cancelation
2014-11-06 13:05:51 +01:00
Leith Bade
fcab29cab0
Fix libuv ifdef bug
2014-11-05 21:11:51 +11:00
Konstantin Käfer
75889d8124
replace strftime_l with our custom formatter
2014-11-04 06:44:50 -08:00
Konstantin Käfer
d299e58088
Merge remote-tracking branch 'origin/headless-display' into gyp-restructuring
...
Conflicts:
Makefile
ios/mapbox-gl-cocoa
2014-10-24 16:41:04 +02:00
Konstantin Käfer
cd9a89257a
restructure gyp files
2014-10-24 16:40:08 +02:00
