summaryrefslogtreecommitdiff
path: root/include/mbgl
Commit message (Collapse)AuthorAgeFilesLines
* rearrange tests and add storage testsKonstantin Käfer2015-02-041-2/+2
|
* remove circular shared_ptr and a few other memory leaksKonstantin Käfer2015-02-041-0/+4
|
* rewrite storage layer to be independent of the Map's event loopKonstantin Käfer2015-02-0423-285/+710
|
* Use std::chronoLeith Bade2015-02-049-62/+45
|
* Remove excess semicolon in jni.hppLeith Bade2015-01-281-1/+1
|
* Remove program binary cachingLeith Bade2015-01-272-15/+0
|
* Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-masonLeith Bade2015-01-231-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 v7John Firebaugh2015-01-221-0/+2
| |\
| | * start porting dash lines from jsAnsis Brammanis2015-01-141-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 errorsLeith Bade2015-01-221-3/+5
| | |
* | | get/setAppliedStyleClasses -> get/setClassesLeith Bade2015-01-181-3/+0
| | |
* | | Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-masonLeith Bade2015-01-181-3/+7
|\ \ \ | |/ / | | | | | | | | | Conflicts: src/mbgl/map/map.cpp
| * | Move class state to mapJohn Firebaugh2015-01-141-3/+7
| |/ | | | | https://github.com/mapbox/mapbox-gl-js/pull/936
* | Clang-format on Android codeLeith Bade2015-01-022-9/+8
| |
* | Rename View functionsLeith Bade2014-12-231-3/+3
| |
* | Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-masonLeith Bade2014-12-233-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 Bade2014-12-233-15/+15
| | | | | | | | remove C style casts. Closes #656
* | Remove unused memberLeith Bade2014-12-211-1/+0
| |
* | Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-masonLeith Bade2014-12-211-1/+8
|\ \ | |/ | | | | | | | | | | Conflicts: Makefile platform/default/headless_view.cpp src/mbgl/map/map.cpp
| * Merge pull request #718 from mapbox/cli-renderJohn Firebaugh2014-12-181-1/+8
| |\ | | | | | | CLI render
| | * set rendering mode so that we can skip intermediate renders for static imagesKonstantin Käfer2014-12-121-1/+8
| | |
* | | Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-masonLeith Bade2014-12-182-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 filesKonstantin Käfer2014-12-173-27/+29
| | | | | | | | | | | | refs #579
| * | Make file request overridable by platform implementationsKonstantin Käfer2014-12-171-0/+27
| |/ | | | | | | refs #579: Android can now rename AssetRequest to FileRequest and implement it differently
* | Add missing CHECK_ERRORLeith Bade2014-12-111-12/+11
| |
* | Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-masonLeith Bade2014-12-111-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 themKonstantin Käfer2014-12-101-0/+7
| |
| * update error reporting functionKonstantin Käfer2014-12-101-7/+8
| |
* | Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-masonLeith Bade2014-12-102-9/+9
|\ \ | |/ | | | | | | | | | | Conflicts: include/mbgl/platform/default/headless_view.hpp platform/default/glfw_view.cpp platform/default/headless_view.cpp
| * Tidy up HeadlessViewLeith Bade2014-12-092-9/+9
| |
* | Add Android user-agent infoLeith Bade2014-12-101-0/+1
| |
* | Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-masonLeith Bade2014-12-101-0/+30
|\ \ | |/ | | | | | | Conflicts: platform/default/http_request_baton_curl.cpp
| * report version number in user agent stringKonstantin Käfer2014-12-081-2/+0
| | | | | | | | refs #628
| * add user agent headerKonstantin Käfer2014-12-081-0/+32
| | | | | | | | fixes #628
* | Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-masonLeith Bade2014-12-081-4/+0
|\ \ | |/ | | | | | | Conflicts: src/mbgl/map/map.cpp
| * Remove Map::cleanup and Painter::cleanupJohn Firebaugh2014-12-061-4/+0
| | | | | | | | Both were noops.
* | Add pakced depth stencil to GLFWView and HeadlessViewLeith Bade2014-12-071-0/+2
| |
* | Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-masonLeith Bade2014-12-072-0/+16
|\ \ | |/ | | | | | | | | | | Conflicts: include/mbgl/platform/gl.hpp src/mbgl/platform/gl.cpp src/mbgl/shader/shader.cpp
| * Load program binary extension on LinuxLeith Bade2014-12-062-0/+15
| |
* | Merge classesLeith Bade2014-12-061-27/+6
| |
* | Fix commitLeith Bade2014-12-064-30/+12
| |
* | Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-masonLeith Bade2014-12-05111-5879/+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 CachingHTTPFileSourceJohn Firebaugh2014-12-043-7/+9
| |
| * Change Map::stop to use std::function<void()>John Firebaugh2014-12-041-5/+3
| | | | | | Fixes #685
| * Add CachingHTTPFileSource::clearLoop()John Firebaugh2014-12-042-0/+4
| | | | | | | | | | | | | | So loop state can be cleaned up in the appropriate thread. This is a hack; loop needs to be externalized from Map. Fixes #686
| * Move setReachability to CachingHTTPFileSourceJohn Firebaugh2014-12-043-5/+2
| |
| * fix buildKonstantin Käfer2014-12-041-1/+1
| |
| * remove usage of relative pathsKonstantin Käfer2014-12-048-10/+10
| |
| * make most headers privateKonstantin Käfer2014-12-04106-5860/+17
| |
| * Add virtual destructor for FileSourceJohn Firebaugh2014-12-041-0/+1
| |
View Lorry Controller Status