summaryrefslogtreecommitdiff
path: root/platform/default
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-masonLeith Bade2015-01-181-1/+8
|\
| * Merge pull request #757 from mapbox/move-terminateLeith Bade2015-01-161-0/+3
| |\
| | * Move terminate() call to GLFWView to avoid problems with nodeLeith Bade2015-01-161-0/+3
| * | Move class state to mapJohn Firebaugh2015-01-141-1/+5
| |/
* | Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-masonLeith Bade2015-01-131-11/+5
|\ \ | |/
| * Merge pull request #748 from mapbox/fix-swapLeith Bade2015-01-131-7/+4
| |\
| | * Correctly handle swapping. Fixes #666Leith Bade2015-01-121-7/+4
| * | Correctly call resize with width and height. Fixes #746Leith Bade2015-01-121-4/+1
| |/
* | Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-masonLeith Bade2015-01-091-1/+2
|\ \ | |/
| * Merge branch 'master' into shader-performanceJohn Firebaugh2015-01-075-216/+389
| |\
| * | use correct enumKonstantin Käfer2014-12-121-1/+2
* | | Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-masonLeith Bade2014-12-233-131/+128
|\ \ \ | | |/ | |/|
| * | Rename View functions to match conventions. Also tidy up view classes and rem...Leith Bade2014-12-233-130/+128
* | | Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-masonLeith Bade2014-12-212-120/+38
|\ \ \ | |/ /
| * | Use iostream for saving GL program binary. Also check for GL_NUM_PROGRAM_BINA...Leith Bade2014-12-201-6/+10
| * | Merge pull request #718 from mapbox/cli-renderJohn Firebaugh2014-12-181-93/+27
| |\ \
| | * | never create core profile contexts; their API is subtly differentKonstantin Käfer2014-12-161-72/+2
| | * | don't assing nullptr to std::stringKonstantin Käfer2014-12-161-21/+25
| | |/
* | | Fix buildLeith Bade2014-12-182-41/+5
* | | Add run to AssetRequestLeith Bade2014-12-181-5/+19
* | | Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-masonLeith Bade2014-12-182-0/+238
|\ \ \ | |/ /
| * | change comment and cache valueKonstantin Käfer2014-12-171-2/+3
| * | change file:// to asset:// to indicate that they aren't arbitrary filesKonstantin Käfer2014-12-172-27/+54
| * | Make file request overridable by platform implementationsKonstantin Käfer2014-12-171-0/+209
| |/
* | Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-masonLeith Bade2014-12-112-32/+40
|\ \ | |/
| * update error reporting functionKonstantin Käfer2014-12-102-29/+29
| * Use CHECK_ERROR on every GL callLeith Bade2014-12-102-29/+37
* | Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-masonLeith Bade2014-12-103-87/+101
|\ \ | |/
| * fix typoKonstantin Käfer2014-12-091-1/+1
| * Tidy up HeadlessViewLeith Bade2014-12-093-87/+101
* | Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-masonLeith Bade2014-12-101-0/+18
|\ \ | |/
| * report version number in user agent stringKonstantin Käfer2014-12-081-2/+12
| * add user agent headerKonstantin Käfer2014-12-081-0/+2
* | Add pakced depth stencil to GLFWView and HeadlessViewLeith Bade2014-12-072-0/+9
* | Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-masonLeith Bade2014-12-072-0/+50
|\ \ | |/
| * Load program binary extension on LinuxLeith Bade2014-12-062-0/+50
* | Fix commitLeith Bade2014-12-061-2/+2
* | 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-042-9/+7
* | Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-masonLeith Bade2014-12-042-28/+15
|\ \ | |/
| * Prefer stdlib to libuv (fixes #688)John Firebaugh2014-12-032-14/+15
| * 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
View Lorry Controller Status