summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-masonLeith Bade2014-12-0320-118/+135
|\
| * Remove unnecessary castJohn Firebaugh2014-12-021-1/+1
| * Texturepool ⇢ TexturePool (fixes #655)John Firebaugh2014-12-0216-49/+49
| * Adhere to naming conventionsJohn Firebaugh2014-12-022-57/+57
| * More complete uv::threadJohn Firebaugh2014-12-022-11/+28
| * untabifyartemp2014-12-021-1/+1
| * update nunicode version to 1.5.1artemp2014-12-021-1/+1
* | Use TESTMUNK in travis to start TestmunkLeith Bade2014-12-032-14/+17
* | Remove tokenLeith Bade2014-12-021-1/+1
* | Fix deadlock in testsLeith Bade2014-12-021-4/+10
* | Fix tests when using GL 3.0+ contextLeith Bade2014-12-025-15/+36
* | Fix Linux buildLeith Bade2014-12-023-10/+13
* | Share asset_request between platformsLeith Bade2014-12-0212-157/+195
* | Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-masonLeith Bade2014-12-0210-19/+234
|\ \ | |/
| * Merge pull request #670 from mapbox/gl-debugLeith Bade2014-12-028-12/+221
| |\
| | * Fix iOS compileLeith Bade2014-12-025-4/+20
| | * Add debug markers and labelsLeith Bade2014-12-023-17/+57
| | * Add GL_ARB_debug_outputLeith Bade2014-12-022-1/+7
| | * Stop mipmap allocation for texturesLeith Bade2014-12-024-1/+4
| | * Improve formattingLeith Bade2014-12-021-2/+2
| | * Enable all messagesLeith Bade2014-12-021-3/+6
| | * Implement debug callbackLeith Bade2014-12-022-3/+48
| | * Define GL callback func. Improve GL err macro.Leith Bade2014-12-022-13/+22
| | * Fix import problemLeith Bade2014-12-021-6/+0
| | * Load KHR_debug on LinuxLeith Bade2014-12-021-0/+13
| | * Add KHR_debug definitionsLeith Bade2014-12-022-1/+81
| * | Merge pull request #673 from mapbox/pixel-flipMike Morris2014-12-012-9/+10
| |\ \
| | * | fix memcpy includes/namespaceMike Morris2014-12-011-3/+4
| | * | move pixel flip from headless test into HeadlessView::readPixelsMike Morris2014-12-012-9/+9
| |/ /
| * | Merge pull request #669 from mapbox/fix-vaosLeith Bade2014-12-021-4/+4
| |\ \ | | |/
| | * Fix VAOs on LinuxLeith Bade2014-12-021-4/+4
| |/
* | Fix typoLeith Bade2014-12-022-2/+2
* | readme setup: android on linux does not need all linux depsDane Springmeyer2014-12-011-1/+3
* | Fix mason submoduleLeith Bade2014-12-011-0/+0
* | Fix submodulesLeith Bade2014-12-013-0/+0
* | Improve GPS button response #661Leith Bade2014-11-301-24/+53
* | Fix typoLeith Bade2014-11-302-60/+70
* | Remove catLeith Bade2014-11-301-2/+4
* | Fix access key for android on travisLeith Bade2014-11-302-2/+1
* | Debug access keys on travisLeith Bade2014-11-301-0/+1
* | Use new libnu version on AndroidLeith Bade2014-11-301-1/+1
* | Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-masonLeith Bade2014-11-303-30/+51
|\ \ | |/
| * Merge pull request #657 from mapbox/nunicodeArtem Pavlenko2014-11-273-30/+51
| |\
| | * use ```const var&``` notation in public interfaceartemp2014-11-271-2/+2
| | * Merge branch 'master' into nunicodeartemp2014-11-2750-788/+560
| | |\ | | |/ | |/|
| | * update nunicode versionartemp2014-11-211-1/+1
| | * Merge branch 'master' into nunicodeartemp2014-11-171-0/+1
| | |\
| | * | correct _nu_tolower/_nu_toupper usageartemp2014-11-171-30/+50
| | * | use nunicode conditional case mapping (lowercase)artemp2014-11-172-12/+13
* | | | Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-masonLeith Bade2014-11-2832-345/+339
|\ \ \ \ | |/ / /