summaryrefslogtreecommitdiff
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Fix crashLeith Bade2014-11-121-1/+1
* Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-masonLeith Bade2014-11-121-1/+1
|\
| * repair undef None GLX wrapper, pass 0 instead of None to GLX functionsMike Morris2014-11-101-1/+1
* | Add noncopyableLeith Bade2014-11-123-3/+6
* | Tidy code up moreLeith Bade2014-11-121-25/+25
* | Renamed source files using mapbox styleLeith Bade2014-11-123-0/+156
* | Wait for pauseLeith Bade2014-11-091-1/+4
* | Add async assertsLeith Bade2014-11-091-2/+2
* | Add Map::pause/resumeLeith Bade2014-11-093-0/+35
* | Merge branch 'master' of https://github.com/mapbox/mapbox-gl-native into andr...Leith Bade2014-11-095-50/+29
|\ \ | |/
| * add glx supportKonstantin Käfer2014-11-071-0/+1
| * load VAO extensionKonstantin Käfer2014-11-074-39/+30
| * use linear<16,4> splitting algorithm (faster running tests)artemp2014-11-051-1/+1
* | Make image.cpp use Log functionsLeith Bade2014-11-081-0/+2
* | Finish android log backendLeith Bade2014-11-071-0/+24
* | Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-masonDane Springmeyer2014-11-0414-234/+261
|\ \ | |/
| * Support compound text-anchor valuesJohn Firebaugh2014-11-041-1/+9
| * Single text positioning propertyJohn Firebaugh2014-11-042-21/+10
| * Render ⇢ layout, style ⇢ paintJohn Firebaugh2014-11-041-3/+3
| * Implement v6 filtersJohn Firebaugh2014-11-048-207/+232
| * line-offset -> line-gap-widthLauren Budorick2014-11-042-2/+2
| * replace strftime_l with our custom formatterKonstantin Käfer2014-11-041-0/+6
| * make util::utf8_to_utf32::convert() staticartemp2014-11-031-2/+1
* | merge with masterDane Springmeyer2014-11-031-28/+0
|\ \ | |/
| * cleanup after 195560090/#309/#530Dane Springmeyer2014-11-031-28/+0
* | centralize android ifdefsDane Springmeyer2014-11-021-0/+2
* | mason-based android portDane Springmeyer2014-11-012-6/+18
|/
* Merge branch 'master' into platform-imageKonstantin Käfer2014-10-313-7/+11
|\
| * use binary mesa on travis to speed up build timesKonstantin Käfer2014-10-311-1/+0
| * allow providing a callback to uv_messenger_stop to prevent mismatched new/freeKonstantin Käfer2014-10-301-1/+2
| * use boost::unicode_iterator on all platform (experimental)artemp2014-10-301-5/+9
* | also allow underscores in token namesKonstantin Käfer2014-10-301-1/+1
* | use CoreImage for decoding/encoding images on osx/iosKonstantin Käfer2014-10-302-3/+3
* | do not crash for missing imagesKonstantin Käfer2014-10-301-1/+1
* | use unique_ptr for automatic deallocationKonstantin Käfer2014-10-301-5/+3
|/
* remove regex/boost regex usageKonstantin Käfer2014-10-301-21/+19
* remove unused and unimplemented methodartemp2014-10-301-2/+0
* pass Tile::ID by const refartemp2014-10-303-3/+3
* merge with mbgl-configDane Springmeyer2014-10-299-62/+49
|\
| * store uv::loop as unique_ptrartemp2014-10-291-2/+1
| * simplify - remove before/afterParse and create Parser on stack in worker threadartemp2014-10-292-8/+0
| * store spriteAtlas by value + make TileParser noncopyableartemp2014-10-292-7/+8
| * store glyphAtlas by value in Map object, pass by refartemp2014-10-295-10/+8
| * Fix variable shadowingJohn Firebaugh2014-10-291-1/+1
| * Replace uv::rwlock with std::recursive_mutexJohn Firebaugh2014-10-291-4/+2
| * Render map with a copy of TransformStateJohn Firebaugh2014-10-293-12/+19
| * Hold internal reference to Sprite in SpriteAtlasJohn Firebaugh2014-10-291-18/+11
| * Merge branch 'master' of github.com:mapbox/mapbox-gl-nativeJustin R. Miller2014-10-2739-140/+547
| |\
| * | refs #509: tickets good, inline TODO badJustin R. Miller2014-10-271-1/+0
* | | gyp fixesKonstantin Käfer2014-10-282-40/+40
| |/ |/|