tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,768 Commits 3 Branches 22 Tags
d684b8e929fbf94dea0b2d832d30fb2fa6109bd2
Commit Graph

16768 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Morris
5bc77d4243 add forward-declared Source shared_ptr to style_bucket 2014-07-11 16:49:39 -07:00
Konstantin Käfer
30298be270 add cstdarg headers 2014-07-11 16:42:09 -07:00
Konstantin Käfer
54fe8aab36 Merge branch 'master' of github.com:mapbox/mapbox-gl-native 2014-07-11 16:34:18 -07:00
Konstantin Käfer
2fc62f941a add missing include header 2014-07-11 16:30:13 -07:00
Konstantin Käfer
fbec72cd47 allow formatted messages 2014-07-11 16:25:20 -07:00
Konstantin Käfer
2dc9133006 fix linux app build 2014-07-11 15:18:01 -07:00
Mike Morris
86c5367bae Merge branch 'master' into stylesource 2014-07-11 14:52:39 -07:00
Konstantin Käfer
7ffe4a7858 add nslog and stderr log backends 2014-07-11 14:34:17 -07:00
Konstantin Käfer
f3c55eba9d add logging facility and check logs in tests 2014-07-11 13:55:18 -07:00
Mike Morris
d230b9a587 remove link_gl from test/style gyp 2014-07-10 17:29:07 -07:00
Mike Morris
97486f3e0d Merge branch 'stylesource' into fuzz-pipe 
Conflicts:
	src/map/source.cpp
	src/style/style_layer.cpp
 2014-07-10 17:24:50 -07:00
Mike Morris
f89de635ad Merge branch 'master' into stylesource 2014-07-10 17:21:20 -07:00
Konstantin Käfer
8fc4d61025 allow setting classes in the test case 2014-07-10 17:19:53 -07:00
Mike Morris
af7b5e0615 break out StyleSource from Source, move getActiveSources and 
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

Conflicts:
	include/llmr/map/source.hpp
	include/llmr/style/style_parser.hpp
	include/llmr/style/style_source.hpp
	src/map/map.cpp
	src/map/source.cpp
	src/style/style_parser.cpp
 2014-07-10 17:19:23 -07:00
Mike Morris
7cde26247d Merge branch 'master' into stylesource 2014-07-10 17:15:04 -07:00
Mike Morris
4590adc115 break out StyleSource from Source, move getActiveSources and 
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
 2014-07-10 17:12:02 -07:00
Konstantin Käfer
0719ca73be remove duplicate setAppliedClasses function 2014-07-10 17:10:34 -07:00
Konstantin Käfer
ac11adf48c Merge branch 'master' of https://github.com/mapbox/mapbox-gl-native 2014-07-10 17:02:10 -07:00
Konstantin Käfer
6a202fc197 allow processing multiple renders per test 2014-07-10 16:59:48 -07:00
Justin R. Miller
170d57cbe4 bump Cocoa for access tokens 2014-07-10 18:39:58 -05:00
Mike Morris
356c9ce7e4 move sprite class to map directory 2014-07-10 16:30:48 -07:00
Mike Morris
53e995acae break out StyleSource from Source, move getActiveSources and updateSources into Map::Map 2014-07-10 16:29:49 -07:00
Konstantin Käfer
c272ba7a47 convert stylesheet to use the correct stop values 
[skip ci]
 2014-07-10 16:05:16 -07:00
Konstantin Käfer
9846cb75f4 remove *-enabled 
refs mapbox/mapbox-gl-style-spec#94
 2014-07-10 15:51:35 -07:00
Konstantin Käfer
f519625ed2 allow specifying a base parameter for exponential functions 
refs mapbox/mapbox-gl-style-spec#4
 2014-07-10 15:26:35 -07:00
Konstantin Käfer
fd0b1aeffe report fixture request errors 2014-07-10 15:13:52 -07:00
Konstantin Käfer
0cf3858edb cleanup 2014-07-10 15:13:46 -07:00
Konstantin Käfer
a8e71bcb7b change line width and add line-width test 2014-07-10 14:54:43 -07:00
Mike Morris
1268fafe0b move sprite class to map directory 2014-07-10 11:46:10 -07:00
Konstantin Käfer
a8963fcbe4 Merge pull request #351 from mapbox/access_token 
Use API tokens and v4 vector tile endpoint
 2014-07-10 11:36:58 -07:00
Konstantin Käfer
cdf8e95d66 update docs 
[skip ci]
 2014-07-10 11:34:16 -07:00
Konstantin Käfer
72a5a6ee13 read access token from environment 2014-07-10 11:28:39 -07:00
Konstantin Käfer
0d7b3462e9 read access token from environment 2014-07-10 11:27:03 -07:00
Mike Morris
5e85324c38 link_gl 2014-07-10 10:50:41 -07:00
Konstantin Käfer
795496053b Merge branch 'master' into access_token 
Conflicts:
	src/map/source.cpp
 2014-07-10 10:46:35 -07:00
Mike Morris
076dce563d clean up npm_install 2014-07-10 10:27:10 -07:00
Mike Morris
ee7b51c942 Merge branch 'master' into fuzz-pipe 2014-07-09 19:28:52 -07:00
Mike Morris
529277b0a2 fix invalid json 2014-07-09 19:28:35 -07:00
Mike Morris
fa94d2cb0f Merge branch 'master' into fuzz-pipe 2014-07-09 19:20:43 -07:00
Konstantin Käfer
374b1a1c65 fix other style as well 2014-07-09 19:03:26 -07:00
Konstantin Käfer
376105cd87 prettify output 2014-07-09 19:03:17 -07:00
Konstantin Käfer
18924e5e30 update fixtures 2014-07-09 18:53:53 -07:00
Mike Morris
203177403f Merge branch 'master' into fuzz-pipe 2014-07-09 18:51:14 -07:00
Mike Morris
ece851f216 fix test/style stylesheet paths 2014-07-09 18:48:57 -07:00
Konstantin Käfer
d9bebe84a5 move render type to layer top level 
refs https://github.com/mapbox/mapbox-gl-style-spec/issues/80
 2014-07-09 18:43:28 -07:00
Mike Morris
e3977fb5e5 add npm_install dep to build-shaders 2014-07-09 18:35:29 -07:00
Mike Morris
5cea29b3bc Merge branch 'master' into fuzz-pipe 2014-07-09 18:26:03 -07:00
Justin R. Miller
9c0aa55c93 flesh out access token README docs 2014-07-09 18:19:00 -07:00
Mike Morris
d96e2fc782 npm_install.sh 2014-07-09 18:16:28 -07:00
Justin R. Miller
cfbd9f2469 move Linux & OS X to per-map access tokens 2014-07-09 18:08:53 -07:00