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
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
John Firebaugh
97d7f065d6 Add virtual destructor for FileSource 2014-12-04 10:52:26 -08:00
John Firebaugh
e5f70bddf6 Update mapbox-gl-cocoa 2014-12-04 10:35:50 -08:00
Leith Bade
c348c141c5 Fix missing symbol 2014-12-05 00:04:08 +11:00
Leith Bade
20584a57dd Fix debug build 2014-12-04 23:21:23 +11:00
Konstantin Käfer
b449b22abc remove use of std::to_string in favor of boost::lexical_cast 
std::to_string calls sprintf() internally, which is really slow
 2014-12-04 12:59:09 +01:00
Leith Bade
1c0396690e Fixup after merge 2014-12-04 22:39:38 +11:00
Leith Bade
8f1754cf0a Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason 
Conflicts:
	include/mbgl/storage/base_request.hpp
	include/mbgl/storage/file_request_baton.hpp
	include/mbgl/storage/http_request.hpp
	include/mbgl/storage/http_request_baton.hpp
	include/mbgl/util/uv_detail.hpp
	platform/darwin/http_request_baton_cocoa.mm
	platform/default/caching_http_file_source.cpp
	platform/default/http_request_baton_curl.cpp
	src/map/map.cpp
	src/storage/base_request.cpp
	src/storage/file_request.cpp
	src/storage/file_request_baton.cpp
	src/storage/http_request.cpp
	src/storage/http_request_baton.cpp
 2014-12-04 22:19:46 +11:00
Konstantin Käfer
65451187f5 [performance] remove use of snprintf in hot path; it's pretty slow on iOS 2014-12-04 12:19:21 +01:00
John Firebaugh
57249ca32c Prefer stdlib to libuv (fixes #688) 2014-12-03 17:38:10 -08:00
John Firebaugh
10ebcbca93 Remove unused 2014-12-03 13:42:02 -08:00
Leith Bade
c817e476f3 Revert "Fix travis again x6" 
This reverts commit 58833dd56a.
 2014-12-04 08:38:02 +11:00
Leith Bade
de5a0f5854 Merge branch 'android-mason' of github.com:mapbox/mapbox-gl-native into android-mason 
Conflicts:
	gyp/mbgl-ios.gypi
	gyp/mbgl-linux.gypi
	gyp/mbgl-osx.gypi
	platform/default/caching_http_file_source.cpp
 2014-12-04 08:13:49 +11:00
Leith Bade
2b06d905f6 Fix Map with CachingHTTPFileSource 2014-12-04 08:11:09 +11:00
Leith Bade
991a74774e Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason 
Conflicts:
	gyp/mbgl-ios.gypi
	gyp/mbgl-linux.gypi
	gyp/mbgl-osx.gypi
	platform/default/caching_http_file_source.cpp
 2014-12-04 08:02:57 +11:00
John Firebaugh
21b4f8c501 libuv handles must be deallocated asynchronously 
Fixes #659
 2014-12-03 12:04:56 -08:00
Mike Morris
55f2b42826 bump mapbox-gl-cocoa 2014-12-03 13:27:47 -05:00
Mike Morris
e87a6d1871 Merge branch 'master' into android-mason 
Conflicts:
	gyp/mbgl-ios.gypi
	gyp/mbgl-linux.gypi
	gyp/mbgl-osx.gypi
	platform/default/caching_http_file_source.cpp
 2014-12-03 13:07:49 -05:00
Mike Morris
90a7be9079 Merge pull request #677 from mapbox/caching-http-file-source 
Break out FileSource interface
 2014-12-03 12:36:32 -05:00
Mike Morris
dac76a0f92 break out FileSource as an abstract class 
add CachingHTTPFileSource implementation
 2014-12-03 12:25:11 -05:00
Leith Bade
58833dd56a Fix travis again x6 2014-12-04 02:56:39 +11:00
Leith Bade
ae98eeb85d Fix travis again x5 2014-12-04 02:43:06 +11:00
Leith Bade
ef94bec2f3 Fix travis again x4 2014-12-04 02:12:11 +11:00
Leith Bade
886e21f755 Fix travis again x3 2014-12-04 01:57:12 +11:00
Leith Bade
772f154e4d Fix Android crash 2014-12-04 01:51:17 +11:00
Leith Bade
243fb1de2d Fix travis again x2 2014-12-04 01:35:52 +11:00
Leith Bade
4187ccc381 Fix travis again 2014-12-04 01:27:52 +11:00
Leith Bade
34aeae2455 Fix travis 2014-12-04 01:22:17 +11:00
Leith Bade
14cdd9c96f Rename lots of things 2014-12-04 01:10:43 +11:00
Leith Bade
a26ef7f33d Remove TODOs 2014-12-03 23:22:25 +11:00
Leith Bade
6be8c840bb Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason 2014-12-03 23:03:14 +11:00
Leith Bade
08ce7157f1 Fix debug build 2014-12-03 22:58:33 +11:00
Konstantin Käfer
d3ab895153 switch to a newer version of GLFW 
refs #679
 2014-12-03 12:30:29 +01:00
Leith Bade
9db5d2ac55 Remove boost::make_unique 2014-12-03 22:27:40 +11:00
Leith Bade
31077a813c Don't use malloc 2014-12-03 22:17:42 +11:00
Leith Bade
0899b9182a Remove old TODO 2014-12-03 22:12:05 +11:00