Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | refactor makefile | Konstantin Käfer | 2015-02-04 | 9 | -97/+104 |
| | |||||
* | add missing headers | Konstantin Käfer | 2015-02-04 | 1 | -0/+1 |
| | |||||
* | use standard DEBUG macro rather than NDEBUG | Konstantin Käfer | 2015-02-04 | 2 | -3/+5 |
| | |||||
* | make ios compile | Konstantin Käfer | 2015-02-04 | 1 | -4/+2 |
| | |||||
* | don't override std::hash | Konstantin Käfer | 2015-02-04 | 2 | -10/+6 |
| | |||||
* | fixes for linux | Konstantin Käfer | 2015-02-04 | 2 | -0/+2 |
| | |||||
* | rearrange tests and add storage tests | Konstantin Käfer | 2015-02-04 | 1 | -2/+2 |
| | |||||
* | remove circular shared_ptr and a few other memory leaks | Konstantin Käfer | 2015-02-04 | 1 | -0/+4 |
| | |||||
* | rewrite storage layer to be independent of the Map's event loop | Konstantin Käfer | 2015-02-04 | 23 | -285/+710 |
| | |||||
* | Use std::chrono | Leith Bade | 2015-02-04 | 9 | -62/+45 |
| | |||||
* | Remove excess semicolon in jni.hpp | Leith Bade | 2015-01-28 | 1 | -1/+1 |
| | |||||
* | Remove program binary caching | Leith Bade | 2015-01-27 | 2 | -15/+0 |
| | |||||
* | Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason | Leith Bade | 2015-01-23 | 1 | -0/+2 |
|\ | | | | | | | | | | | | | Conflicts: src/mbgl/renderer/painter_prerender.cpp src/mbgl/renderer/prerendered_texture.cpp src/mbgl/renderer/prerendered_texture.hpp | ||||
| * | Merge remote-tracking branch 'origin/dash-3' into v7 | John Firebaugh | 2015-01-22 | 1 | -0/+2 |
| |\ | |||||
| | * | start porting dash lines from js | Ansis Brammanis | 2015-01-14 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | - switches to dash units that are scaled by line width - adds a lineatlas to store patterns line dashed lines - adds linesdf shader which renders line fill from the lineatlas js: 8e83d76af3bd877eb9639c02e296363e2c0186f8 | ||||
* | | | Throw on egl errors | Leith Bade | 2015-01-22 | 1 | -3/+5 |
| | | | |||||
* | | | get/setAppliedStyleClasses -> get/setClasses | Leith Bade | 2015-01-18 | 1 | -3/+0 |
| | | | |||||
* | | | Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason | Leith Bade | 2015-01-18 | 1 | -3/+7 |
|\ \ \ | |/ / | | | | | | | | | | Conflicts: src/mbgl/map/map.cpp | ||||
| * | | Move class state to map | John Firebaugh | 2015-01-14 | 1 | -3/+7 |
| |/ | | | | | https://github.com/mapbox/mapbox-gl-js/pull/936 | ||||
* | | Remove coffeecatch | Leith Bade | 2015-01-13 | 2 | -359/+0 |
| | | |||||
* | | Clang-format on Android code | Leith Bade | 2015-01-02 | 2 | -9/+8 |
| | | |||||
* | | Rename View functions | Leith Bade | 2014-12-23 | 1 | -3/+3 |
| | | |||||
* | | Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason | Leith Bade | 2014-12-23 | 3 | -15/+15 |
|\ \ | |/ | | | | | | | | | | | Conflicts: platform/default/glfw_view.cpp platform/default/headless_view.cpp src/mbgl/map/map.cpp | ||||
| * | Rename View functions to match conventions. Also tidy up view classes and ↵ | Leith Bade | 2014-12-23 | 3 | -15/+15 |
| | | | | | | | | remove C style casts. Closes #656 | ||||
* | | Remove unused member | Leith Bade | 2014-12-21 | 1 | -1/+0 |
| | | |||||
* | | Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason | Leith Bade | 2014-12-21 | 1 | -1/+8 |
|\ \ | |/ | | | | | | | | | | | Conflicts: Makefile platform/default/headless_view.cpp src/mbgl/map/map.cpp | ||||
| * | Merge pull request #718 from mapbox/cli-render | John Firebaugh | 2014-12-18 | 1 | -1/+8 |
| |\ | | | | | | | CLI render | ||||
| | * | set rendering mode so that we can skip intermediate renders for static images | Konstantin Käfer | 2014-12-12 | 1 | -1/+8 |
| | | | |||||
* | | | Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason | Leith Bade | 2014-12-18 | 2 | -0/+29 |
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: gyp/mbgl-ios.gypi gyp/mbgl-osx.gypi platform/default/asset_request_libuv.cpp src/mbgl/storage/caching_http_file_source.cpp src/mbgl/storage/file_request.cpp src/mbgl/storage/file_request.hpp src/mbgl/storage/file_request_baton.hpp | ||||
| * | | change file:// to asset:// to indicate that they aren't arbitrary files | Konstantin Käfer | 2014-12-17 | 3 | -27/+29 |
| | | | | | | | | | | | | refs #579 | ||||
| * | | Make file request overridable by platform implementations | Konstantin Käfer | 2014-12-17 | 1 | -0/+27 |
| |/ | | | | | | | refs #579: Android can now rename AssetRequest to FileRequest and implement it differently | ||||
* | | Add missing CHECK_ERROR | Leith Bade | 2014-12-11 | 1 | -12/+11 |
| | | |||||
* | | Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason | Leith Bade | 2014-12-11 | 1 | -7/+15 |
|\ \ | |/ | | | | | | | | | | | | | Conflicts: platform/default/glfw_view.cpp platform/default/headless_view.cpp src/mbgl/renderer/painter.cpp src/mbgl/renderer/prerendered_texture.cpp | ||||
| * | only report STACK_OVERFLOW/STACK_UNDERFLOW when the GL implementation has them | Konstantin Käfer | 2014-12-10 | 1 | -0/+7 |
| | | |||||
| * | update error reporting function | Konstantin Käfer | 2014-12-10 | 1 | -7/+8 |
| | | |||||
* | | Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason | Leith Bade | 2014-12-10 | 2 | -9/+9 |
|\ \ | |/ | | | | | | | | | | | Conflicts: include/mbgl/platform/default/headless_view.hpp platform/default/glfw_view.cpp platform/default/headless_view.cpp | ||||
| * | Tidy up HeadlessView | Leith Bade | 2014-12-09 | 2 | -9/+9 |
| | | |||||
* | | Add Android user-agent info | Leith Bade | 2014-12-10 | 1 | -0/+1 |
| | | |||||
* | | Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason | Leith Bade | 2014-12-10 | 1 | -0/+30 |
|\ \ | |/ | | | | | | | Conflicts: platform/default/http_request_baton_curl.cpp | ||||
| * | report version number in user agent string | Konstantin Käfer | 2014-12-08 | 1 | -2/+0 |
| | | | | | | | | refs #628 | ||||
| * | add user agent header | Konstantin Käfer | 2014-12-08 | 1 | -0/+32 |
| | | | | | | | | fixes #628 | ||||
* | | Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason | Leith Bade | 2014-12-08 | 1 | -4/+0 |
|\ \ | |/ | | | | | | | Conflicts: src/mbgl/map/map.cpp | ||||
| * | Remove Map::cleanup and Painter::cleanup | John Firebaugh | 2014-12-06 | 1 | -4/+0 |
| | | | | | | | | Both were noops. | ||||
* | | Add pakced depth stencil to GLFWView and HeadlessView | Leith Bade | 2014-12-07 | 1 | -0/+2 |
| | | |||||
* | | Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason | Leith Bade | 2014-12-07 | 2 | -0/+16 |
|\ \ | |/ | | | | | | | | | | | Conflicts: include/mbgl/platform/gl.hpp src/mbgl/platform/gl.cpp src/mbgl/shader/shader.cpp | ||||
| * | Load program binary extension on Linux | Leith Bade | 2014-12-06 | 2 | -0/+15 |
| | | |||||
* | | Merge classes | Leith Bade | 2014-12-06 | 1 | -27/+6 |
| | | |||||
* | | Fix commit | Leith Bade | 2014-12-06 | 4 | -30/+12 |
| | | |||||
* | | Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason | Leith Bade | 2014-12-05 | 125 | -9245/+53 |
|\ \ | |/ | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore gyp/mbgl-ios.gypi gyp/mbgl-linux.gypi gyp/mbgl-osx.gypi include/mbgl/map/map.hpp src/mbgl/map/map.cpp src/mbgl/storage/caching_http_file_source.cpp | ||||
| * | Move setAccessToken to CachingHTTPFileSource | John Firebaugh | 2014-12-04 | 3 | -7/+9 |
| | |