summaryrefslogtreecommitdiff
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* update mapbox::variantKonstantin Käfer2015-03-062-83/+145
|
* make Map::resize() privateKonstantin Käfer2015-03-064-9/+17
| | | | they can only be called by View::resize
* update static image rendering executableKonstantin Käfer2015-03-061-0/+5
|
* Add projection functions to JavaLeith Bade2015-02-191-0/+10
|
* Tidy up JNI LatLng refsLeith Bade2015-02-191-10/+10
|
* update uv_zip and add testsKonstantin Käfer2015-02-162-3/+8
|
* fixes #476 & #853: pixel/meter/latlng conversion routines in core & iOSJustin R. Miller2015-02-167-11/+152
|
* code styleKonstantin Käfer2015-02-131-2/+2
|
* make sure that the async handle always gets closedKonstantin Käfer2015-02-131-1/+2
|
* Fix #include <uv.h> mixing between C and C++ modesLeith Bade2015-02-111-2/+2
|
* forward declare GLX typedefs to limit conflicts from glx.hMike Morris2015-02-102-4/+5
|
* move iOS code from gl-cocoa to this projectJustin R. Miller2015-02-096-0/+268
|
* refactor makefileKonstantin Käfer2015-02-049-97/+104
|
* add missing headersKonstantin Käfer2015-02-041-0/+1
|
* use standard DEBUG macro rather than NDEBUGKonstantin Käfer2015-02-042-3/+5
|
* make ios compileKonstantin Käfer2015-02-041-4/+2
|
* don't override std::hashKonstantin Käfer2015-02-042-10/+6
|
* fixes for linuxKonstantin Käfer2015-02-042-0/+2
|
* 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
* | Remove coffeecatchLeith Bade2015-01-132-359/+0
| |
* | 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
| |
View Lorry Controller Status