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

5798 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Leith Bade
772fe9dcbc Fix make_unique 2014-12-03 22:10:55 +11:00
Leith Bade
94d34ce7ac Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason 
Conflicts:
	src/map/map.cpp
 2014-12-03 22:02:55 +11:00
Konstantin Käfer
dbdc64592c don't set the window title on every frame 
this is a significant performance penalty, at least on OS X, and drops our frame rate below 60fps on even simple scenes. instead of showing the position of the map in the window, we should display it elsewhere
 2014-12-03 11:59:39 +01:00
Leith Bade
f090d6b264 Use uv::async and various other fixes 2014-12-03 21:57:55 +11:00
Konstantin Käfer
82f3574d09 add array overloads to make_unique and move it to mbgl::util from std 2014-12-03 11:27:24 +01:00
Leith Bade
8208dfaba3 Use std::lock_guard 2014-12-03 20:56:41 +11:00
Leith Bade
2e30623bbc Restore travis timing 2014-12-03 20:51:37 +11:00
Leith Bade
160c262b6e Fix set -e 2014-12-03 20:49:11 +11:00
Leith Bade
e16f9cb291 Fix accidentally commented code 2014-12-03 20:47:05 +11:00
Leith Bade
3058cd2d60 Remove old TODO 2014-12-03 20:43:36 +11:00
Leith Bade
9346f6f6bd Remove accidental friend 2014-12-03 20:14:11 +11:00
Leith Bade
35b0e2bfbd Fix names in Map 2014-12-03 20:09:16 +11:00
Leith Bade
8762d5a9b6 Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason 
Conflicts:
	include/mbgl/map/map.hpp
	src/map/map.cpp
 2014-12-03 19:56:20 +11:00
Leith Bade
1bffbb0908 Use TESTMUNK in travis to start Testmunk 2014-12-03 19:46:35 +11:00
John Firebaugh
50669307c5 Remove unnecessary cast 2014-12-02 12:24:26 -08:00
John Firebaugh
a6522d4a5a Texturepool ⇢ TexturePool (fixes #655) 2014-12-02 12:24:25 -08:00
John Firebaugh
8fdf645e12 Adhere to naming conventions 2014-12-02 12:24:25 -08:00
John Firebaugh
8f1772f18f More complete uv::thread 2014-12-02 12:24:25 -08:00
artemp
9e819a4cbe untabify 2014-12-02 16:38:04 +01:00
artemp
2c05b23f6a update nunicode version to 1.5.1 2014-12-02 16:34:51 +01:00