summaryrefslogtreecommitdiff
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'libuv010' into libuv-0.10-fix-context-shutdownMike Morris2014-09-242-1/+5
|\
| * Merge branch 'master' into libuv010Mike Morris2014-09-242-1/+5
| |\
| | * Refactor tile cover to match JSJohn Firebaugh2014-09-222-1/+5
* | | Merge branch 'fix-context-shutdown-merge' into libuv-0.10-fix-context-shutdownMike Morris2014-09-103-0/+9
|\ \ \ | |/ / |/| |
| * | Adds the function Map::terminate() to allow all GL resources heldLeith Bade2014-09-102-0/+5
| * | Add View::make_inactive() to remove context from rendering threadLeith Bade2014-09-101-0/+4
| |/
* | Merge branch 'master' into libuv010Mike Morris2014-09-0923-270/+254
|\ \ | |/
| * SDF icon support (fixes #404)John Firebaugh2014-09-084-6/+33
| * FrameHistory::getFadePropertiesJohn Firebaugh2014-09-051-0/+8
| * Match js shadersJohn Firebaugh2014-09-052-3/+8
| * TextShader ⇢ SDFShaderJohn Firebaugh2014-09-043-8/+8
| * Less shader boilerplateJohn Firebaugh2014-09-0414-268/+147
| * Fix text/icon-translate-anchorJohn Firebaugh2014-09-042-3/+1
| * Add SpriteAtlas::getPosition()John Firebaugh2014-09-031-0/+9
| * Make renderLine more similar to JSJohn Firebaugh2014-09-031-7/+6
| * linepattern in progressLauren Budorick2014-09-033-1/+64
| * Revert "coalesce texture uploads at the beginning of a frame"John Firebaugh2014-09-032-5/+2
| * Revert "Avoid zero size array warning"John Firebaugh2014-09-031-1/+0
* | Merge branch 'master' into libuv010Mike Morris2014-08-298-14/+29
|\ \ | |/
| * Fix text-line-heightJohn Firebaugh2014-08-281-3/+3
| * SimplifyJohn Firebaugh2014-08-281-1/+0
| * Remove vtxMatrix stateJohn Firebaugh2014-08-281-2/+1
| * Fix default text-sizeJohn Firebaugh2014-08-281-1/+1
| * Record frame history in the correct placeJohn Firebaugh2014-08-281-2/+2
| * Make Glyph and Sprite Atlases noncopyableJohn Firebaugh2014-08-282-2/+4
| * Avoid zero size array warningJohn Firebaugh2014-08-281-0/+1
| * background-opacity supportJohn Firebaugh2014-08-282-0/+2
| * Render background with plain shaderJohn Firebaugh2014-08-272-3/+15
* | Merge branch 'master' into libuv010Mike Morris2014-08-277-12/+23
|\ \ | |/
| * fix basepath for headless stylesheetsKonstantin Käfer2014-08-271-0/+1
| * test with the current release type's settings to avoid double compilesKonstantin Käfer2014-08-271-5/+0
| * Merge pull request #451 from mapbox/noncopyable-vaoKonstantin Käfer2014-08-274-4/+22
| |\
| | * make ElementGroup and VertexArrayObject movable to avoid using unique_ptrsKonstantin Käfer2014-08-275-6/+21
| | * VertexArrayObject and ElementGroup should be noncopyableJohn Firebaugh2014-08-265-10/+13
| * | Remove unusedJohn Firebaugh2014-08-261-3/+0
| |/
* | Merge branch 'master' into libuv010Mike Morris2014-08-2611-59/+56
|\ \ | |/
| * Merge pull request #445 from mapbox/nsstringKonstantin Käfer2014-08-261-0/+6
| |\
| | * use platform-specific NSString for case changes on OS X/iOSKonstantin Käfer2014-08-221-0/+6
| * | Merge pull request #439 from mapbox/clippingKonstantin Käfer2014-08-265-7/+43
| |\ \
| | * | add != operator for certain stdlib implementationsKonstantin Käfer2014-08-211-0/+4
| | * | don't trip up certain stdlib implementationsKonstantin Käfer2014-08-211-1/+1
| | * | compute unique clip ids per tile, taking covering children into accountKonstantin Käfer2014-08-215-7/+39
| | |/
| * | Merge pull request #437 from mapbox/fix-gccKonstantin Käfer2014-08-265-52/+7
| |\ \
| | * | use correct implementationKonstantin Käfer2014-08-211-1/+1
| | * | also use boost codecvt on linuxKonstantin Käfer2014-08-211-1/+2
| | * | remove unused threadpool classKonstantin Käfer2014-08-211-46/+0
| | * | add a few fixes for gccKonstantin Käfer2014-08-215-7/+7
| | |/
* | | Merge branch 'master' into libuv010Mike Morris2014-08-2512-48/+99
|\ \ \ | |/ /
| * | Support for Mapbox fontstack APIJohn Firebaugh2014-08-222-0/+31
| * | Use float for pixelRatioLeo Lou2014-08-221-2/+2
View Lorry Controller Status