summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #432 from mapbox/travis-bash-strictJustin R. Miller2014-08-183-1/+7
|\
| * refs #431: bring back Travis Bash strictnessJustin R. Miller2014-08-183-1/+7
|/
* Merge pull request #430 from mapbox/fix-build-warningsKonstantin Käfer2014-08-188-9/+6
|\
| * bump cocoa bindingsKonstantin Käfer2014-08-181-0/+0
| * fix warningsKonstantin Käfer2014-08-187-9/+6
|/
* Merge pull request #428 from mapbox/cache-osx-dependenciesKonstantin Käfer2014-08-182-0/+18
|\
| * install awscli on osxKonstantin Käfer2014-08-181-0/+1
| * fix downloadingKonstantin Käfer2014-08-181-1/+1
| * use cached dependencies for os x buildKonstantin Käfer2014-08-181-0/+17
|/
* update README for latest style detailsJustin R. Miller2014-08-151-9/+2
* Merge pull request #426 from mapbox/travis_dual_osJustin R. Miller2014-08-158-26/+54
|\
| * fixes #414: build Travis on both Linux & OS X (including for iOS)Justin R. Miller2014-08-158-26/+54
|/
* update README with more iOS infoJustin R. Miller2014-08-151-2/+7
* update mapnik-packaging to work around openssl problemDane Springmeyer2014-08-151-1/+1
* install node in cross-platform way + fix mapnik-packaging checkoutDane Springmeyer2014-08-151-8/+18
* pin to mapnik-packaging@848c6e8d6692a9 for now to protect against upstream re...Dane Springmeyer2014-08-151-2/+2
* Merge pull request #420 from mapbox/remove-compositeKonstantin Käfer2014-08-1518-326/+8
|\
| * remove composite enums from testsKonstantin Käfer2014-08-151-3/+0
| * fix stylesheet indentationKonstantin Käfer2014-08-151-0/+5
| * remove trailing whitespace + use local image spriteKonstantin Käfer2014-08-151-50/+50
| * remove support for composite layersAnsis Brammanis2014-08-1517-373/+53
|/
* Merge pull request #419 from mapbox/crosstileKonstantin Käfer2014-08-158-89/+128
|\
| * use pimpl for collision in tile_parserKonstantin Käfer2014-08-155-24/+24
| * allow crosstile labels and add `symbol-avoid-edges`Ansis Brammanis2014-08-156-67/+106
* | Merge pull request #423 from mapbox/coalesce-texture-uploadsKonstantin Käfer2014-08-155-16/+30
|\ \ | |/ |/|
| * coalesce texture uploads at the beginning of a frameKonstantin Käfer2014-08-155-16/+30
|/
* Merge pull request #415 from mapbox/fix-vaoKonstantin Käfer2014-08-1533-191/+216
|\
| * base static vertexbuffer on buffer objectKonstantin Käfer2014-08-157-91/+59
| * refactor vao object to use acutal OpenGL IDs rather than object pointersKonstantin Käfer2014-08-1518-77/+123
| * don't replace shaders on duplicate setup() callKonstantin Käfer2014-08-151-11/+11
| * add missing includeKonstantin Käfer2014-08-151-0/+2
| * fix binding to vaosKonstantin Käfer2014-08-1410-25/+34
|/
* fix image pattern renderingKonstantin Käfer2014-08-148-102/+181
* 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