summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* remove compositing from stylesheetKonstantin Käfer2014-08-141-91/+84
* use vaos only when the value is 1, not when it is merely definedKonstantin Käfer2014-08-141-6/+6
* only set changed glDepthRange valuesKonstantin Käfer2014-08-148-11/+21
* bump Cocoa for bundled style APIJustin R. Miller2014-08-131-0/+0
* Merge branch 'master' of github.com:mapbox/mapbox-gl-nativeJustin R. Miller2014-08-138-10/+123
|\
| * Merge pull request #418 from mapbox/raster-stylingLauren Budorick2014-08-138-6/+120
| |\
| | * fix std::sqrtLauren Budorick2014-08-131-2/+2
| | * std namespacing trig fnsLauren Budorick2014-08-122-7/+5
| | * rm commented line [skip ci]Lauren Budorick2014-08-121-2/+0
| | * parsing brightness correctlyLauren Budorick2014-08-123-6/+4
| | * Raster styling all functional except brightness -- need to rework parsingLauren Budorick2014-08-126-1/+121
| * | remove unnecessary variableKonstantin Käfer2014-08-131-4/+3
| |/
* | bump CocoaJustin R. Miller2014-08-131-0/+0
|/
* Merge pull request #400 from mapbox/rasterizeLauren Budorick2014-08-1247-252/+2504
|\
| * add outdoors styleKonstantin Käfer2014-08-121-0/+2220
| * remove trailing whitespaceKonstantin Käfer2014-08-1214-32/+32
| * use unified RenderPass typeKonstantin Käfer2014-08-128-21/+21
| * Merge branch 'master' into rasterizeKonstantin Käfer2014-08-1232-159/+2762
| |\
| * \ Merge branch 'master' into rasterizeKonstantin Käfer2014-08-1228-233/+260
| |\ \
| * | | minor access changes etcLauren Budorick2014-08-115-11/+3
| * | | some cleaning up, raster spin->hue-rotate renameLauren Budorick2014-08-119-59/+26
| * | | VICTORYLauren Budorick2014-08-1128-60/+60
| * | | render single tile in source.cppLauren Budorick2014-08-115-72/+23
| * | | rebase fixLauren Budorick2014-08-111-1/+0
| * | | committing so as to be revertable when i accidentally destroy the painter fnsLauren Budorick2014-08-113-4/+79
| * | | unnecessary includeLauren Budorick2014-08-111-2/+0
| * | | textures binding to map, just the wrong textures -- but so much closerLauren Budorick2014-08-112-15/+31
| * | | need to figure out how to use modified matrix in drawing prerendered texturesLauren Budorick2014-08-115-29/+38
| * | | still not workingLauren Budorick2014-08-119-19/+59
| * | | rm rasterize_properties, should be close to working...doesn't workLauren Budorick2014-08-1120-280/+95
| * | | take 2, still not workingLauren Budorick2014-08-1113-48/+153
| * | | nonworking prerendering attemptsLauren Budorick2014-08-1112-84/+149
* | | | change directory, as the other won't make xcode update the filesKonstantin Käfer2014-08-121-1/+1
| |_|/ |/| |
* | | Merge pull request #370 from mapbox/style-parser-testKonstantin Käfer2014-08-1232-159/+2762
|\ \ \ | |_|/ |/| |
| * | explicitly define destructor to avoid destructing with forward declarationKonstantin Käfer2014-08-122-0/+6
| * | pass absolute path to npm executableKonstantin Käfer2014-08-124-4/+18
| * | Merge branch 'master' into style-parser-testKonstantin Käfer2014-08-1228-233/+260
| |\ \ | |/ / |/| |
* | | Merge branch 'no-uv-headers'Konstantin Käfer2014-08-120-0/+0
|\ \ \
| * | | bump cocoa bindingsKonstantin Käfer2014-08-121-0/+0
* | | | Merge branch 'master' of https://github.com/mapbox/mapbox-gl-nativeKonstantin Käfer2014-08-1227-231/+246
|\ \ \ \
| * \ \ \ Merge pull request #410 from mapbox/no-uv-headersKonstantin Käfer2014-08-1228-233/+260
| |\ \ \ \ | | |/ / / | | | | / | | |_|/ | |/| |
| | * | bump cocoa dependencyKonstantin Käfer2014-08-121-0/+0
| | * | include correct uv header in test fixtureKonstantin Käfer2014-08-121-1/+1
| | * | fix gyp buildsKonstantin Käfer2014-08-123-28/+20
| | * | remove uv.h dependency in darwin-specific codeKonstantin Käfer2014-08-122-17/+16
| | * | remove uv.h dependency from header filesKonstantin Käfer2014-08-1221-186/+210
* | | | make output emptyKonstantin Käfer2014-08-121-1/+1
| |/ / |/| |
* | | remove uv.h dependency in util/time.hppKonstantin Käfer2014-08-112-4/+16
|/ /
| * build fixesMike Morris2014-08-114-6/+2247
| * Revert "dont exit early from npm_install.sh"Mike Morris2014-08-111-0/+1
View Lorry Controller Status