Commit Graph

1561 Commits

Author SHA1 Message Date
Mike Morris
a57aefbd5d override LIBUV_VERSION 2014-08-14 17:19:40 -04:00
Mike Morris
6408e40a60 revert 992815cc3d 2014-08-13 16:04:53 -04:00
Mike Morris
8ab687b6c4 Merge branch 'master' into libuv010 2014-08-13 15:11:04 -04:00
Lauren Budorick
badc1ea28b Merge pull request #418 from mapbox/raster-styling
Raster styling
2014-08-13 11:00:04 -07:00
Lauren Budorick
8a9a43af7f fix std::sqrt 2014-08-13 09:52:54 -07:00
Konstantin Käfer
3492a55f97 remove unnecessary variable
[skip ci]
2014-08-13 10:44:44 +02:00
Lauren Budorick
b2aa60baac std namespacing trig fns 2014-08-12 22:56:16 -07:00
Lauren Budorick
4de2aafd30 rm commented line [skip ci] 2014-08-12 19:01:40 -07:00
Lauren Budorick
adb04662f9 parsing brightness correctly 2014-08-12 18:56:42 -07:00
Lauren Budorick
0d2724dec4 Raster styling all functional except brightness -- need to rework parsing 2014-08-12 18:27:35 -07:00
Mike Morris
a902391491 clone libuv010 branch of mapnik-packaging 2014-08-12 18:53:32 -04:00
Lauren Budorick
3941908cee Merge pull request #400 from mapbox/rasterize
raster prerendering (parity)
2014-08-12 10:55:22 -07:00
Konstantin Käfer
46e754f806 change directory, as the other won't make xcode update the files
[skip ci]
2014-08-12 16:30:58 +02:00
Konstantin Käfer
28d8c13c2c add outdoors style
[skip ci]
2014-08-12 16:30:47 +02:00
Konstantin Käfer
22e179aa37 remove trailing whitespace
[skip ci]
2014-08-12 16:30:27 +02:00
Konstantin Käfer
18b1469e9e use unified RenderPass type 2014-08-12 15:24:02 +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
7f968f52e6 Merge pull request #370 from mapbox/style-parser-test
Malformed stylesheet tests
2014-08-12 14:19:05 +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
52939ce2fa pass absolute path to npm executable 2014-08-12 13:29:26 +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
bdfc1036d3 Merge branch 'no-uv-headers' 2014-08-12 13:05:20 +02:00
Konstantin Käfer
d7ff2e09ff Merge branch 'master' of https://github.com/mapbox/mapbox-gl-native
Conflicts:
	mapboxgl.gyp
2014-08-12 13:05:08 +02:00
Konstantin Käfer
000831ad5a bump cocoa bindings 2014-08-12 13:01:03 +02:00
Konstantin Käfer
ecedce7994 Merge pull request #410 from mapbox/no-uv-headers
remove header dependency on uv.h
2014-08-12 12:48:45 +02:00
Konstantin Käfer
49df931935 bump cocoa dependency 2014-08-12 12:36:12 +02:00
Konstantin Käfer
fd8280eb51 include correct uv header in test fixture 2014-08-12 12:26:07 +02:00
Konstantin Käfer
367b35998d fix gyp builds 2014-08-12 12:26:00 +02:00
Konstantin Käfer
919947e6c7 remove uv.h dependency in darwin-specific code 2014-08-12 11:54:11 +02:00
Konstantin Käfer
d7058eb0df make output empty 2014-08-12 11:46:34 +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
1ad2f26b9d VICTORY 2014-08-11 12:13:23 -07:00
Lauren Budorick
510aaef07f render single tile in source.cpp 2014-08-11 12:13:23 -07:00
Lauren Budorick
1bd704ced7 rebase fix 2014-08-11 12:13:23 -07:00
Lauren Budorick
4083b534d7 committing so as to be revertable when i accidentally destroy the painter fns 2014-08-11 12:13:23 -07:00
Lauren Budorick
2be006fb00 unnecessary include 2014-08-11 12:13:23 -07:00
Lauren Budorick
fb5c3a888d textures binding to map, just the wrong textures -- but so much closer 2014-08-11 12:13:23 -07:00
Lauren Budorick
54ed547f90 need to figure out how to use modified matrix in drawing prerendered textures 2014-08-11 12:13:22 -07:00
Lauren Budorick
ec7f7de5c4 still not working 2014-08-11 12:13:22 -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
fae1c157f6 build fixes 2014-08-11 13:24:25 -04:00
Mike Morris
702c74fbd9 Revert "dont exit early from npm_install.sh"
This reverts commit 935089c239.
2014-08-11 12:44:37 -04:00
Mike Morris
851d8251c1 pass --clang=1 to npm install, per https://github.com/mapbox/mapbox-gl-native/pull/364#issuecomment-51735692 2014-08-11 12:44:26 -04: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
Konstantin Käfer
e4c311a864 remove uv.h dependency in util/time.hpp 2014-08-11 17:41:08 +02:00