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

738 Commits

Author SHA1 Message Date
Leith Bade
7877d0505e Fix crash 2014-11-12 23:17:07 +11:00
Leith Bade
0dd54c0379 Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason 
Conflicts:
	platform/default/image.cpp
 2014-11-12 23:16:56 +11:00
Leith Bade
11061ee5da Add noncopyable 2014-11-12 22:01:32 +11:00
Leith Bade
49da2c2fa5 Tidy code up more 2014-11-12 22:00:44 +11:00
Leith Bade
6b9e3c60ef Renamed source files using mapbox style 
Move headers to mbgl/android
Tidy up headers and includes
 2014-11-12 21:17:24 +11:00
Mike Morris
c542bd1140 repair undef None GLX wrapper, pass 0 instead of None to GLX functions 2014-11-10 15:06:56 -05:00
Leith Bade
1e55c332cd Wait for pause 
Tidy up
Remove red fill
 2014-11-09 23:52:34 +11:00
Leith Bade
3696e05193 Add async asserts 2014-11-09 22:54:05 +11:00
Leith Bade
28d66bb6f8 Add Map::pause/resume 
Fixed bug after switching apps
 2014-11-09 22:36:37 +11:00
Leith Bade
70057e1b8e Merge branch 'master' of https://github.com/mapbox/mapbox-gl-native into android-mason 
Conflicts:
	gyp/common.gypi
	include/mbgl/geometry/vao.hpp
	include/mbgl/platform/event.hpp
	include/mbgl/platform/gl.hpp
	platform/default/http_request_baton_curl.cpp
	src/storage/response.cpp
 2014-11-09 00:35:52 +11:00
Konstantin Käfer
8fe8b2f739 add glx support 2014-11-07 09:38:07 -08:00
Konstantin Käfer
582d616deb load VAO extension 2014-11-07 18:17:24 +01:00
Leith Bade
598bc92401 Make image.cpp use Log functions 2014-11-08 01:05:03 +11:00
Leith Bade
7477d0c9df Finish android log backend 2014-11-07 23:46:28 +11:00
artemp
44570c1d30 use linear<16,4> splitting algorithm (faster running tests) 2014-11-05 18:43:18 +00:00
Dane Springmeyer
a9ca7fdf11 Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason 2014-11-04 21:28:18 -05:00
John Firebaugh
051e1c32ae Support compound text-anchor values 2014-11-04 12:26:27 -08:00
John Firebaugh
0790b574b4 Single text positioning property 
https://github.com/mapbox/mapbox-gl-style-spec/issues/197
 2014-11-04 12:26:27 -08:00
John Firebaugh
9a3b740fcc Render ⇢ layout, style ⇢ paint 
https://github.com/mapbox/mapbox-gl-style-spec/issues/166
 2014-11-04 12:26:14 -08:00
John Firebaugh
c151f12997 Implement v6 filters 2014-11-04 12:26:14 -08:00
Lauren Budorick
0d6bca0e7e line-offset -> line-gap-width 2014-11-04 12:26:13 -08:00
Konstantin Käfer
75889d8124 replace strftime_l with our custom formatter 2014-11-04 06:44:50 -08:00
artemp
92124d3aa1 make util::utf8_to_utf32::convert() static 2014-11-03 15:44:27 +00:00
Dane Springmeyer
d74a98899f merge with master 2014-11-03 10:32:27 -05:00
Dane Springmeyer
4084e41e7f cleanup after 195560090/#309/#530 2014-11-03 09:12:23 -05:00
Dane Springmeyer
490a4bb17f centralize android ifdefs 2014-11-02 22:55:23 -05:00
Dane Springmeyer
d7b0a34bdd mason-based android port 2014-11-01 22:41:40 -04:00
Konstantin Käfer
a50042349c Merge branch 'master' into platform-image 2014-10-31 16:33:45 -04:00
Konstantin Käfer
38d17532c6 use binary mesa on travis to speed up build times 2014-10-31 12:35:36 -04:00
Konstantin Käfer
80366bc615 allow providing a callback to uv_messenger_stop to prevent mismatched new/free 2014-10-30 17:47:34 -04:00
artemp
1955600904 use boost::unicode_iterator on all platform (experimental) 2014-10-30 17:43:55 -04:00
Konstantin Käfer
b6dea0d8de also allow underscores in token names 2014-10-30 15:06:18 -04:00
Konstantin Käfer
e3bc69b7e7 use CoreImage for decoding/encoding images on osx/ios 2014-10-30 12:02:28 -04:00
Konstantin Käfer
7a13db9a86 do not crash for missing images 2014-10-30 11:58:16 -04:00
Konstantin Käfer
414ccaaf93 use unique_ptr for automatic deallocation 2014-10-30 11:54:52 -04:00
Konstantin Käfer
8f1c2b3bce remove regex/boost regex usage 2014-10-30 11:34:14 -04:00
artemp
aaa8927169 remove unused and unimplemented method 2014-10-30 11:04:10 -04:00
artemp
fd2d8f48cb pass Tile::ID by const ref 2014-10-30 10:43:58 -04:00
Dane Springmeyer
761f753cbd merge with mbgl-config 2014-10-29 21:40:02 -04:00
artemp
9ff0d00912 store uv::loop as unique_ptr 2014-10-29 18:12:11 -04:00
artemp
6622a07ad8 simplify - remove before/afterParse and create Parser on stack in worker thread 2014-10-29 14:37:13 -04:00
artemp
2607a755af store spriteAtlas by value + make TileParser noncopyable 2014-10-29 14:09:06 -04:00
artemp
3b5b15a4e4 store glyphAtlas by value in Map object, pass by ref 
change hasData signiture to expect ```StyleLayer const&```
 2014-10-29 13:44:26 -04:00
John Firebaugh
7caac537b8 Fix variable shadowing 2014-10-29 10:12:41 -04:00
John Firebaugh
8ae0dcb5a4 Replace uv::rwlock with std::recursive_mutex 
Fixes #491
 2014-10-29 09:58:56 -04:00
John Firebaugh
da8aa391d0 Render map with a copy of TransformState 2014-10-29 09:58:56 -04:00
John Firebaugh
4f7bc80664 Hold internal reference to Sprite in SpriteAtlas 2014-10-29 09:58:03 -04:00
Konstantin Käfer
dbddd3c904 gyp fixes 2014-10-28 12:47:58 -04:00
Justin R. Miller
a9470feb23 Merge branch 'master' of github.com:mapbox/mapbox-gl-native 2014-10-27 17:02:24 -04:00
Justin R. Miller
e816d301bb refs #509: tickets good, inline TODO bad 2014-10-27 17:02:20 -04:00