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

681 Commits

Author SHA1 Message Date
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
Konstantin Käfer
4d1d2c5d5d separate comparisons and expressions 2014-07-16 18:26:35 -07:00
Konstantin Käfer
a1d7da71c6 add more comparison tests 2014-07-16 18:26:35 -07:00
Justin R. Miller
becce08a32 Merge branch 'master' of github.com:mapbox/mapbox-gl-native 2014-07-16 18:18:16 -07:00
Justin R. Miller
a902446e7f refs #342 & #346: per-map change callbacks 2014-07-16 18:18:04 -07:00
Konstantin Käfer
17b1c6fd41 update value semanatics to be closer to js and add filter expression tests 2014-07-16 14:39:19 -07:00
Justin R. Miller
3adad61b82 Merge branch 'master' of github.com:mapbox/mapbox-gl-native 2014-07-15 18:48:10 -07:00
Justin R. Miller
1f06f518b2 allow for delayed map notifications during animations 2014-07-15 18:48:01 -07:00
Konstantin Käfer
682eaec87c add icon render test 2014-07-15 18:08:14 -07:00
Konstantin Käfer
7810548409 correctly cast buffer 2014-07-15 17:18:05 -07:00
Konstantin Käfer
066fa64dad make icons work again 2014-07-15 17:17:37 -07:00
Konstantin Käfer
c2efeaf876 do not reallocate the texture data on every update; use glTexSubImage2D instead 2014-07-15 17:01:00 -07:00
Mike Morris
a2336cf7ad Merge branch 'master' into fuzz-pipe 2014-07-15 17:06:35 -04:00
Justin R. Miller
cdda9f12b5 flesh out 'will change region' notifications 2014-07-15 12:52:19 -07:00
Mike Morris
d1977dc53f Merge branch 'master' into fuzz-pipe 
Conflicts:
	test/test.gyp
 2014-07-15 11:16:54 -04:00
Konstantin Käfer
471dafc1d1 change halo-width/blur units 
refs mapbox/mapbox-gl-style-spec#66
 2014-07-14 18:25:07 -07:00
Konstantin Käfer
9213f8d8e0 fix font halo units 2014-07-14 17:35:47 -07:00
Konstantin Käfer
bdc97d55d2 add enum class to unify parsing/stringification 2014-07-14 16:33:02 -07:00
Mike Morris
b327a2cb34 hook up style_parser to new log backend 2014-07-14 18:46:34 -04:00
Konstantin Käfer
d91aa9c7e2 don't initialize sources multiple times 2014-07-14 15:01:45 -07:00
Konstantin Käfer
8b775573c1 move std::erase_if => util::erase_if 2014-07-14 15:01:45 -07:00
Mike Morris
9031278344 Merge branch 'master' into stylesource 2014-07-11 16:53:18 -07:00
Mike Morris
5bc77d4243 add forward-declared Source shared_ptr to style_bucket 2014-07-11 16:49:39 -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
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
f89de635ad Merge branch 'master' into stylesource 2014-07-10 17:21:20 -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
Mike Morris
356c9ce7e4 move sprite class to map directory 2014-07-10 16:30:48 -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
a8e71bcb7b change line width and add line-width test 2014-07-10 14:54:43 -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
Konstantin Käfer
18924e5e30 update fixtures 2014-07-09 18:53:53 -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
Justin R. Miller
98a415416a move to per-map access token 2014-07-09 17:18:36 -07:00
Konstantin Käfer
cd69784edb switch to GeoJSON-style geometry type names 
refs https://github.com/mapbox/mapbox-gl-style-spec/pull/69
 2014-07-09 16:54:27 -07:00
Konstantin Käfer
22c8afced5 replace {{token}} with {token}, and %d/%d/%d with {z}/{x}/{y} 
refs https://github.com/mapbox/mapbox-gl-style-spec/pull/87
 2014-07-09 16:27:23 -07:00
Justin R. Miller
e66ed8fea4 Merge branch 'master' into access_token 
Conflicts:
	.gitignore
 2014-07-09 15:12:15 -07:00
Konstantin Käfer
d0d68d08f4 fix automated headless testing on travis 2014-07-09 12:37:59 -07:00
Konstantin Käfer
df65ecaa34 fix compile errors 2014-07-08 14:53:17 -07:00
Konstantin Käfer
af6091db5a update headless testing to be configurable 2014-07-08 14:38:49 -07:00
John Firebaugh
815f8be96e Use API v4 and access tokens 2014-07-08 13:16:38 -07:00
Konstantin Käfer
49b0f098c2 add test fixture and image comparison 2014-07-07 20:31:42 -07:00
Konstantin Käfer
59967fd709 make headless rendering work again by setting the correct fbo 2014-07-07 12:39:03 -07:00
Konstantin Käfer
853c9a5876 add ca bundle to linux build 2014-07-07 10:18:32 -07:00