Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason | Leith Bade | 2014-12-03 | 20 | -118/+135 |
|\ | |||||
| * | Remove unnecessary cast | John Firebaugh | 2014-12-02 | 1 | -1/+1 |
| * | Texturepool ⇢ TexturePool (fixes #655) | John Firebaugh | 2014-12-02 | 16 | -49/+49 |
| * | Adhere to naming conventions | John Firebaugh | 2014-12-02 | 2 | -57/+57 |
| * | More complete uv::thread | John Firebaugh | 2014-12-02 | 2 | -11/+28 |
| * | untabify | artemp | 2014-12-02 | 1 | -1/+1 |
| * | update nunicode version to 1.5.1 | artemp | 2014-12-02 | 1 | -1/+1 |
* | | Use TESTMUNK in travis to start Testmunk | Leith Bade | 2014-12-03 | 2 | -14/+17 |
* | | Remove token | Leith Bade | 2014-12-02 | 1 | -1/+1 |
* | | Fix deadlock in tests | Leith Bade | 2014-12-02 | 1 | -4/+10 |
* | | Fix tests when using GL 3.0+ context | Leith Bade | 2014-12-02 | 5 | -15/+36 |
* | | Fix Linux build | Leith Bade | 2014-12-02 | 3 | -10/+13 |
* | | Share asset_request between platforms | Leith Bade | 2014-12-02 | 12 | -157/+195 |
* | | Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason | Leith Bade | 2014-12-02 | 10 | -19/+234 |
|\ \ | |/ | |||||
| * | Merge pull request #670 from mapbox/gl-debug | Leith Bade | 2014-12-02 | 8 | -12/+221 |
| |\ | |||||
| | * | Fix iOS compile | Leith Bade | 2014-12-02 | 5 | -4/+20 |
| | * | Add debug markers and labels | Leith Bade | 2014-12-02 | 3 | -17/+57 |
| | * | Add GL_ARB_debug_output | Leith Bade | 2014-12-02 | 2 | -1/+7 |
| | * | Stop mipmap allocation for textures | Leith Bade | 2014-12-02 | 4 | -1/+4 |
| | * | Improve formatting | Leith Bade | 2014-12-02 | 1 | -2/+2 |
| | * | Enable all messages | Leith Bade | 2014-12-02 | 1 | -3/+6 |
| | * | Implement debug callback | Leith Bade | 2014-12-02 | 2 | -3/+48 |
| | * | Define GL callback func. Improve GL err macro. | Leith Bade | 2014-12-02 | 2 | -13/+22 |
| | * | Fix import problem | Leith Bade | 2014-12-02 | 1 | -6/+0 |
| | * | Load KHR_debug on Linux | Leith Bade | 2014-12-02 | 1 | -0/+13 |
| | * | Add KHR_debug definitions | Leith Bade | 2014-12-02 | 2 | -1/+81 |
| * | | Merge pull request #673 from mapbox/pixel-flip | Mike Morris | 2014-12-01 | 2 | -9/+10 |
| |\ \ | |||||
| | * | | fix memcpy includes/namespace | Mike Morris | 2014-12-01 | 1 | -3/+4 |
| | * | | move pixel flip from headless test into HeadlessView::readPixels | Mike Morris | 2014-12-01 | 2 | -9/+9 |
| |/ / | |||||
| * | | Merge pull request #669 from mapbox/fix-vaos | Leith Bade | 2014-12-02 | 1 | -4/+4 |
| |\ \ | | |/ | |||||
| | * | Fix VAOs on Linux | Leith Bade | 2014-12-02 | 1 | -4/+4 |
| |/ | |||||
* | | Fix typo | Leith Bade | 2014-12-02 | 2 | -2/+2 |
* | | readme setup: android on linux does not need all linux deps | Dane Springmeyer | 2014-12-01 | 1 | -1/+3 |
* | | Fix mason submodule | Leith Bade | 2014-12-01 | 1 | -0/+0 |
* | | Fix submodules | Leith Bade | 2014-12-01 | 3 | -0/+0 |
* | | Improve GPS button response #661 | Leith Bade | 2014-11-30 | 1 | -24/+53 |
* | | Fix typo | Leith Bade | 2014-11-30 | 2 | -60/+70 |
* | | Remove cat | Leith Bade | 2014-11-30 | 1 | -2/+4 |
* | | Fix access key for android on travis | Leith Bade | 2014-11-30 | 2 | -2/+1 |
* | | Debug access keys on travis | Leith Bade | 2014-11-30 | 1 | -0/+1 |
* | | Use new libnu version on Android | Leith Bade | 2014-11-30 | 1 | -1/+1 |
* | | Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason | Leith Bade | 2014-11-30 | 3 | -30/+51 |
|\ \ | |/ | |||||
| * | Merge pull request #657 from mapbox/nunicode | Artem Pavlenko | 2014-11-27 | 3 | -30/+51 |
| |\ | |||||
| | * | use ```const var&``` notation in public interface | artemp | 2014-11-27 | 1 | -2/+2 |
| | * | Merge branch 'master' into nunicode | artemp | 2014-11-27 | 50 | -788/+560 |
| | |\ | | |/ | |/| | |||||
| | * | update nunicode version | artemp | 2014-11-21 | 1 | -1/+1 |
| | * | Merge branch 'master' into nunicode | artemp | 2014-11-17 | 1 | -0/+1 |
| | |\ | |||||
| | * | | correct _nu_tolower/_nu_toupper usage | artemp | 2014-11-17 | 1 | -30/+50 |
| | * | | use nunicode conditional case mapping (lowercase) | artemp | 2014-11-17 | 2 | -12/+13 |
* | | | | Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason | Leith Bade | 2014-11-28 | 32 | -345/+339 |
|\ \ \ \ | |/ / / |