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
Mike Morris
8db6325b8a fix TRAVIS unbound var error 2014-10-10 12:49:27 -04:00
Mike Morris
2d1219fa51 Merge branch 'master' into libuv-0.10-headless-display 
Conflicts:
	common/curl_request.cpp
	common/glfw_view.cpp
	common/glfw_view.hpp
	include/mbgl/platform/request.hpp
	ios/mapbox-gl-cocoa
	setup-libraries.sh
	src/map/map.cpp
	src/platform/request.cpp
	test/fixtures/fixture_request.cpp
 2014-10-10 12:24:45 -04:00
Mike Morris
8f6e8eead1 only upload binaries on travis 2014-10-10 11:40:03 -04:00
Mike Morris
356cf956f4 XInitThreads 2014-10-09 15:16:01 -04:00
John Firebaugh
f390dab0ea Upload library tarball only on travis (fixes #485) 2014-10-09 10:58:55 -07:00
Mike Morris
dfb81fe9ce fix HeadlessView::readPixels return value, ref #480 2014-10-08 16:04:19 -04:00
Mike Morris
a1bc8c766d add HeadlessView::readPixels, fixes #480 2014-10-08 15:31:41 -04:00
Mike Morris
799ca683df Merge branch 'libuv-0.10-headless-display' of github.com:mapbox/mapbox-gl-native into libuv-0.10-headless-display 2014-10-08 14:47:48 -04:00
Mike Morris
7aea160760 throw std::runtime_error instead of fprintf in HeadlessView, closes #481 2014-10-08 14:47:41 -04:00
Konstantin Käfer
f807926f5e report a permanent error instead of aborting on unknown error codes 
fixes #479
 2014-10-08 16:05:27 +02:00
Konstantin Käfer
bf9435a2c4 remove outdated comment 
[skip ci]
 2014-10-08 15:59:05 +02:00
Konstantin Käfer
91f40daa69 don't do concurrent access to a static member variable 
in situations where the renderer is used from multiple threads, this causes memory corruption.

fixes mapbox/node-mapbox-gl-native#7
 2014-10-08 15:27:33 +02:00
Mike Morris
36b7bb0c09 clean up shared_ptr usage in HeadlessView 2014-10-07 16:26:21 -04:00
Mike Morris
5cc6b26229 clean up shared_ptr usage 2014-10-06 18:24:01 -04:00
Mike Morris
41dac96408 use shared_ptr for HeadlessDisplay in HeadlessView 2014-10-06 18:05:10 -04:00
Mike Morris
8b06b65f35 wrap GL/glx.h with undef None, use 0 instead, h/t @jfirebaugh 2014-10-06 16:53:57 -04:00
Mike Morris
170ce422ce forward declare HeadlessDisplay in headless_view.hpp 2014-10-06 15:45:14 -04:00
Mike Morris
0f1d33f5ee break out HeadlessDisplay from HeadlessView, ref #478 2014-10-03 18:31:38 -04:00
Konstantin Käfer
708194cb1a define variable outside of loop scope 2014-10-01 05:20:23 -07:00
Konstantin Käfer
6b1a86c37c fix gcc cannot call member function without object error 2014-10-01 05:20:12 -07:00
Konstantin Käfer
d03b7aa31a properly ref/unref the handle and run the loop again for shutdown purposes 2014-10-01 13:26:49 +02:00
Mike Morris
c4c4b3318a log CGLErrorString for CGLChoosePixelFormat, enable OpenGL 
multithreading

https://developer.apple.com/library/mac/technotes/tn2085/_index.html
 2014-09-30 17:42:27 -04:00
Mike Morris
848dccbcae make view active/inactive around Map::setup, don't leave active after view.resize() 2014-09-30 12:06:51 -04:00
Konstantin Käfer
8fcc74e253 fix headless tests 2014-09-30 17:29:10 +02:00
Konstantin Käfer
a9039cf5d7 move file request baton to its own file 2014-09-30 17:29:09 +02:00
Konstantin Käfer
5d34c18c80 disable URLcache for NSURLRequests 2014-09-30 17:29:09 +02:00
Mike Morris
8ebe1bc360 add more possible errors returned by glCheckFramebufferStatusEXT 
from https://www.opengl.org/registry/specs/EXT/framebuffer_object.txt
 2014-09-29 16:33:26 -04:00
Konstantin Käfer
5c6863c540 add missing include 2014-09-29 08:10:31 -07:00
Konstantin Käfer
9e44c0eae8 add reachability 2014-09-29 14:02:42 +02:00
Konstantin Käfer
135f68e249 add retries in case of connection failures 2014-09-29 13:18:50 +02:00
Konstantin Käfer
46e06bf378 don't pass the loop through all function calls 2014-09-29 12:27:34 +02:00
Konstantin Käfer
b9628c8654 add etag support and if-none-match/if-modified-since to cocoa http handling 2014-09-26 16:10:39 +02:00
Mike Morris
8e6967669a make inactive at end of clear_buffers() 2014-09-25 18:06:55 -04:00
Mike Morris
4056259408 implement make_inactive in mapbox-gl-cocoa 2014-09-25 12:17:26 -04:00
Mike Morris
67a86d9f28 Merge branch 'libuv-0.10-fix-context-shutdown' of github.com:mapbox/mapbox-gl-native into libuv-0.10-fix-context-shutdown 2014-09-25 12:05:43 -04:00
Mike Morris
dffeaa0787 make active after resize 2014-09-24 23:03:50 -04:00
Mike Morris
11f9081274 Merge branch 'libuv010' into libuv-0.10-fix-context-shutdown 
Conflicts:
	common/headless_view.cpp
 2014-09-24 22:40:07 -04:00
Mike Morris
92d00347a8 remove travis conditional in darwin_configure.sh 2014-09-24 18:51:52 -04:00
Mike Morris
768e23069c build iPhoneSimulator64 against libuv 0.10.28 2014-09-24 17:11:18 -04:00
Mike Morris
735d245697 fix ios builds? 2014-09-24 16:40:10 -04:00
Mike Morris
86b7367994 Revert "add debugging" 
This reverts commit 0cdaf58027.
 2014-09-24 16:30:01 -04:00
Mike Morris
c9a9f23c30 Merge branch 'libuv010' into libuv-0.10-fix-context-shutdown 2014-09-24 16:10:47 -04:00
Mike Morris
47c6bb5bd4 update MP_HASH 2014-09-24 16:10:36 -04:00
Mike Morris
3dec4933a9 Merge branch 'libuv010' into libuv-0.10-fix-context-shutdown 
Conflicts:
	common/headless_view.cpp
	test/headless.cpp
 2014-09-24 15:58:52 -04:00
Mike Morris
8a19896c3a Merge branch 'master' into libuv010 2014-09-24 15:40:08 -04:00
Mike Morris
c5a7738dd6 move make_active call into MBGL_USE_CGL block 2014-09-24 15:17:42 -04:00
Mike Morris
0cdaf58027 add debugging 2014-09-24 14:40:49 -04:00
Konstantin Käfer
1209744b38 use the default cache location on ios to avoid writing to unwritable file system locations 2014-09-24 17:08:44 +02:00
Konstantin Käfer
992d9ff051 add back CURL requesting 2014-09-24 16:19:47 +02:00
Konstantin Käfer
0fc1f66868 whitespace fixes 2014-09-24 16:16:30 +02:00