summaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-masonLeith Bade2014-11-121-0/+55
|\
| * check library versions against header symbols in static initialization functionKonstantin Käfer2014-11-121-0/+55
* | Remove left over test logsLeith Bade2014-11-111-4/+0
* | Fix flixker after switchLeith Bade2014-11-101-0/+4
* | Actually remove read fillLeith Bade2014-11-091-2/+2
* | Wait for pauseLeith Bade2014-11-091-59/+38
* | Add async assertsLeith Bade2014-11-091-2/+9
* | Add Map::pause/resumeLeith Bade2014-11-091-2/+87
* | Reduce calls to context swappingLeith Bade2014-11-091-12/+0
* | Merge branch 'master' of https://github.com/mapbox/mapbox-gl-native into andr...Leith Bade2014-11-095-13/+36
|\ \ | |/
| * load VAO extensionKonstantin Käfer2014-11-073-10/+30
| * add -Werror to os x as wellKonstantin Käfer2014-11-061-2/+2
| * fix various issues in curl bindings related to tile cancelationKonstantin Käfer2014-11-061-1/+4
* | More tidying upLeith Bade2014-11-081-0/+9
* | Temp disable SSL cert validationLeith Bade2014-11-082-2/+2
* | Android mapbogl now loads maps!Leith Bade2014-11-081-1/+2
* | Add more detail to TileJSON errorLeith Bade2014-11-081-2/+2
* | Add logging of http requestsLeith Bade2014-11-081-0/+3
* | Change clear to red to debug tile loadingLeith Bade2014-11-071-2/+2
* | Workaround for GL extension. Need to come back to this.Leith Bade2014-11-052-3/+3
* | Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-masonDane Springmeyer2014-11-0410-427/+220
|\ \ | |/
| * Support compound text-anchor valuesJohn Firebaugh2014-11-041-0/+17
| * Single text positioning propertyJohn Firebaugh2014-11-042-11/+18
| * Render ⇢ layout, style ⇢ paintJohn Firebaugh2014-11-041-15/+15
| * Implement v6 filtersJohn Firebaugh2014-11-045-385/+145
| * Reinstate 16px line width limitLauren Budorick2014-11-041-2/+2
| * v6: min-zoom -> minzoom, max-zoom -> maxzoomLauren Budorick2014-11-041-6/+6
| * Axe the 16-px line width limitLauren Budorick2014-11-041-4/+2
| * More conciseLauren Budorick2014-11-041-2/+1
| * line-offset -> line-gap-widthLauren Budorick2014-11-044-5/+6
| * replace strftime_l with our custom formatterKonstantin Käfer2014-11-041-0/+13
| * make util::utf8_to_utf32::convert() staticartemp2014-11-031-3/+1
* | centralize android ifdefsDane Springmeyer2014-11-022-8/+4
* | reinterpret_cast for parseCacheControl to avoid -Wformat warning on all platf...Dane Springmeyer2014-11-021-1/+1
* | avoid -Wformat warningDane Springmeyer2014-11-021-1/+1
* | mason-based android portDane Springmeyer2014-11-013-5/+9
|/
* Merge branch 'master' into platform-imageKonstantin Käfer2014-10-316-124/+126
|\
| * rename to .hpp to avoid compiling twiceKonstantin Käfer2014-10-302-1/+3
| * allow providing a callback to uv_messenger_stop to prevent mismatched new/freeKonstantin Käfer2014-10-303-6/+15
| * simplify debug font lookupKonstantin Käfer2014-10-302-111/+99
| * don't use std::map for checking color constantsKonstantin Käfer2014-10-301-6/+9
* | use CoreImage for decoding/encoding images on osx/iosKonstantin Käfer2014-10-302-188/+1
* | do not crash for missing imagesKonstantin Käfer2014-10-302-0/+4
* | use unique_ptr for automatic deallocationKonstantin Käfer2014-10-301-10/+10
|/
* remove regex/boost regex usageKonstantin Käfer2014-10-301-8/+0
* pass Tile::ID by const refartemp2014-10-303-3/+3
* merge with mbgl-configDane Springmeyer2014-10-2915-342/+323
|\
| * access member variables directly inside class methodsartemp2014-10-291-3/+2
| * store uv::loop as unique_ptrartemp2014-10-291-1/+1
| * simplify - remove before/afterParse and create Parser on stack in worker threadartemp2014-10-292-17/+5