Konstantin Käfer
10cb83579f
gcc fixes
2014-10-23 02:46:15 -07:00
Konstantin Käfer
214f99673f
fix variable shadowing
2014-10-22 18:19:01 +02:00
Konstantin Käfer
087d04292a
Merge branch 'master' of github.com:mapbox/mapbox-gl-native
2014-10-22 15:18:30 +02:00
Konstantin Käfer
905c4294be
Merge branch 'libuv-0.10-headless-display' into mason
...
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
2014-10-22 15:14:21 +02:00
Konstantin Käfer
253bbd1c5b
New mason-based build system
2014-10-22 15:13:35 +02:00
Konstantin Käfer
f701fb340f
GCC doesn't like {} initialization
2014-10-22 04:18:05 -07:00
John Firebaugh
4603ca037c
background-image support
2014-10-17 10:44:38 -07:00
Mike Morris
2d1219fa51
Merge branch 'master' into libuv-0.10-headless-display
...
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
2014-10-10 12:24:45 -04:00
Konstantin Käfer
91f40daa69
don't do concurrent access to a static member variable
...
in situations where the renderer is used from multiple threads, this causes memory corruption.
fixes mapbox/node-mapbox-gl-native#7
2014-10-08 15:27:33 +02:00
Konstantin Käfer
19129cbd02
make SourceInfo object noncopyable and use a shared_pointer for it
2014-09-24 16:16:29 +02:00
Konstantin Käfer
f26bb724dc
use util::ptr as a wrapper around std::shared_ptr that asserts nonemptiness
2014-09-24 16:14:09 +02:00
John Firebaugh
ee3e0827a2
transition-* ⇢ *-transition
...
https://github.com/mapbox/mapbox-gl-style-spec/issues/148
2014-09-22 14:32:30 -07:00
John Firebaugh
c14ae3c477
Fix text/icon-translate-anchor
...
These are style properties, not render properties.
2014-09-04 15:38:14 -07:00
John Firebaugh
9f734ee61d
background-opacity support
2014-08-28 10:43:53 -07:00
John Firebaugh
e2c2ab843e
Render background with plain shader
2014-08-27 18:22:20 -07:00
John Firebaugh
a62a826b56
raster-fade -> raster-fade-duration
2014-08-27 17:31:32 -07:00
Lauren Budorick
0168612ed3
Load TileJSON; support inline TileJSON sources
...
Fixes #412
Refs https://github.com/mapbox/mapbox-gl-style-spec/pull/143
2014-08-21 16:12:27 -07:00
John Firebaugh
b9c7e1bdd9
Consolidate duplicate interpolation definitions
...
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.
2014-08-20 13:58:37 -07:00
Konstantin Käfer
d147e18153
update mapbox/variant
2014-08-19 11:38:26 +02:00
Konstantin Käfer
5a59b5f5fc
fix warnings
2014-08-18 14:05:52 +02:00
Ansis Brammanis
32a1711d8c
remove support for composite layers
2014-08-15 15:52:53 +02:00
Ansis Brammanis
6c45972502
allow crosstile labels and add symbol-avoid-edges
2014-08-15 15:18:29 +02:00
Lauren Budorick
adb04662f9
parsing brightness correctly
2014-08-12 18:56:42 -07:00
Konstantin Käfer
22e179aa37
remove trailing whitespace
...
[skip ci]
2014-08-12 16:30:27 +02:00
Konstantin Käfer
64d5cea94f
Merge branch 'master' into rasterize
...
[skip ci]
2014-08-12 15:15:05 +02:00
Konstantin Käfer
213b6ad4dc
Merge branch 'master' into rasterize
...
[skip ci]
2014-08-12 15:12:31 +02:00
Konstantin Käfer
df47a7be90
explicitly define destructor to avoid destructing with forward declaration
2014-08-12 13:35:04 +02:00
Konstantin Käfer
9b9ad20a90
Merge branch 'master' into style-parser-test
...
Conflicts:
mapboxgl.gyp
2014-08-12 13:16:20 +02:00
Konstantin Käfer
6f80264291
remove uv.h dependency from header files
2014-08-12 11:45:30 +02:00
Lauren Budorick
0263a9ffb7
minor access changes etc
2014-08-11 15:42:09 -07:00
Lauren Budorick
41165452bc
some cleaning up, raster spin->hue-rotate rename
2014-08-11 12:13:24 -07:00
Lauren Budorick
560cc112e1
rm rasterize_properties, should be close to working...doesn't work
2014-08-11 12:13:22 -07:00
Lauren Budorick
9e1156d660
take 2, still not working
2014-08-11 12:13:22 -07:00
Lauren Budorick
df925fe0e5
nonworking prerendering attempts
2014-08-11 12:12:43 -07:00
Mike Morris
a79afb78d8
Merge branch 'master' into style-parser-test
...
Conflicts:
bin/build-style.js
bin/default.style.json
mapboxgl.gyp
src/style/style_parser.cpp
test/test.gyp
2014-08-11 12:42:49 -04:00
John Firebaugh
70a31baf5c
Eliminate warnings
2014-08-07 13:02:40 -07:00
Konstantin Käfer
1f8202b678
default to map alignment when placement type is line
2014-08-05 13:49:59 +02:00
Konstantin Käfer
b402d03837
don't require the background layer to be named "background"
2014-08-05 11:58:16 +02:00
Konstantin Käfer
9f99f0bb60
change max_angle_delta to max_angle
2014-08-04 18:59:17 +02:00
Konstantin Käfer
36181b0922
update symbol placement to be more like js
2014-08-04 18:24:22 +02:00
Konstantin Käfer
75c079adb1
move sprite to a use future loading
2014-07-31 18:14:26 +02:00
Konstantin Käfer
fa3a41136c
merge text and icon buckets/styles
...
(we're not yet placing together!)
2014-07-29 18:27:59 +02:00
Konstantin Käfer
270c24a9a8
add symbol* properties/keys
2014-07-29 12:09:22 +02:00
Konstantin Käfer
b5c406416a
read default values from property structs
...
fixes background color
2014-07-22 17:19:07 +02:00
Konstantin Käfer
3141b8b1f7
refactor source information into SourceInfo object
2014-07-17 15:37:18 -07:00
Mike Morris
4b9e299d06
Merge branch 'master' into fuzz-pipe
...
Conflicts:
src/style/style_parser.cpp
2014-07-17 17:58:13 -04:00
Konstantin Käfer
c01143a731
parse min-zoom/max-zoom values
...
refs mapbox/mapbox-gl-style-spec#65
2014-07-17 14:54:22 -07:00
Konstantin Käfer
68f595a32b
consolidate functions to only use stops
...
refs mapbox/mapbox-gl-style-spec#96
2014-07-17 14:32:35 -07:00
Mike Morris
4cb9972278
Merge branch 'master' into fuzz-pipe
...
Conflicts:
bin/package.json
src/style/style_parser.cpp
test/fixtures/fixture_log.cpp
test/test.gyp
2014-07-17 12:44:45 -04:00
Konstantin Käfer
4ea281c750
rename llmr => mbgl
2014-07-16 18:53:56 -07:00