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 |
|
Konstantin Käfer
|
3b190ddd0d
|
fix build
|
2014-12-04 20:13:08 +01:00 |
|
Konstantin Käfer
|
1e3fb3a423
|
remove usage of relative paths
|
2014-12-04 20:02:51 +01:00 |
|
Konstantin Käfer
|
abafb52f37
|
make most headers private
|
2014-12-04 20:02:50 +01:00 |
|
Leith Bade
|
1c0396690e
|
Fixup after merge
|
2014-12-04 22:39:38 +11: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 |
|
John Firebaugh
|
10ebcbca93
|
Remove unused
|
2014-12-03 13:42:02 -08:00 |
|
Leith Bade
|
991a74774e
|
Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason
Conflicts:
gyp/mbgl-ios.gypi
gyp/mbgl-linux.gypi
gyp/mbgl-osx.gypi
platform/default/caching_http_file_source.cpp
|
2014-12-04 08:02:57 +11:00 |
|
Mike Morris
|
dac76a0f92
|
break out FileSource as an abstract class
add CachingHTTPFileSource implementation
|
2014-12-03 12:25:11 -05:00 |
|
Leith Bade
|
14cdd9c96f
|
Rename lots of things
|
2014-12-04 01:10:43 +11:00 |
|
Leith Bade
|
0935cef9c3
|
Fix tests when using GL 3.0+ context
|
2014-12-02 21:40:23 +11:00 |
|
artemp
|
84551d9349
|
convert image_reader public interface to use CamelCase to match the rest of codebase
|
2014-11-26 17:50:12 +01:00 |
|
artemp
|
4af232dcf3
|
image_readers: premultiply alpha
|
2014-11-21 11:28:56 +01:00 |
|
artemp
|
f89c9753dd
|
image-readers: move concrete implementations headers into platform/default
|
2014-11-19 16:56:53 +01:00 |
|
Mike Morris
|
c542bd1140
|
repair undef None GLX wrapper, pass 0 instead of None to GLX functions
|
2014-11-10 15:06:56 -05:00 |
|
Konstantin Käfer
|
582d616deb
|
load VAO extension
|
2014-11-07 18:17:24 +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
|
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 |
|