summaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'libuv010' into libuv-0.10-fix-context-shutdownMike Morris2014-09-243-165/+158
|\
| * Merge branch 'master' into libuv010Mike Morris2014-09-243-165/+158
| |\
| | * transition-* ⇢ *-transitionJohn Firebaugh2014-09-221-31/+31
| | * Refactor tile cover to match JSJohn Firebaugh2014-09-222-134/+127
* | | bump mapnik-packaging, remove unnecessary view.make_active callsMike Morris2014-09-191-9/+4
* | | dont make_active when clearing buffers, call make_inactive at end of Map::pre...Mike Morris2014-09-161-1/+2
* | | don't terminate after Map::runMike Morris2014-09-101-2/+0
* | | fix Map::terminate?Mike Morris2014-09-101-1/+2
* | | update Painter::deleteShadersMike Morris2014-09-101-2/+3
* | | Merge branch 'fix-context-shutdown-merge' into libuv-0.10-fix-context-shutdownMike Morris2014-09-102-0/+26
|\ \ \ | |/ / |/| |
| * | Move notify_map_change() from a global callback, to a callback inLeith Bade2014-09-101-1/+0
| * | Adds the function Map::terminate() to allow all GL resources heldLeith Bade2014-09-102-0/+25
| * | Add View::make_inactive() to remove context from rendering threadLeith Bade2014-09-101-0/+2
| |/
* | Merge branch 'master' into libuv010Mike Morris2014-09-0945-970/+690
|\ \ | |/
| * Fix build on gcc (fixes #464)John Firebaugh2014-09-081-1/+3
| * SDF icon support (fixes #404)John Firebaugh2014-09-086-167/+232
| * Don't overrotate line labels (fixes #462)John Firebaugh2014-09-081-4/+0
| * FrameHistory::getFadePropertiesJohn Firebaugh2014-09-052-37/+43
| * Match js attribute layoutJohn Firebaugh2014-09-052-17/+18
| * Match js shadersJohn Firebaugh2014-09-0512-41/+60
| * Implement text-rotation-alignmentJohn Firebaugh2014-09-041-0/+10
| * TextShader ⇢ SDFShaderJohn Firebaugh2014-09-046-32/+32
| * Less shader boilerplateJohn Firebaugh2014-09-0423-761/+176
| * Fix text/icon-translate-anchorJohn Firebaugh2014-09-041-2/+2
| * Add SpriteAtlas::getPosition()John Firebaugh2014-09-033-41/+23
| * Make renderLine more similar to JSJohn Firebaugh2014-09-034-42/+46
| * linepattern in progressLauren Budorick2014-09-036-12/+269
| * Revert "coalesce texture uploads at the beginning of a frame"John Firebaugh2014-09-033-51/+14
* | uv_async_init &completeMike Morris2014-09-031-1/+1
* | Merge branch 'master' into libuv010Mike Morris2014-08-2910-33/+53
|\ \ | |/
| * Fix text-justify (fixes #444)John Firebaugh2014-08-291-1/+1
| * Implement {text,icon}-translate[-anchor]John Firebaugh2014-08-281-4/+7
| * SimplifyJohn Firebaugh2014-08-281-9/+5
| * Remove vtxMatrix stateJohn Firebaugh2014-08-283-3/+4
| * Record frame history in the correct placeJohn Firebaugh2014-08-282-1/+2
| * background-opacity supportJohn Firebaugh2014-08-285-10/+20
| * Render background with plain shaderJohn Firebaugh2014-08-273-14/+23
| * raster-fade -> raster-fade-durationJohn Firebaugh2014-08-271-2/+2
* | more fixes for libuv v0.10Mike Morris2014-08-271-1/+1
* | switch uv_cwd back to &maxMike Morris2014-08-271-1/+1
* | Merge branch 'master' into libuv010Mike Morris2014-08-273-36/+51
|\ \ | |/
| * add missing headerKonstantin Käfer2014-08-271-0/+1
| * never allow negative segment indicesKonstantin Käfer2014-08-271-1/+1
| * fix basepath for headless stylesheetsKonstantin Käfer2014-08-272-35/+49
* | Revert "fix uv_cwd call"Mike Morris2014-08-261-1/+1
* | fix uv_cwd callMike Morris2014-08-261-1/+1
* | Merge branch 'master' into libuv010Mike Morris2014-08-2610-239/+112
|\ \ | |/
| * Merge pull request #445 from mapbox/nsstringKonstantin Käfer2014-08-261-3/+2
| |\
| | * use platform-specific NSString for case changes on OS X/iOSKonstantin Käfer2014-08-221-3/+2
| * | Merge pull request #439 from mapbox/clippingKonstantin Käfer2014-08-266-177/+105
| |\ \
View Lorry Controller Status