Konstantin Käfer
|
b5e9998b15
|
change file:// to asset:// to indicate that they aren't arbitrary files
refs #579
|
2014-12-17 14:59:05 +01:00 |
|
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
|
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 |
|
Konstantin Käfer
|
37afa5af5b
|
explicitly cast to 32 bit integer
|
2014-11-06 15:40:16 +01:00 |
|
Konstantin Käfer
|
0e3f111a79
|
also use custom formatter for OS X
|
2014-11-04 16:35:08 +01:00 |
|
Konstantin Käfer
|
e3bc69b7e7
|
use CoreImage for decoding/encoding images on osx/ios
|
2014-10-30 12:02:28 -04:00 |
|
Konstantin Käfer
|
0e928b5204
|
make tests work
|
2014-10-24 17:44:51 +02:00 |
|
Konstantin Käfer
|
cd9a89257a
|
restructure gyp files
|
2014-10-24 16:40:08 +02:00 |
|