summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* rename llmr => mbglKonstantin Käfer2014-07-16236-1209/+1210
|
* rename file and fix merge errorKonstantin Käfer2014-07-162-0/+2
|
* separate comparisons and expressionsKonstantin Käfer2014-07-169-207/+240
|
* add more comparison testsKonstantin Käfer2014-07-169-98/+263
|
* Merge branch 'master' of github.com:mapbox/mapbox-gl-nativeJustin R. Miller2014-07-168-251/+495
|\
| * update value semanatics to be closer to js and add filter expression testsKonstantin Käfer2014-07-168-251/+495
| |
* | refs #342 & #346: per-map change callbacksJustin R. Miller2014-07-1610-62/+63
|/
* Merge branch 'master' of github.com:mapbox/mapbox-gl-nativeJustin R. Miller2014-07-1513-32/+110
|\
| * add icon render testKonstantin Käfer2014-07-1510-13/+72
| |
| * correctly cast bufferKonstantin Käfer2014-07-151-1/+1
| |
| * make icons work againKonstantin Käfer2014-07-152-6/+4
| |
| * do not reallocate the texture data on every update; use glTexSubImage2D insteadKonstantin Käfer2014-07-151-11/+31
| |
| * disallow copying to avoid accidental unchecked message outputKonstantin Käfer2014-07-151-1/+2
| |
* | allow for delayed map notifications during animationsJustin R. Miller2014-07-155-6/+14
|/
* flesh out 'will change region' notificationsJustin R. Miller2014-07-151-0/+12
|
* change halo-width/blur unitsKonstantin Käfer2014-07-141-15/+27
| | | | refs mapbox/mapbox-gl-style-spec#66
* fix font halo unitsKonstantin Käfer2014-07-141-1/+13
|
* make gcc happyKonstantin Käfer2014-07-141-1/+1
|
* fix errorsKonstantin Käfer2014-07-142-5/+5
|
* add enum class to unify parsing/stringificationKonstantin Käfer2014-07-1413-133/+173
|
* don't force Testing build on linuxKonstantin Käfer2014-07-141-1/+1
| | | | [skip ci]
* fix includesKonstantin Käfer2014-07-141-0/+2
|
* don't initialize sources multiple timesKonstantin Käfer2014-07-146-27/+56
|
* move std::erase_if => util::erase_ifKonstantin Käfer2014-07-144-3/+9
|
* simplify OS X access token useJustin R. Miller2014-07-141-6/+3
|
* fix up access token docs for XcodeJustin R. Miller2014-07-141-6/+3
|
* Merge pull request #362 from mapbox/stylesourceMike Morris2014-07-1118-69/+96
|\ | | | | Break out StyleSource struct
| * Merge branch 'master' into stylesourceMike Morris2014-07-1115-87/+136
| |\ | |/ |/|
* | add cstdarg headersKonstantin Käfer2014-07-113-2/+6
| |
* | Merge branch 'master' of github.com:mapbox/mapbox-gl-nativeKonstantin Käfer2014-07-11121-1156/+1420
|\ \
| * | add missing include headerKonstantin Käfer2014-07-111-0/+2
| | |
| * | allow formatted messagesKonstantin Käfer2014-07-1114-88/+129
| | |
| * | fix linux app buildKonstantin Käfer2014-07-111-0/+2
| | |
* | | Merge remote-tracking branch 'origin/master'Konstantin Käfer2014-07-0914-77/+116
|\ \ \
* | | | upload dependencies to travis to shorten build timesKonstantin Käfer2014-07-081-0/+21
| | | |
| | | * add forward-declared Source shared_ptr to style_bucketMike Morris2014-07-112-5/+7
| | | |
| | | * Merge branch 'master' into stylesourceMike Morris2014-07-1125-27/+525
| | | |\ | | | |/ | | |/|
| | * | add nslog and stderr log backendsKonstantin Käfer2014-07-1110-18/+121
| | | |
| | * | add logging facility and check logs in testsKonstantin Käfer2014-07-1117-23/+418
| | | |
| | | * Merge branch 'master' into stylesourceMike Morris2014-07-107-5/+57
| | | |\ | | | |/ | | |/|
| | * | allow setting classes in the test caseKonstantin Käfer2014-07-105-0/+57
| | | |
| | * | remove duplicate setAppliedClasses functionKonstantin Käfer2014-07-102-5/+0
| | | |
| | | * Merge branch 'master' into stylesourceMike Morris2014-07-1018-75/+104
| | | |\ | | | |/ | | |/|
| | * | Merge branch 'master' of https://github.com/mapbox/mapbox-gl-nativeKonstantin Käfer2014-07-101-0/+0
| | |\ \
| | | * | bump Cocoa for access tokensJustin R. Miller2014-07-101-0/+0
| | | | |
| | * | | allow processing multiple renders per testKonstantin Käfer2014-07-1017-75/+104
| | |/ /
| | | * break out StyleSource from Source, move getActiveSources andMike Morris2014-07-1012-66/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updateSources into Map::Map, move getAccessToken from Style to Map Conflicts: include/llmr/style/style.hpp src/map/source.cpp src/style/style_layer.cpp src/style/style_parser.cpp
| | | * move sprite class to map directoryMike Morris2014-07-107-6/+6
| | |/
| | * convert stylesheet to use the correct stop valuesKonstantin Käfer2014-07-101-119/+119
| | | | | | | | | | | | [skip ci]
| | * remove *-enabledKonstantin Käfer2014-07-1010-47/+6
| | | | | | | | | | | | refs mapbox/mapbox-gl-style-spec#94
View Lorry Controller Status