Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | rearrange tests and add storage tests | Konstantin Käfer | 2015-02-04 | 2 | -44/+0 |
| | |||||
* | remove circular shared_ptr and a few other memory leaks | Konstantin Käfer | 2015-02-04 | 3 | -47/+73 |
| | |||||
* | do not leak string handles | Konstantin Käfer | 2015-02-04 | 1 | -4/+10 |
| | |||||
* | rewrite storage layer to be independent of the Map's event loop | Konstantin Käfer | 2015-02-04 | 6 | -911/+1149 |
| | |||||
* | Use std::chrono | Leith Bade | 2015-02-04 | 2 | -5/+5 |
| | |||||
* | Remove program binary caching | Leith Bade | 2015-01-27 | 5 | -90/+0 |
| | |||||
* | Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason | Leith Bade | 2015-01-18 | 1 | -1/+8 |
|\ | | | | | | | | | Conflicts: src/mbgl/map/map.cpp | ||||
| * | Merge pull request #757 from mapbox/move-terminate | Leith Bade | 2015-01-16 | 1 | -0/+3 |
| |\ | | | | | | | Move terminate() call to GLFWView to avoid problems with node | ||||
| | * | Move terminate() call to GLFWView to avoid problems with node | Leith Bade | 2015-01-16 | 1 | -0/+3 |
| | | | |||||
| * | | Move class state to map | John Firebaugh | 2015-01-14 | 1 | -1/+5 |
| |/ | | | | | https://github.com/mapbox/mapbox-gl-js/pull/936 | ||||
* | | Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason | Leith Bade | 2015-01-13 | 1 | -11/+5 |
|\ \ | |/ | |||||
| * | Merge pull request #748 from mapbox/fix-swap | Leith Bade | 2015-01-13 | 1 | -7/+4 |
| |\ | | | | | | | Correctly handle swapping | ||||
| | * | Correctly handle swapping. Fixes #666 | Leith Bade | 2015-01-12 | 1 | -7/+4 |
| | | | |||||
| * | | Correctly call resize with width and height. Fixes #746 | Leith Bade | 2015-01-12 | 1 | -4/+1 |
| |/ | |||||
* | | Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason | Leith Bade | 2015-01-09 | 1 | -1/+2 |
|\ \ | |/ | |||||
| * | Merge branch 'master' into shader-performance | John Firebaugh | 2015-01-07 | 6 | -216/+407 |
| |\ | |||||
| * | | use correct enum | Konstantin Käfer | 2014-12-12 | 1 | -1/+2 |
| | | | |||||
* | | | Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason | Leith Bade | 2014-12-23 | 3 | -131/+128 |
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | 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 | -130/+128 |
| | | | | | | | | | | | | remove C style casts. Closes #656 | ||||
* | | | Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason | Leith Bade | 2014-12-21 | 2 | -120/+38 |
|\ \ \ | |/ / | | | | | | | | | | | | | | | | Conflicts: Makefile platform/default/headless_view.cpp src/mbgl/map/map.cpp | ||||
| * | | Use iostream for saving GL program binary. Also check for ↵ | Leith Bade | 2014-12-20 | 1 | -6/+10 |
| | | | | | | | | | | | | GL_NUM_PROGRAM_BINARY_FORMATS > 0. | ||||
| * | | Merge pull request #718 from mapbox/cli-render | John Firebaugh | 2014-12-18 | 1 | -93/+27 |
| |\ \ | | | | | | | | | CLI render | ||||
| | * | | never create core profile contexts; their API is subtly different | Konstantin Käfer | 2014-12-16 | 1 | -72/+2 |
| | | | | | | | | | | | | | | | | (e.g. glGetString(GL_EXTENSIONS) doesn't work, you'd have to use glGetStringi(GL_EXTENSIONS, ...);) | ||||
| | * | | don't assing nullptr to std::string | Konstantin Käfer | 2014-12-16 | 1 | -21/+25 |
| | |/ | |||||
* | | | Fix build | Leith Bade | 2014-12-18 | 4 | -134/+207 |
| | | | |||||
* | | | Add run to AssetRequest | Leith Bade | 2014-12-18 | 1 | -5/+19 |
| | | | |||||
* | | | Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason | Leith Bade | 2014-12-18 | 3 | -0/+256 |
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 comment and cache value | Konstantin Käfer | 2014-12-17 | 1 | -2/+3 |
| | | | |||||
| * | | change file:// to asset:// to indicate that they aren't arbitrary files | Konstantin Käfer | 2014-12-17 | 3 | -27/+72 |
| | | | | | | | | | | | | refs #579 | ||||
| * | | Make file request overridable by platform implementations | Konstantin Käfer | 2014-12-17 | 1 | -0/+209 |
| |/ | | | | | | | refs #579: Android can now rename AssetRequest to FileRequest and implement it differently | ||||
* | | Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason | Leith Bade | 2014-12-11 | 2 | -32/+40 |
|\ \ | |/ | | | | | | | | | | | | | Conflicts: platform/default/glfw_view.cpp platform/default/headless_view.cpp src/mbgl/renderer/painter.cpp src/mbgl/renderer/prerendered_texture.cpp | ||||
| * | update error reporting function | Konstantin Käfer | 2014-12-10 | 2 | -29/+29 |
| | | |||||
| * | Use CHECK_ERROR on every GL call | Leith Bade | 2014-12-10 | 2 | -29/+37 |
| | | |||||
* | | Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason | Leith Bade | 2014-12-10 | 3 | -87/+101 |
|\ \ | |/ | | | | | | | | | | | Conflicts: include/mbgl/platform/default/headless_view.hpp platform/default/glfw_view.cpp platform/default/headless_view.cpp | ||||
| * | fix typo | Konstantin Käfer | 2014-12-09 | 1 | -1/+1 |
| | | |||||
| * | Tidy up HeadlessView | Leith Bade | 2014-12-09 | 3 | -87/+101 |
| | | |||||
* | | Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason | Leith Bade | 2014-12-10 | 2 | -0/+31 |
|\ \ | |/ | | | | | | | Conflicts: platform/default/http_request_baton_curl.cpp | ||||
| * | report version number in user agent string | Konstantin Käfer | 2014-12-08 | 2 | -4/+24 |
| | | | | | | | | refs #628 | ||||
| * | add user agent header | Konstantin Käfer | 2014-12-08 | 2 | -0/+5 |
| | | | | | | | | fixes #628 | ||||
* | | Fix missing shader cache path | Leith Bade | 2014-12-08 | 1 | -0/+13 |
| | | |||||
* | | Add pakced depth stencil to GLFWView and HeadlessView | Leith Bade | 2014-12-07 | 2 | -0/+9 |
| | | |||||
* | | Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason | Leith Bade | 2014-12-07 | 4 | -0/+102 |
|\ \ | |/ | | | | | | | | | | | 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 | 4 | -0/+102 |
| | | |||||
* | | Fix commit | Leith Bade | 2014-12-06 | 2 | -14/+9 |
| | | |||||
* | | Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason | Leith Bade | 2014-12-05 | 3 | -149/+17 |
|\ \ | |/ | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | Change Map::stop to use std::function<void()> | John Firebaugh | 2014-12-04 | 1 | -1/+1 |
| | | | | | | Fixes #685 | ||||
| * | Remove invalid map->terminate() | John Firebaugh | 2014-12-04 | 1 | -1/+0 |
| | | | | | | | | | | Map has already been destroyed by this point, so the call is invalid. The work that terminate() would do has already been done. | ||||
| * | make most headers private | Konstantin Käfer | 2014-12-04 | 1 | -115/+0 |
| | | |||||
| * | switch to plain file streams rather than JSON | Konstantin Käfer | 2014-12-04 | 1 | -26/+16 |
| | | |||||
| * | remove use of std::to_string in favor of boost::lexical_cast | Konstantin Käfer | 2014-12-04 | 1 | -2/+0 |
| | | | | | | | | std::to_string calls sprintf() internally, which is really slow |