Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Fixup after merge | Leith Bade | 2014-12-04 | 3 | -11/+8 | |
| | | ||||||
* | | Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason | Leith Bade | 2014-12-04 | 3 | -30/+17 | |
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: include/mbgl/storage/base_request.hpp include/mbgl/storage/file_request_baton.hpp include/mbgl/storage/http_request.hpp include/mbgl/storage/http_request_baton.hpp include/mbgl/util/uv_detail.hpp platform/darwin/http_request_baton_cocoa.mm platform/default/caching_http_file_source.cpp platform/default/http_request_baton_curl.cpp src/map/map.cpp src/storage/base_request.cpp src/storage/file_request.cpp src/storage/file_request_baton.cpp src/storage/http_request.cpp src/storage/http_request_baton.cpp | |||||
| * | Prefer stdlib to libuv (fixes #688) | John Firebaugh | 2014-12-03 | 3 | -16/+17 | |
| | | ||||||
| * | Remove unused | John Firebaugh | 2014-12-03 | 1 | -14/+0 | |
| | | ||||||
* | | Merge branch 'master' into android-mason | Mike Morris | 2014-12-03 | 1 | -0/+133 | |
|\ \ | |/ | | | | | | | | | | | | | Conflicts: gyp/mbgl-ios.gypi gyp/mbgl-linux.gypi gyp/mbgl-osx.gypi platform/default/caching_http_file_source.cpp | |||||
| * | break out FileSource as an abstract class | Mike Morris | 2014-12-03 | 1 | -0/+129 | |
| | | | | | | | | add CachingHTTPFileSource implementation | |||||
| * | don't set the window title on every frame | Konstantin Käfer | 2014-12-03 | 1 | -6/+0 | |
| | | | | | | | | this is a significant performance penalty, at least on OS X, and drops our frame rate below 60fps on even simple scenes. instead of showing the position of the map in the window, we should display it elsewhere | |||||
* | | Rename lots of things | Leith Bade | 2014-12-04 | 5 | -38/+38 | |
| | | ||||||
* | | Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason | Leith Bade | 2014-12-03 | 1 | -6/+0 | |
| | | ||||||
* | | Fix debug build | Leith Bade | 2014-12-03 | 2 | -2/+5 | |
| | | ||||||
* | | Remove boost::make_unique | Leith Bade | 2014-12-03 | 2 | -6/+4 | |
| | | ||||||
* | | Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason | Leith Bade | 2014-12-03 | 6 | -11/+16 | |
|\ \ | |/ | | | | | | | Conflicts: src/map/map.cpp | |||||
| * | add array overloads to make_unique and move it to mbgl::util from std | Konstantin Käfer | 2014-12-03 | 6 | -11/+16 | |
| | | ||||||
* | | Use uv::async and various other fixes | Leith Bade | 2014-12-03 | 4 | -23/+26 | |
| | | ||||||
* | | Fix accidentally commented code | Leith Bade | 2014-12-03 | 1 | -2/+2 | |
| | | ||||||
* | | Remove old TODO | Leith Bade | 2014-12-03 | 1 | -1/+0 | |
| | | ||||||
* | | Fix tests when using GL 3.0+ context | Leith Bade | 2014-12-02 | 2 | -9/+29 | |
| | | ||||||
* | | Fix Linux build | Leith Bade | 2014-12-02 | 2 | -5/+0 | |
| | | ||||||
* | | Share asset_request between platforms | Leith Bade | 2014-12-02 | 4 | -175/+123 | |
| | | ||||||
* | | Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason | Leith Bade | 2014-12-02 | 2 | -4/+46 | |
|\ \ | |/ | ||||||
| * | Merge pull request #670 from mapbox/gl-debug | Leith Bade | 2014-12-02 | 1 | -0/+32 | |
| |\ | | | | | | | Use GL debug callbacks | |||||
| | * | Add debug markers and labels | Leith Bade | 2014-12-02 | 1 | -6/+19 | |
| | | | ||||||
| | * | Add GL_ARB_debug_output | Leith Bade | 2014-12-02 | 1 | -0/+6 | |
| | | | ||||||
| | * | Load KHR_debug on Linux | Leith Bade | 2014-12-02 | 1 | -0/+13 | |
| | | | ||||||
| * | | fix memcpy includes/namespace | Mike Morris | 2014-12-01 | 1 | -3/+4 | |
| | | | ||||||
| * | | move pixel flip from headless test into HeadlessView::readPixels | Mike Morris | 2014-12-01 | 1 | -0/+9 | |
| |/ | ||||||
| * | Fix VAOs on Linux | Leith Bade | 2014-12-02 | 1 | -4/+4 | |
| | | ||||||
* | | Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason | Leith Bade | 2014-11-30 | 1 | -26/+49 | |
|\ \ | |/ | ||||||
| * | use ```const var&``` notation in public interface | artemp | 2014-11-27 | 1 | -2/+2 | |
| | | ||||||
| * | Merge branch 'master' into nunicode | artemp | 2014-11-27 | 4 | -211/+74 | |
| |\ | ||||||
| * | | correct _nu_tolower/_nu_toupper usage | artemp | 2014-11-17 | 1 | -30/+50 | |
| | | | ||||||
| * | | use nunicode conditional case mapping (lowercase) | artemp | 2014-11-17 | 1 | -9/+12 | |
| | | | ||||||
* | | | Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason | Leith Bade | 2014-11-28 | 4 | -43/+43 | |
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: README.md configure gyp/mbgl-linux.gypi include/mbgl/map/map.hpp include/mbgl/platform/default/image_reader.hpp include/mbgl/platform/default/jpeg_reader.hpp include/mbgl/platform/default/png_reader.hpp include/mbgl/util/uv_detail.hpp ios/mapbox-gl-cocoa platform/default/image.cpp platform/default/image_reader.cpp platform/default/jpeg_reader.cpp platform/default/png_reader.cpp src/map/map.cpp | |||||
| * | | convert image_reader public interface to use CamelCase to match the rest of ↵ | artemp | 2014-11-26 | 4 | -43/+43 | |
| | | | | | | | | | | | | codebase | |||||
| * | | image_readers: premultiply alpha | artemp | 2014-11-21 | 1 | -0/+1 | |
| | | | ||||||
| * | | image-readers: move concrete implementations headers into platform/default | artemp | 2014-11-19 | 4 | -6/+7 | |
| | | | ||||||
| * | | move std.hpp include into image_reader.hpp (g++) | artemp | 2014-11-19 | 1 | -1/+0 | |
| | | | ||||||
| * | | return unique_ptr from get_image_reader | artemp | 2014-11-19 | 2 | -4/+5 | |
| | | | ||||||
| * | | ensure all exceptions are caught in Image ctor | artemp | 2014-11-19 | 1 | -1/+8 | |
| | | | ||||||
| * | | simplify image_readers creation implementation | artemp | 2014-11-19 | 3 | -156/+22 | |
| | | | | | | | | | | | | | | | * remove static callbacks registration * link png_reader/jpeg_reader into mbgl-linux lib | |||||
| * | | image-readers: only register readers that are used | artemp | 2014-11-17 | 2 | -16/+4 | |
| | | | | | | | | | | | | | | | create_png_reader(char const* data, size_t size) create_jpeg_reader(char const* data, size_t size) | |||||
| * | | fix png_reader | artemp | 2014-11-17 | 1 | -2/+2 | |
| |/ | ||||||
| * | simplify factory class to not rely on singleton + cleanups | artemp | 2014-11-14 | 1 | -16/+1 | |
| | | ||||||
| * | remove unused pragmas | artemp | 2014-11-14 | 2 | -7/+1 | |
| | | ||||||
| * | fix linux build | artemp | 2014-11-14 | 2 | -8/+8 | |
| | | ||||||
| * | Merge branch 'master' into image-readers | artemp | 2014-11-13 | 5 | -3/+102 | |
| |\ | ||||||
| * | | cleanups | artemp | 2014-11-13 | 2 | -16/+10 | |
| | | | ||||||
| * | | Merge branch 'master' into image-readers | artemp | 2014-11-07 | 1 | -2/+2 | |
| |\ \ | ||||||
| * | | | add image_reader abstraction layer to hanfle multiple image formats | artemp | 2014-11-07 | 4 | -111/+652 | |
| | | | | | | | | | | | | | | | | (work-in-progress) | |||||
* | | | | image_readers: premultiply alpha | artemp | 2014-11-28 | 1 | -0/+1 | |
| | | | |