summaryrefslogtreecommitdiff
path: root/src/style
Commit message (Collapse)AuthorAgeFilesLines
* use prefix operator++artemp2014-10-271-1/+1
|
* gcc fixesKonstantin Käfer2014-10-232-0/+3
|
* fix variable shadowingKonstantin Käfer2014-10-223-20/+20
|
* Merge branch 'master' of github.com:mapbox/mapbox-gl-nativeKonstantin Käfer2014-10-222-0/+2
|\
| * New mason-based build systemKonstantin Käfer2014-10-221-2/+2
| |\
| * | background-image supportJohn Firebaugh2014-10-172-0/+2
| | |
* | | Merge branch 'libuv-0.10-headless-display' into masonKonstantin Käfer2014-10-223-8/+30
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: common/http_request_baton_curl.cpp include/mbgl/map/map.hpp include/mbgl/util/uv_detail.hpp scripts/travis_before_install.sh setup-libraries.sh src/map/map.cpp src/storage/file_request_baton.cpp src/storage/http_request.cpp src/util/uv-messenger.c
| * | Merge branch 'master' into libuv-0.10-headless-displayMike Morris2014-10-102-19/+19
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: common/curl_request.cpp common/glfw_view.cpp common/glfw_view.hpp include/mbgl/platform/request.hpp ios/mapbox-gl-cocoa setup-libraries.sh src/map/map.cpp src/platform/request.cpp test/fixtures/fixture_request.cpp
| * | don't do concurrent access to a static member variableKonstantin Käfer2014-10-083-8/+30
| | | | | | | | | | | | | | | | | | in situations where the renderer is used from multiple threads, this causes memory corruption. fixes mapbox/node-mapbox-gl-native#7
* | | GCC doesn't like {} initializationKonstantin Käfer2014-10-221-2/+2
| |/ |/|
* | make SourceInfo object noncopyable and use a shared_pointer for itKonstantin Käfer2014-09-241-5/+5
| |
* | use util::ptr as a wrapper around std::shared_ptr that asserts nonemptinessKonstantin Käfer2014-09-242-14/+14
|/
* transition-* ⇢ *-transitionJohn Firebaugh2014-09-221-31/+31
| | | | https://github.com/mapbox/mapbox-gl-style-spec/issues/148
* Fix text/icon-translate-anchorJohn Firebaugh2014-09-041-2/+2
| | | These are style properties, not render properties.
* background-opacity supportJohn Firebaugh2014-08-283-0/+3
|
* Render background with plain shaderJohn Firebaugh2014-08-271-11/+0
|
* raster-fade -> raster-fade-durationJohn Firebaugh2014-08-271-2/+2
|
* Load TileJSON; support inline TileJSON sourcesLauren Budorick2014-08-212-14/+85
| | | | Fixes #412 Refs https://github.com/mapbox/mapbox-gl-style-spec/pull/143
* Consolidate duplicate interpolation definitionsJohn Firebaugh2014-08-202-85/+61
| | | | | | While here, do not interpolate style properties that are not transitionable. The previous behavior was to switch from old to new value halfway through the transition; now the new value is used immediately, as in JS.
* update mapbox/variantKonstantin Käfer2014-08-191-3/+3
|
* fix warningsKonstantin Käfer2014-08-181-0/+1
|
* remove support for composite layersAnsis Brammanis2014-08-154-14/+0
|
* allow crosstile labels and add `symbol-avoid-edges`Ansis Brammanis2014-08-151-0/+1
|
* parsing brightness correctlyLauren Budorick2014-08-121-5/+2
|
* remove trailing whitespaceKonstantin Käfer2014-08-121-4/+4
| | | | [skip ci]
* Merge branch 'master' into rasterizeKonstantin Käfer2014-08-122-43/+47
|\ | | | | | | [skip ci]
| * explicitly define destructor to avoid destructing with forward declarationKonstantin Käfer2014-08-121-0/+5
| |
| * Merge branch 'master' into style-parser-testKonstantin Käfer2014-08-121-1/+4
| |\ | | | | | | | | | | | | Conflicts: mapboxgl.gyp
| * \ Merge branch 'master' into style-parser-testMike Morris2014-08-116-122/+196
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: bin/build-style.js bin/default.style.json mapboxgl.gyp src/style/style_parser.cpp test/test.gyp
| * \ \ Merge branch 'master' into fuzz-pipeMike Morris2014-07-172-135/+57
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/style/style_parser.cpp
| * \ \ \ Merge branch 'master' into fuzz-pipeMike Morris2014-07-1714-272/+196
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: bin/package.json src/style/style_parser.cpp test/fixtures/fixture_log.cpp test/test.gyp
| * \ \ \ \ Merge branch 'master' into fuzz-pipeMike Morris2014-07-152-36/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: test/test.gyp
| * | | | | | hook up style_parser to new log backendMike Morris2014-07-141-49/+49
| | | | | | |
* | | | | | | Merge branch 'master' into rasterizeKonstantin Käfer2014-08-121-1/+4
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | [skip ci]
| * | | | | | remove uv.h dependency from header filesKonstantin Käfer2014-08-121-1/+4
| | |_|_|_|/ | |/| | | |
* | | | | | minor access changes etcLauren Budorick2014-08-111-5/+0
| | | | | |
* | | | | | some cleaning up, raster spin->hue-rotate renameLauren Budorick2014-08-113-4/+4
| | | | | |
* | | | | | rm rasterize_properties, should be close to working...doesn't workLauren Budorick2014-08-111-10/+2
| | | | | |
* | | | | | take 2, still not workingLauren Budorick2014-08-112-17/+19
| | | | | |
* | | | | | nonworking prerendering attemptsLauren Budorick2014-08-111-18/+22
|/ / / / /
* | | | | Eliminate warningsJohn Firebaugh2014-08-071-1/+1
| | | | |
* | | | | default to map alignment when placement type is lineKonstantin Käfer2014-08-051-0/+6
| | | | |
* | | | | don't require the background layer to be named "background"Konstantin Käfer2014-08-052-2/+2
| | | | |
* | | | | change max_angle_delta to max_angleKonstantin Käfer2014-08-041-1/+1
| | | | |
* | | | | update symbol placement to be more like jsKonstantin Käfer2014-08-041-0/+1
| | | | |
* | | | | move sprite to a use future loadingKonstantin Käfer2014-07-311-0/+5
| | | | |
* | | | | merge text and icon buckets/stylesKonstantin Käfer2014-07-295-76/+110
| | | | | | | | | | | | | | | | | | | | (we're not yet placing together!)
* | | | | add symbol* properties/keysKonstantin Käfer2014-07-294-12/+20
| | | | |
* | | | | read default values from property structsKonstantin Käfer2014-07-221-40/+42
| | | | | | | | | | | | | | | | | | | | fixes background color
* | | | | refactor source information into SourceInfo objectKonstantin Käfer2014-07-171-1/+1
| | | | |
View Lorry Controller Status