summaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* make storage lib separate so we can build without storage libsKonstantin Käfer2015-02-047-877/+0
* move merge_lines implementation to its own source files to avoid duplicate sy...Konstantin Käfer2015-02-042-89/+110
* make ios compileKonstantin Käfer2015-02-041-11/+27
* fixes for linuxKonstantin Käfer2015-02-041-8/+8
* rearrange tests and add storage testsKonstantin Käfer2015-02-041-1/+0
* make vaos immovableKonstantin Käfer2015-02-0410-100/+111
* remove circular shared_ptr and a few other memory leaksKonstantin Käfer2015-02-046-34/+74
* rewrite storage layer to be independent of the Map's event loopKonstantin Käfer2015-02-0426-1042/+685
* Remove unusedJohn Firebaugh2015-02-032-14/+0
* Add functions for layout properties.Lauren Budorick2015-02-0313-116/+365
* Merge branch 'master' of github.com:mapbox/mapbox-gl-native into chronoLeith Bade2015-02-043-15/+28
|\
| * fix uninitialized variable warningAnsis Brammanis2015-02-031-1/+1
| * add wrapped padding to sprite for repeating imagesAnsis Brammanis2015-02-033-15/+28
* | Use std::chronoLeith Bade2015-02-0427-172/+171
|/
* make line-opacity work with line-imageAnsis Brammanis2015-01-303-1/+4
* fix sprite atlas padding and icon centeringAnsis Brammanis2015-01-273-10/+9
* Remove program binary cachingLeith Bade2015-01-273-135/+37
* Merge pull request #676 from mapbox/android-masonLeith Bade2015-01-2712-89/+213
|\
| * Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-masonLeith Bade2015-01-276-1/+17
| |\
| * \ Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-masonLeith Bade2015-01-2334-439/+465
| |\ \
| * | | Fix terminate crashLeith Bade2015-01-231-2/+3
| * | | get/setAppliedStyleClasses -> get/setClassesLeith Bade2015-01-181-11/+0
| * | | Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-masonLeith Bade2015-01-183-52/+31
| |\ \ \
| * | | | Update to Android NDK r10d in new AMILeith Bade2015-01-151-2/+2
| * | | | Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-masonLeith Bade2015-01-155-61/+182
| |\ \ \ \
| * | | | | Remove coffeecatchLeith Bade2015-01-131-14/+0
| * | | | | Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-masonLeith Bade2015-01-131-1/+3
| |\ \ \ \ \
| * | | | | | remove extra lineLeith Bade2015-01-131-1/+0
| * | | | | | Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-masonLeith Bade2015-01-0921-176/+144
| |\ \ \ \ \ \
| * | | | | | | Add failsafe to program binary loadingLeith Bade2015-01-052-13/+45
| * | | | | | | Missed renameLeith Bade2014-12-251-1/+1
| * | | | | | | Tidy up a few missed things in shader.cppLeith Bade2014-12-241-3/+2
| * | | | | | | Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-masonLeith Bade2014-12-232-14/+14
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-masonLeith Bade2014-12-212-58/+52
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Fix buildLeith Bade2014-12-182-97/+0
| * | | | | | | | | Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-masonLeith Bade2014-12-185-265/+6
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add missing CHECK_ERRORLeith Bade2014-12-111-4/+4
| * | | | | | | | | | Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-masonLeith Bade2014-12-1135-350/+354
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-masonLeith Bade2014-12-101-0/+14
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-masonLeith Bade2014-12-101-31/+0
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-masonLeith Bade2014-12-083-19/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-masonLeith Bade2014-12-073-38/+127
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Remove lineLeith Bade2014-12-061-1/+0
| * | | | | | | | | | | | | | | Fix commitLeith Bade2014-12-066-23/+65
| * | | | | | | | | | | | | | | Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-masonLeith Bade2014-12-05245-82/+9448
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Fix debug buildLeith Bade2014-12-042-3/+3
| * | | | | | | | | | | | | | | | Fixup after mergeLeith Bade2014-12-045-115/+47
| * | | | | | | | | | | | | | | | Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-masonLeith Bade2014-12-048-35/+99
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-masonLeith Bade2014-12-042-129/+16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Fix Android crashLeith Bade2014-12-041-2/+2
View Lorry Controller Status