Leith Bade
69cd7268d7
Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason
...
Conflicts:
platform/default/http_request_baton_curl.cpp
2014-12-10 19:13:21 +11:00
Konstantin Käfer
e11c073e51
report version number in user agent string
...
refs #628
2014-12-08 16:21:15 +01:00
Konstantin Käfer
1f91be988b
add user agent header
...
fixes #628
2014-12-08 11:04:08 +01:00
Leith Bade
8f1754cf0a
Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason
...
Conflicts:
include/mbgl/storage/base_request.hpp
include/mbgl/storage/file_request_baton.hpp
include/mbgl/storage/http_request.hpp
include/mbgl/storage/http_request_baton.hpp
include/mbgl/util/uv_detail.hpp
platform/darwin/http_request_baton_cocoa.mm
platform/default/caching_http_file_source.cpp
platform/default/http_request_baton_curl.cpp
src/map/map.cpp
src/storage/base_request.cpp
src/storage/file_request.cpp
src/storage/file_request_baton.cpp
src/storage/http_request.cpp
src/storage/http_request_baton.cpp
2014-12-04 22:19:46 +11:00
John Firebaugh
57249ca32c
Prefer stdlib to libuv ( fixes #688 )
2014-12-03 17:38:10 -08:00
Leith Bade
14cdd9c96f
Rename lots of things
2014-12-04 01:10:43 +11:00
Leith Bade
9db5d2ac55
Remove boost::make_unique
2014-12-03 22:27:40 +11:00
Leith Bade
94d34ce7ac
Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason
...
Conflicts:
src/map/map.cpp
2014-12-03 22:02:55 +11:00
Leith Bade
f090d6b264
Use uv::async and various other fixes
2014-12-03 21:57:55 +11:00
Konstantin Käfer
82f3574d09
add array overloads to make_unique and move it to mbgl::util from std
2014-12-03 11:27:24 +01:00
Leith Bade
e52cf05ac3
Fix json string crash
2014-11-18 23:34:46 +11:00
Jordan Hollinger
417a156b57
Fix missing semicolon;
2014-11-17 15:53:14 -08:00
Leith Bade
80be6c4eb0
Load CA bundle from APK
...
Remove Assetbridge
2014-11-18 00:33:59 +11:00
Leith Bade
0dd54c0379
Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason
...
Conflicts:
platform/default/image.cpp
2014-11-12 23:16:56 +11:00
Konstantin Käfer
27cf24171a
check library versions against header symbols in static initialization function
...
fixes #580
2014-11-12 12:12:01 +01:00
Leith Bade
6b9e3c60ef
Renamed source files using mapbox style
...
Move headers to mbgl/android
Tidy up headers and includes
2014-11-12 21:17:24 +11:00
Leith Bade
de1f37fa9e
Change Assetbridge extraction dir to data dir
...
Only extract needed files
2014-11-11 22:50:37 +11:00
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
