Leith Bade
|
e52cf05ac3
|
Fix json string crash
|
2014-11-18 23:34:46 +11:00 |
|
Leith Bade
|
f0e4e27cd3
|
Read styles from APK
|
2014-11-17 23:17:22 +11:00 |
|
Leith Bade
|
aee724d6cf
|
Create AssetRequest
|
2014-11-17 20:00:44 +11:00 |
|
Leith Bade
|
2aed807d4c
|
Add coffeecatch to Map::run()
|
2014-11-16 20:04:36 +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
|
6109102923
|
Remove left over test logs
|
2014-11-11 22:30:55 +11:00 |
|
Leith Bade
|
6b65aa62a1
|
Fix flixker after switch
|
2014-11-10 00:23:09 +11:00 |
|
Leith Bade
|
145296ac11
|
Actually remove read fill
|
2014-11-09 23:55:00 +11:00 |
|
Leith Bade
|
1e55c332cd
|
Wait for pause
Tidy up
Remove red fill
|
2014-11-09 23:52:34 +11:00 |
|
Leith Bade
|
3696e05193
|
Add async asserts
|
2014-11-09 22:54:05 +11:00 |
|
Leith Bade
|
28d66bb6f8
|
Add Map::pause/resume
Fixed bug after switching apps
|
2014-11-09 22:36:37 +11:00 |
|
Leith Bade
|
b3e3c21129
|
Reduce calls to context swapping
|
2014-11-09 17:36:27 +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
|
30a420d9a3
|
More tidying up
|
2014-11-08 22:59:16 +11:00 |
|
Leith Bade
|
0ac4247f72
|
Temp disable SSL cert validation
|
2014-11-08 08:44:39 +11:00 |
|
Leith Bade
|
01ead83b39
|
Android mapbogl now loads maps!
(had to change JSON loading to http - temp fix)
|
2014-11-08 08:07:47 +11:00 |
|
Konstantin Käfer
|
582d616deb
|
load VAO extension
|
2014-11-07 18:17:24 +01:00 |
|
Leith Bade
|
6c5331ee73
|
Add more detail to TileJSON error
|
2014-11-08 02:29:07 +11:00 |
|
Leith Bade
|
585805a754
|
Add logging of http requests
|
2014-11-08 02:15:19 +11:00 |
|
Leith Bade
|
86f8f626f1
|
Change clear to red to debug tile loading
|
2014-11-07 01:40:05 +11:00 |
|
Konstantin Käfer
|
618a4a5785
|
add -Werror to os x as well
|
2014-11-06 14:18: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
|
da49d0adb7
|
Workaround for GL extension. Need to come back to this.
|
2014-11-05 20:17:28 +11:00 |
|
Dane Springmeyer
|
a9ca7fdf11
|
Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason
|
2014-11-04 21:28:18 -05:00 |
|
John Firebaugh
|
051e1c32ae
|
Support compound text-anchor values
|
2014-11-04 12:26:27 -08:00 |
|
John Firebaugh
|
0790b574b4
|
Single text positioning property
https://github.com/mapbox/mapbox-gl-style-spec/issues/197
|
2014-11-04 12:26:27 -08:00 |
|
John Firebaugh
|
9a3b740fcc
|
Render ⇢ layout, style ⇢ paint
https://github.com/mapbox/mapbox-gl-style-spec/issues/166
|
2014-11-04 12:26:14 -08:00 |
|
John Firebaugh
|
c151f12997
|
Implement v6 filters
|
2014-11-04 12:26:14 -08:00 |
|
Lauren Budorick
|
f25cf70689
|
Reinstate 16px line width limit
|
2014-11-04 12:26:14 -08:00 |
|
Lauren Budorick
|
dc834aec91
|
v6: min-zoom -> minzoom, max-zoom -> maxzoom
|
2014-11-04 12:26:14 -08:00 |
|
Lauren Budorick
|
37922605f8
|
Axe the 16-px line width limit
|
2014-11-04 12:26:14 -08:00 |
|
Lauren Budorick
|
3d18160fe4
|
More concise
|
2014-11-04 12:26:14 -08:00 |
|
Lauren Budorick
|
0d6bca0e7e
|
line-offset -> line-gap-width
|
2014-11-04 12:26:13 -08:00 |
|
Konstantin Käfer
|
75889d8124
|
replace strftime_l with our custom formatter
|
2014-11-04 06:44:50 -08:00 |
|
artemp
|
92124d3aa1
|
make util::utf8_to_utf32::convert() static
|
2014-11-03 15:44:27 +00:00 |
|
Dane Springmeyer
|
490a4bb17f
|
centralize android ifdefs
|
2014-11-02 22:55:23 -05:00 |
|
Dane Springmeyer
|
7ea305d021
|
reinterpret_cast for parseCacheControl to avoid -Wformat warning on all platforms
|
2014-11-02 19:37:48 -05:00 |
|
Dane Springmeyer
|
68556362b3
|
avoid -Wformat warning
|
2014-11-02 11:52:29 -05:00 |
|
Dane Springmeyer
|
d7b0a34bdd
|
mason-based android port
|
2014-11-01 22:41:40 -04:00 |
|
Konstantin Käfer
|
a50042349c
|
Merge branch 'master' into platform-image
|
2014-10-31 16:33:45 -04:00 |
|
Konstantin Käfer
|
15cf30652c
|
rename to .hpp to avoid compiling twice
|
2014-10-30 18:00:52 -04:00 |
|
Konstantin Käfer
|
80366bc615
|
allow providing a callback to uv_messenger_stop to prevent mismatched new/free
|
2014-10-30 17:47:34 -04:00 |
|
Konstantin Käfer
|
203acaad9e
|
simplify debug font lookup
|
2014-10-30 17:36:28 -04:00 |
|
Konstantin Käfer
|
8712beff80
|
don't use std::map for checking color constants
|
2014-10-30 16:43:36 -04: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
|
7a13db9a86
|
do not crash for missing images
|
2014-10-30 11:58:16 -04:00 |
|
Konstantin Käfer
|
414ccaaf93
|
use unique_ptr for automatic deallocation
|
2014-10-30 11:54:52 -04:00 |
|
Konstantin Käfer
|
8f1c2b3bce
|
remove regex/boost regex usage
|
2014-10-30 11:34:14 -04:00 |
|
artemp
|
fd2d8f48cb
|
pass Tile::ID by const ref
|
2014-10-30 10:43:58 -04:00 |
|