summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Eliminate Map::getTexturepool()John Firebaugh2014-11-2614-30/+57
* Map Map::getWorker() privateJohn Firebaugh2014-11-266-18/+23
* Eliminate Map::getGlyphStore()John Firebaugh2014-11-268-20/+32
* Eliminate Map::getSpriteAtlas()John Firebaugh2014-11-266-14/+22
* Eliminate Map::getGlyphAtlas()John Firebaugh2014-11-266-15/+20
* Merge branch 'master' of github.com:mapbox/mapbox-gl-nativeJustin R. Miller2014-11-2616-136/+707
|\
| * Merge branch 'master' of github.com:mapbox/mapbox-gl-nativeMike Morris2014-11-268-61/+67
| |\
| | * Merge pull request #651 from mapbox/prefixKonstantin Käfer2014-11-261-0/+6
| | |\
| | | * add {prefix} to tile URL replacement token schemeKonstantin Käfer2014-11-261-0/+6
| | |/
| | * convert image_reader public interface to use CamelCase to match the rest of c...artemp2014-11-267-61/+61
| * | add jpeg_static_libs to linux install ldflagsMike Morris2014-11-261-0/+1
| |/
| * Update linux instructionsJohn Firebaugh2014-11-251-8/+5
| * Fix member shadowing warningsVincent Schüßler2014-11-252-4/+4
| * Merge pull request #642 from mapbox/image-readersArtem Pavlenko2014-11-2511-124/+691
| |\
| | * Merge branch 'master' into image-readersartemp2014-11-2412-50/+37
| | |\ | | |/ | |/|
| | * image_readers: premultiply alphaartemp2014-11-212-1/+2
| | * Merge branch 'master' into image-readersartemp2014-11-2110-20/+7
| | |\
| | * | image-readers: move concrete implementations headers into platform/defaultartemp2014-11-197-8/+9
| | * | move std.hpp include into image_reader.hpp (g++)artemp2014-11-192-2/+2
| | * | return unique_ptr from get_image_readerartemp2014-11-193-5/+6
| | * | ensure all exceptions are caught in Image ctorartemp2014-11-191-1/+8
| | * | simplify image_readers creation implementationartemp2014-11-1911-347/+156
| | * | image-readers: only register readers that are usedartemp2014-11-172-16/+4
| | * | fix png_readerartemp2014-11-171-2/+2
| | * | Revert "remove travis default installed libs which might conflict"artemp2014-11-141-7/+3
| | * | remove travis default installed libs which might conflictartemp2014-11-141-3/+7
| | * | simplify factory class to not rely on singleton + cleanupsartemp2014-11-143-29/+17
| | * | remove unused pragmasartemp2014-11-142-7/+1
| | * | fix linux buildartemp2014-11-142-8/+8
| | * | Merge branch 'master' into image-readersartemp2014-11-1315-53/+229
| | |\ \
| | * | | cleanupsartemp2014-11-132-16/+10
| | * | | fix tests for linux (todo - find a better way to run 'linux' tests on 'osx')artemp2014-11-071-2/+3
| | * | | move image_reader to mbgl-linuxartemp2014-11-072-1/+1
| | * | | add cflags for linux buildsartemp2014-11-071-0/+2
| | * | | Merge branch 'master' into image-readersartemp2014-11-071-1/+1
| | |\ \ \
| | * \ \ \ Merge branch 'master' into image-readersartemp2014-11-072-3/+13
| | |\ \ \ \
| | * | | | | add image_reader abstraction layer to hanfle multiple image formatsartemp2014-11-079-111/+884
| | * | | | | add jpeg libartemp2014-11-071-14/+22
* | | | | | | bump CocoaJustin R. Miller2014-11-261-0/+0
|/ / / / / /
* | | | | | Use noncopyableJohn Firebaugh2014-11-211-7/+2
* | | | | | Eliminate Map::getFileSourceJohn Firebaugh2014-11-216-18/+19
* | | | | | Pass FileSource by referenceJohn Firebaugh2014-11-215-19/+16
* | | | | | Remove other rotation constraint (fixes #463)John Firebaugh2014-11-211-6/+0
| |_|_|_|/ |/| | | |
* | | | | Fix OS X buildJohn Firebaugh2014-11-202-1/+1
* | | | | Remove rotation constraintsJohn Firebaugh2014-11-204-18/+0
* | | | | Update README.mdMike Morris2014-11-201-1/+1
* | | | | Merge branch 'master' of github.com:mapbox/mapbox-gl-nativeJustin R. Miller2014-11-177-4/+89
|\ \ \ \ \
| * \ \ \ \ Merge pull request #600 from mapbox/png-other-ldflagsMike Morris2014-11-131-0/+1
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | pass png_static_libs to other_ldflags in install.gypi on Linux, closes #581Mike Morris2014-11-131-0/+1
| |/ / / /
| * | | | check library versions against header symbols in static initialization functionKonstantin Käfer2014-11-123-0/+84