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

2603 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Leith Bade
69cd7268d7 Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason 
Conflicts:
	platform/default/http_request_baton_curl.cpp
 2014-12-10 19:13:21 +11:00
Leith Bade
c55cd7f473 Check for running services 2014-12-09 23:04:27 +11:00
Leith Bade
3c8fb1d32e Remove NDK submodule 2014-12-09 22:47:27 +11:00
Leith Bade
6fecb80405 Go back to 7z NDK 2014-12-09 22:44:12 +11:00
Leith Bade
2967bd85e4 Fix path to NDK 2014-12-09 22:41:59 +11:00
Leith Bade
d6983dd1b1 sudo dunp 2014-12-09 09:59:25 +11:00
Konstantin Käfer
318ef5d443 Merge pull request #705 from mapbox/user-agent-os 
Include operating system and actual version number in User Agent string
 2014-12-08 23:18:09 +01:00
Leith Bade
8b1a2679e6 Dump running services. 2014-12-09 09:13:09 +11:00
Konstantin Käfer
8fd04ebc44 add missing gyp file 2014-12-08 22:35:03 +01:00
Leith Bade
d8b7bc7235 Always update before install 2014-12-09 08:34:20 +11:00
Mike Morris
c61537af8f nu_static_libs 2014-12-08 12:24:57 -08:00
Konstantin Käfer
b512c43296 support fewer parameters 2014-12-08 17:22:15 +01:00
Konstantin Käfer
5a3d0b0d3a don't print more information when a tag actually is available 2014-12-08 16:59:02 +01:00
Konstantin Käfer
0a84deef91 make sure it also works when there are no git tags 2014-12-08 16:47:24 +01:00
Konstantin Käfer
e11c073e51 report version number in user agent string 
refs #628
 2014-12-08 16:21:15 +01:00
Konstantin Käfer
d04d75abae Merge pull request #628 from mapbox/user-agents 
Set user agent to something useful
 2014-12-08 11:14:32 +01:00
Konstantin Käfer
1f91be988b add user agent header 
fixes #628
 2014-12-08 11:04:08 +01:00
Leith Bade
81bf36a86c Remove Map::cleanup() from JNI 2014-12-08 20:22:04 +11:00
Leith Bade
d623c264f7 Fix missing shader cache path 2014-12-08 20:20:16 +11:00
Leith Bade
0487b0c6a3 Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason 
Conflicts:
	src/mbgl/map/map.cpp
 2014-12-08 20:19:41 +11:00
John Firebaugh
de098591c5 Remove Map::cleanup and Painter::cleanup 
Both were noops.
 2014-12-06 14:08:40 -08:00
Leith Bade
886b622a92 Add pakced depth stencil to GLFWView and HeadlessView 2014-12-07 00:40:44 +11:00
Leith Bade
b534520d6c Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason 
Conflicts:
	include/mbgl/platform/gl.hpp
	src/mbgl/platform/gl.cpp
	src/mbgl/shader/shader.cpp
 2014-12-07 00:29:20 +11:00
Leith Bade
f2776c0854 Try NDK install via git clone 2014-12-06 15:48:49 +11:00
Dane Springmeyer
004d12ea0b Merge pull request #698 from mapbox/cache-shaders 
Add caching of compiled shaders
 2014-12-05 23:37:35 -05:00
Leith Bade
86ce061ab4 Revert "Try ruby env" 
This reverts commit 4e9f2c146b.
 2014-12-06 15:15:09 +11:00
Leith Bade
4e9f2c146b Try ruby env 2014-12-06 15:08:06 +11:00
Leith Bade
35e3f55f56 Revert "Try tar.gz NDK" 
This reverts commit 08c4ebc3bb.

Conflicts:
	scripts/travis_before_install.sh
 2014-12-06 15:06:51 +11:00
Leith Bade
67c1ff2f95 Fix rebase 2014-12-06 14:28:34 +11:00
Leith Bade
6df4e4a52c Load program binary extension on Linux 2014-12-06 14:21:08 +11:00
Leith Bade
daeb3b51fd Upgrade to Android Studio 1.0 RC4 2014-12-06 12:55:42 +11:00
Leith Bade
cb32f26bce Fix typo 2014-12-06 06:51:36 +11:00
Leith Bade
08c4ebc3bb Try tar.gz NDK 2014-12-06 06:39:34 +11:00
Leith Bade
eb8eee00c7 Remove line 2014-12-06 02:01:55 +11:00
Leith Bade
434b2e8070 Missing asserts 2014-12-06 01:46:10 +11:00
Leith Bade
c26430739f Merge classes 2014-12-06 01:11:16 +11:00
Leith Bade
93ab4036e9 Fix commit 2014-12-06 00:50:23 +11:00
Leith Bade
de9eb00276 Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason 
Conflicts:
	.gitignore
	gyp/mbgl-ios.gypi
	gyp/mbgl-linux.gypi
	gyp/mbgl-osx.gypi
	include/mbgl/map/map.hpp
	src/mbgl/map/map.cpp
	src/mbgl/storage/caching_http_file_source.cpp
 2014-12-05 23:16:49 +11:00
John Firebaugh
ff640132de Move setAccessToken to CachingHTTPFileSource 2014-12-04 17:03:23 -08:00
John Firebaugh
0a942b6f14 Change Map::stop to use std::function<void()> 
Fixes #685
 2014-12-04 15:58:04 -08:00
John Firebaugh
13564fb876 Create GlyphStore up front 2014-12-04 15:26:54 -08:00
John Firebaugh
0c9ae49b47 get/setBase may be called from main thread 2014-12-04 15:26:54 -08:00
John Firebaugh
36500b9f95 Add CachingHTTPFileSource::clearLoop() 
So loop state can be cleaned up in the appropriate thread.
This is a hack; loop needs to be externalized from Map.

Fixes #686
 2014-12-04 15:26:54 -08:00
John Firebaugh
16fe8e64c4 Move setReachability to CachingHTTPFileSource 2014-12-04 15:14:40 -08:00
John Firebaugh
9aff2c386c Remove invalid map->terminate() 
Map has already been destroyed by this point, so the
call is invalid. The work that terminate() would do
has already been done.
 2014-12-04 14:31:29 -08:00
Konstantin Käfer
22f02ac007 Merge pull request #622 from mapbox/private-headers 
make most headers private
 2014-12-04 20:24:29 +01:00
Konstantin Käfer
3b190ddd0d fix build 2014-12-04 20:13:08 +01:00
Konstantin Käfer
1e3fb3a423 remove usage of relative paths 2014-12-04 20:02:51 +01:00
Konstantin Käfer
abafb52f37 make most headers private 2014-12-04 20:02:50 +01:00
Konstantin Käfer
bff6aeb4da switch to plain file streams rather than JSON 2014-12-04 20:00:41 +01:00