Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | scope Requests to an Environment object for easier cancelation | Konstantin Käfer | 2015-03-06 | 5 | -29/+57 |
| | | | | | | | | | we are now scoping all file requests to an environment object. The FileSource implementation treats this as an opaque pointer, but allows canceling all Requests that are associated with that pointer. This is necessary to abort all file requests that originated from a particular Map object. Aborting a file request is different from canceling a file request: A canceled request doesn't have its callback called, while an aborted request will have its callback called with an error, indicating that the environment is going to be shut down. | ||||
* | fix handling around unique_ptr releases | Konstantin Käfer | 2015-03-06 | 1 | -1/+1 |
| | |||||
* | use a reinterpret_cast to return the correct type | Konstantin Käfer | 2015-03-06 | 1 | -1/+1 |
| | |||||
* | fix ambiguous name (gcc) | Konstantin Käfer | 2015-03-06 | 1 | -1/+1 |
| | |||||
* | throw exception when shader compilation fails | Konstantin Käfer | 2015-03-06 | 1 | -0/+27 |
| | |||||
* | guard against concurrent OpenGL extension loading | Konstantin Käfer | 2015-03-06 | 2 | -4/+2 |
| | |||||
* | add more locking around GlyphStore and FontStack | Konstantin Käfer | 2015-03-06 | 1 | -0/+33 |
| | | | | this is a stopgap until we have a solution that gives every worker thread their own copy | ||||
* | lock the StyleBucket to avoid crashing | Konstantin Käfer | 2015-03-06 | 1 | -1/+1 |
| | | | | stopgap until we have a solution that doesn't mutate the style objects while parsing a tile | ||||
* | move readlock/writelock to uv.hpp and add movable lock/mutex | Konstantin Käfer | 2015-03-06 | 1 | -0/+41 |
| | |||||
* | update mapbox::variant | Konstantin Käfer | 2015-03-06 | 2 | -83/+145 |
| | |||||
* | make Map::resize() private | Konstantin Käfer | 2015-03-06 | 4 | -9/+17 |
| | | | | they can only be called by View::resize | ||||
* | update static image rendering executable | Konstantin Käfer | 2015-03-06 | 1 | -0/+5 |
| | |||||
* | Add projection functions to Java | Leith Bade | 2015-02-19 | 1 | -0/+10 |
| | |||||
* | Tidy up JNI LatLng refs | Leith Bade | 2015-02-19 | 1 | -10/+10 |
| | |||||
* | update uv_zip and add tests | Konstantin Käfer | 2015-02-16 | 2 | -3/+8 |
| | |||||
* | fixes #476 & #853: pixel/meter/latlng conversion routines in core & iOS | Justin R. Miller | 2015-02-16 | 7 | -11/+152 |
| | |||||
* | code style | Konstantin Käfer | 2015-02-13 | 1 | -2/+2 |
| | |||||
* | make sure that the async handle always gets closed | Konstantin Käfer | 2015-02-13 | 1 | -1/+2 |
| | |||||
* | Fix #include <uv.h> mixing between C and C++ modes | Leith Bade | 2015-02-11 | 1 | -2/+2 |
| | |||||
* | forward declare GLX typedefs to limit conflicts from glx.h | Mike Morris | 2015-02-10 | 2 | -4/+5 |
| | |||||
* | move iOS code from gl-cocoa to this project | Justin R. Miller | 2015-02-09 | 6 | -0/+268 |
| | |||||
* | 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 |