summaryrefslogtreecommitdiff
path: root/platform
Commit message (Expand)AuthorAgeFilesLines
* Fix commitLeith Bade2014-12-062-14/+9
* Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-masonLeith Bade2014-12-053-149/+17
|\
| * Change Map::stop to use std::function<void()>John Firebaugh2014-12-041-1/+1
| * Remove invalid map->terminate()John Firebaugh2014-12-041-1/+0
| * make most headers privateKonstantin Käfer2014-12-041-115/+0
| * switch to plain file streams rather than JSONKonstantin Käfer2014-12-041-26/+16
| * remove use of std::to_string in favor of boost::lexical_castKonstantin Käfer2014-12-041-2/+0
* | 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
|\ \ | |/
| * 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
|\ \ | |/
| * break out FileSource as an abstract classMike Morris2014-12-031-0/+129
| * don't set the window title on every frameKonstantin Käfer2014-12-031-6/+0
* | 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
|\ \ | |/
| * 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
| |\
| | * 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
|\ \ \ | | |/ | |/|
| * | convert image_reader public interface to use CamelCase to match the rest of c...artemp2014-11-264-43/+43
| * | 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
| * | image-readers: only register readers that are usedartemp2014-11-172-16/+4
| * | fix png_readerartemp2014-11-171-2/+2
| |/
| * simplify factory class to not rely on singleton + cleanupsartemp2014-11-141-16/+1