summaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into style-parser-testMike Morris2014-08-1142-1303/+1707
|\
| * Merge pull request #407 from mapbox/filesourceKonstantin Käfer2014-08-115-17/+100
| |\
| | * don't automatically move back to main threadKonstantin Käfer2014-08-112-5/+4
| | * use a file source object to abstract loading of resourcesKonstantin Käfer2014-08-082-4/+55
| | * use filesource object for loading all http stuffKonstantin Käfer2014-08-085-17/+50
| * | Merge branch 'master' of github.com:mapbox/mapbox-gl-nativeJustin R. Miller2014-08-088-9/+9
| |\ \ | | |/
| | * Eliminate warningsJohn Firebaugh2014-08-078-9/+9
| * | redo of 23970193473fad931245e3f2f7874eef3bf72924Justin R. Miller2014-08-061-2/+2
| |/
| * fix crash bug for styles that have no glyph url specifiedKonstantin Käfer2014-08-062-12/+11
| * Merge branch 'master' into symbolsKonstantin Käfer2014-08-064-10/+20
| |\
| | * implement `line-blur` and fix retina antialiasingAnsis Brammanis2014-08-053-4/+16
| | * Remove roundingJohn Firebaugh2014-08-011-4/+4
| | * Remove unusedJohn Firebaugh2014-07-311-2/+0
| | * comment out verbose log lineJustin R. Miller2014-07-311-1/+1
| * | fix icons on retina screensKonstantin Käfer2014-08-061-1/+1
| * | fix black border around iconKonstantin Käfer2014-08-061-3/+3
| * | use linear interpolation for icons placed along a lineKonstantin Käfer2014-08-061-2/+2
| * | linearly interpolate rotated iconsKonstantin Käfer2014-08-061-3/+9
| * | fix icon renderingKonstantin Käfer2014-08-064-35/+53
| * | convert offset to emKonstantin Käfer2014-08-051-2/+2
| * | port text alignment algorithmKonstantin Käfer2014-08-052-53/+82
| * | we account differently for the ascender alreadyKonstantin Käfer2014-08-052-2/+2
| * | change gamma back to old valueKonstantin Käfer2014-08-051-1/+1
| * | code style fixesKonstantin Käfer2014-08-052-11/+10
| * | use trinary operator rather than || since c++ semantics for || is differentKonstantin Käfer2014-08-051-2/+2
| * | port js algorithmKonstantin Käfer2014-08-051-5/+1
| * | explicitly named parametersKonstantin Käfer2014-08-051-5/+15
| * | default to map alignment when placement type is lineKonstantin Käfer2014-08-051-0/+6
| * | don't require the background layer to be named "background"Konstantin Käfer2014-08-053-3/+3
| * | make sure to check the promiseKonstantin Käfer2014-08-051-2/+6
| * | correctly calculate placement depthKonstantin Käfer2014-08-052-2/+3
| * | port mapbox/mapbox-gl-js#ffd529df107bfec446fa4b4454a583f296c38819Konstantin Käfer2014-08-041-1/+1
| * | change max_angle_delta to max_angleKonstantin Käfer2014-08-042-6/+6
| * | fix boolean operatorsKonstantin Käfer2014-08-043-5/+5
| * | update symbol placement to be more like jsKonstantin Käfer2014-08-049-511/+500
| * | update shaders and backport some collision changesKonstantin Käfer2014-08-047-155/+434
| * | port https://github.com/mapbox/mapbox-gl-js/commit/5a9a1b14b94b18277c4495199d...Konstantin Käfer2014-08-011-24/+16
| * | port https://github.com/mapbox/mapbox-gl-js/commit/954dc6591fb6bef812881daf68...Konstantin Käfer2014-08-013-22/+18
| * | better warning messagesKonstantin Käfer2014-07-312-20/+16
| * | move sprite to a use future loadingKonstantin Käfer2014-07-318-118/+96
| * | merge text and icon buckets/stylesKonstantin Käfer2014-07-2915-627/+603
| * | add symbol* properties/keysKonstantin Käfer2014-07-294-12/+20
| |/
| * change text-max-angle to accept degrees and convert to radiansEden Halperin2014-07-261-1/+1
| * line-join defaults to miter (fixes #384)John Firebaugh2014-07-251-1/+1
| * reduce maxPlacementScaleKonstantin Käfer2014-07-232-3/+5
| * fix text placementKonstantin Käfer2014-07-231-1/+1
| * more include what you useKonstantin Käfer2014-07-238-0/+11
| * include what you useKonstantin Käfer2014-07-231-0/+3
| * read default values from property structsKonstantin Käfer2014-07-221-40/+42
| * do not explicitly render matte; we already cleared the background with glClearKonstantin Käfer2014-07-222-20/+0