summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Updating app name and version to 0.0.3ios-v0.2.2ios-beta-preview-app-0.0.3Brad Leege2015-03-211-2/+2
* Merge branch 'master' of github.com:mapbox/mapbox-gl-native into ios-beta-appBrad Leege2015-03-2119-49/+256
|\
| * Merge pull request #1043 from mapbox/964-emerald-defaultMinh Nguyễn2015-03-201-1/+1
| |\
| | * Show Emerald by defaultMinh Nguyễn2015-03-201-1/+1
| |/
| * Updated to latest stylesMinh Nguyễn2015-03-201-0/+0
| * add emeraldPeter Liu2015-03-201-0/+1
| * Merge pull request #1016 from mapbox/1016-coalesce-opengl-object-deletionKonstantin Käfer2015-03-2010-36/+127
| |\
| | * coalesce buffer deletions and run them in bulk during renderingKonstantin Käfer2015-03-2010-36/+127
| |/
| * Merge pull request #1030 from mapbox/829-podMinh Nguyễn2015-03-202-8/+9
| |\
| | * Prepared podspec for beta 1Minh Nguyễn2015-03-192-8/+9
| * | Merge pull request #1024 from mapbox/mem_leaksThiago Marcos P. Santos2015-03-204-2/+96
| |\ \
| | * | Add a reference Valgrind suppresion fileThiago Marcos P. Santos2015-03-201-0/+91
| | * | Delete the data buffer of LineAtlasThiago Marcos P. Santos2015-03-201-0/+1
| | * | Delete the GLFWView object at exitThiago Marcos P. Santos2015-03-202-2/+4
| |/ /
| * | Merge pull request #1020 from mapbox/init-bundled-styleMinh Nguyễn2015-03-192-3/+23
| |\ \
| | * | Added API for initializing with bundled styleMinh Nguyễn2015-03-192-3/+23
* | | | Merge branch 'master' into crash-reportingios-v0.2.1ios-beta-preview-app-0.0.2Justin R. Miller2015-03-191-2/+2
|\ \ \ \ | |/ / /
| * | | bump iOS app versionJustin R. Miller2015-03-191-2/+2
| | |/ | |/|
* | | added HockeyApp SDK v3.6.2 for crash reportingJustin R. Miller2015-03-1983-0/+3830
|/ /
* | Merge pull request #946 from friedbunny/931-fullwidth-blockMike Morris2015-03-181-1/+1
|\ \
| * | #931: fix end of acceptable glyph/unicode rangeJason Wray2015-03-041-1/+1
* | | Merge pull request #1015 from mapbox/log_scopeKonstantin Käfer2015-03-1820-115/+229
|\ \ \
| * | | Log the Environment ID and the Thread nameThiago Marcos P. Santos2015-03-185-13/+32
| * | | Add an ID to EnvironmentThiago Marcos P. Santos2015-03-182-1/+14
| * | | Scope the Tile worker thread to an EnvironmentThiago Marcos P. Santos2015-03-1814-48/+43
| * | | Scope the Map thread to an EnvironmentThiago Marcos P. Santos2015-03-184-59/+35
| * | | Introduce the ThreadInfoStore and Environment::ScopeThiago Marcos P. Santos2015-03-182-2/+113
|/ / /
* | | Merge pull request #1012 from mapbox/1011-bundleJustin R. Miller2015-03-171-1/+10
|\ \ \
| * | | Look inside MapboxGL.bundle when presentMinh Nguyễn2015-03-161-1/+10
* | | | Merge pull request #1021 from mapbox/point-annotations-apiJustin R. Miller2015-03-1724-39/+656
|\ \ \ \ | |_|_|/ |/| | |
| * | | feature() -> getFeature() to clear up ambiguity / Linux compiler errorJustin R. Miller2015-03-176-6/+6
| * | | properly clean up tile annotations on deleteJustin R. Miller2015-03-171-0/+6
| * | | fix passing of annotation managerJustin R. Miller2015-03-173-5/+5
| * | | refs #893 #992: point annotations APIJustin R. Miller2015-03-1723-35/+646
|/ / /
* | | Merge pull request #1013 from mapbox/android-22Brad Leege2015-03-174-16/+16
|\ \ \
| * | | Update to latest API 22 build toolsLeith Bade2015-03-174-16/+16
* | | | Merge pull request #843 from mapbox/843-fix-spritesKonstantin Käfer2015-03-1719-61/+283
|\ \ \ \ | |/ / / |/| | |
| * | | fix sprites for pixel ratios that are not 1 and 2Konstantin Käfer2015-03-1719-61/+283
|/ / /
* | | Merge pull request #1009 from mapbox/1ec5-967-readmeMinh Nguyễn2015-03-161-1/+18
|\ \ \ | |/ / |/| |
| * | Added iOS project setup walkthroughMinh Nguyễn2015-03-161-1/+18
|/ /
* | Merge pull request #1006 from mapbox/linux_build_fixKonstantin Käfer2015-03-161-2/+2
|\ \
| * | Link with X11 explicitlyThiago Marcos P. Santos2015-03-161-2/+2
|/ /
* | Revert "Move atlas ownership to Style"John Firebaugh2015-03-1310-148/+161
* | Index glyph use by tile pointer value, not tile IDJohn Firebaugh2015-03-136-18/+21
* | Remove unused declarationJohn Firebaugh2015-03-131-3/+0
* | Remove needless indirectionJohn Firebaugh2015-03-132-12/+1
* | Clean up GlyphAtlasJohn Firebaugh2015-03-132-40/+40
* | Move atlas ownership to StyleJohn Firebaugh2015-03-1310-161/+148
* | Merge pull request #1000 from mapbox/ios-set-classesJustin R. Miller2015-03-131-4/+4
|\ \
| * | iOS setAppliedStyleClasses -> setStyleClassesJustin R. Miller2015-03-131-4/+4