summaryrefslogtreecommitdiff
path: root/platform
Commit message (Collapse)AuthorAgeFilesLines
...
* | Fixup after mergeLeith Bade2014-12-043-11/+8
| |
* | Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-masonLeith Bade2014-12-043-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 Firebaugh2014-12-033-16/+17
| |
| * Remove unusedJohn Firebaugh2014-12-031-14/+0
| |
* | Merge branch 'master' into android-masonMike Morris2014-12-031-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 classMike Morris2014-12-031-0/+129
| | | | | | | | add CachingHTTPFileSource implementation
| * don't set the window title on every frameKonstantin Käfer2014-12-031-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 thingsLeith Bade2014-12-045-38/+38
| |
* | Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-masonLeith Bade2014-12-031-6/+0
| |
* | Fix debug buildLeith Bade2014-12-032-2/+5
| |
* | Remove boost::make_uniqueLeith Bade2014-12-032-6/+4
| |
* | Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-masonLeith Bade2014-12-036-11/+16
|\ \ | |/ | | | | | | Conflicts: src/map/map.cpp
| * add array overloads to make_unique and move it to mbgl::util from stdKonstantin Käfer2014-12-036-11/+16
| |
* | Use uv::async and various other fixesLeith Bade2014-12-034-23/+26
| |
* | Fix accidentally commented codeLeith Bade2014-12-031-2/+2
| |
* | Remove old TODOLeith Bade2014-12-031-1/+0
| |
* | Fix tests when using GL 3.0+ contextLeith Bade2014-12-022-9/+29
| |
* | Fix Linux buildLeith Bade2014-12-022-5/+0
| |
* | Share asset_request between platformsLeith Bade2014-12-024-175/+123
| |
* | Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-masonLeith Bade2014-12-022-4/+46
|\ \ | |/
| * Merge pull request #670 from mapbox/gl-debugLeith Bade2014-12-021-0/+32
| |\ | | | | | | Use GL debug callbacks
| | * Add debug markers and labelsLeith Bade2014-12-021-6/+19
| | |
| | * Add GL_ARB_debug_outputLeith Bade2014-12-021-0/+6
| | |
| | * Load KHR_debug on LinuxLeith Bade2014-12-021-0/+13
| | |
| * | fix memcpy includes/namespaceMike Morris2014-12-011-3/+4
| | |
| * | move pixel flip from headless test into HeadlessView::readPixelsMike Morris2014-12-011-0/+9
| |/
| * Fix VAOs on LinuxLeith Bade2014-12-021-4/+4
| |
* | Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-masonLeith Bade2014-11-301-26/+49
|\ \ | |/
| * use ```const var&``` notation in public interfaceartemp2014-11-271-2/+2
| |
| * Merge branch 'master' into nunicodeartemp2014-11-274-211/+74
| |\
| * | correct _nu_tolower/_nu_toupper usageartemp2014-11-171-30/+50
| | |
| * | use nunicode conditional case mapping (lowercase)artemp2014-11-171-9/+12
| | |
* | | Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-masonLeith Bade2014-11-284-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 ↵artemp2014-11-264-43/+43
| | | | | | | | | | | | codebase
| * | image_readers: premultiply alphaartemp2014-11-211-0/+1
| | |
| * | image-readers: move concrete implementations headers into platform/defaultartemp2014-11-194-6/+7
| | |
| * | move std.hpp include into image_reader.hpp (g++)artemp2014-11-191-1/+0
| | |
| * | return unique_ptr from get_image_readerartemp2014-11-192-4/+5
| | |
| * | ensure all exceptions are caught in Image ctorartemp2014-11-191-1/+8
| | |
| * | simplify image_readers creation implementationartemp2014-11-193-156/+22
| | | | | | | | | | | | | | | * remove static callbacks registration * link png_reader/jpeg_reader into mbgl-linux lib
| * | image-readers: only register readers that are usedartemp2014-11-172-16/+4
| | | | | | | | | | | | | | | create_png_reader(char const* data, size_t size) create_jpeg_reader(char const* data, size_t size)
| * | fix png_readerartemp2014-11-171-2/+2
| |/
| * simplify factory class to not rely on singleton + cleanupsartemp2014-11-141-16/+1
| |
| * remove unused pragmasartemp2014-11-142-7/+1
| |
| * fix linux buildartemp2014-11-142-8/+8
| |
| * Merge branch 'master' into image-readersartemp2014-11-135-3/+102
| |\
| * | cleanupsartemp2014-11-132-16/+10
| | |
| * | Merge branch 'master' into image-readersartemp2014-11-071-2/+2
| |\ \
| * | | add image_reader abstraction layer to hanfle multiple image formatsartemp2014-11-074-111/+652
| | | | | | | | | | | | | | | | (work-in-progress)
* | | | image_readers: premultiply alphaartemp2014-11-281-0/+1
| | | |