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

150 Commits

Author SHA1 Message Date
Konstantin Käfer
d16974264c update uv_zip 2015-02-17 11:42:55 -08:00
Konstantin Käfer
8f32c8ae7a wrong symbol name 2015-02-17 11:42:55 -08:00
Konstantin Käfer
b29bce0936 add ca bundle loading back to CURL 2015-02-17 11:42:47 -08:00
Konstantin Käfer
fe0baffe0d update uv_zip and add tests 2015-02-16 18:30:19 -08:00
Konstantin Käfer
8d3c2b3d30 add libzip fix 2015-02-16 11:47:53 -08:00
Mike Morris
e8a2c39365 forward declare GLX typedefs to limit conflicts from glx.h 2015-02-10 13:38:45 -08:00
Konstantin Käfer
3da75dd706 guard boost include with pragma ignores 2015-02-04 11:54:01 +01:00
Konstantin Käfer
29baacf3a5 refactor makefile 2015-02-04 10:49:09 +01:00
Konstantin Käfer
12341ce0ee add missing headers 2015-02-04 10:49:08 +01:00
Konstantin Käfer
272fa8935e make storage lib separate so we can build without storage libs 2015-02-04 10:49:07 +01:00
Konstantin Käfer
6f349a796c execute the correct server path and use the exepath for application root rather than the cwd 2015-02-04 10:49:07 +01:00
Konstantin Käfer
9a549094e0 make ios compile 2015-02-04 10:49:06 +01:00
Konstantin Käfer
92a7f73bbe fixes for linux 2015-02-04 10:49:06 +01:00
Konstantin Käfer
b9bf66e67e rewrite storage layer to be independent of the Map's event loop 2015-02-04 10:46:37 +01:00
Leith Bade
89bbd29278 Use std::chrono 2015-02-04 09:39:25 +11:00
Leith Bade
aaedd9c83b Remove program binary caching 2015-01-27 12:38:40 +11:00
Leith Bade
016c2948c5 Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason 
Conflicts:
	src/mbgl/map/map.cpp
 2015-01-18 16:33:39 +11:00
Leith Bade
d950e986b7 Merge pull request #757 from mapbox/move-terminate 
Move terminate() call to GLFWView to avoid problems with node
 2015-01-16 10:16:30 +11:00
Leith Bade
5e44256fe8 Move terminate() call to GLFWView to avoid problems with node 2015-01-16 09:50:05 +11:00
John Firebaugh
d24b73b1a6 Move class state to map 
https://github.com/mapbox/mapbox-gl-js/pull/936
 2015-01-14 17:43:44 -08:00
Leith Bade
7cce089d78 Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason 2015-01-13 19:48:26 +11:00
Leith Bade
f20a17a291 Merge pull request #748 from mapbox/fix-swap 
Correctly handle swapping
 2015-01-13 09:23:28 +11:00
Leith Bade
f05a530529 Correctly handle swapping. Fixes #666 2015-01-12 13:50:00 +11:00
Leith Bade
6aee86d5ff Correctly call resize with width and height. Fixes #746 2015-01-12 13:30:40 +11:00
Leith Bade
5ed8d4544f Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason 2015-01-09 09:30:52 +11:00
John Firebaugh
c32f7dfa88 Merge branch 'master' into shader-performance 2015-01-07 15:15:11 -08:00
Leith Bade
ff3ea3e20b Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason 
Conflicts:
	platform/default/glfw_view.cpp
	platform/default/headless_view.cpp
	src/mbgl/map/map.cpp
 2014-12-23 11:33:26 +13:00
Leith Bade
0771e50460 Rename View functions to match conventions. Also tidy up view classes and remove C style casts. Closes #656 2014-12-23 09:29:45 +13:00
Leith Bade
df19683b6a Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason 
Conflicts:
	Makefile
	platform/default/headless_view.cpp
	src/mbgl/map/map.cpp
 2014-12-21 15:02:47 +13:00
Leith Bade
15b47197a7 Use iostream for saving GL program binary. Also check for GL_NUM_PROGRAM_BINARY_FORMATS > 0. 2014-12-20 15:08:06 +13:00
John Firebaugh
4a2cf4aa62 Merge pull request #718 from mapbox/cli-render 
CLI render
 2014-12-18 18:00:33 -08:00
Leith Bade
1dd3ad8e64 Fix build 2014-12-18 20:35:55 +11:00
Leith Bade
f73eebe47c Add run to AssetRequest 2014-12-18 18:41:44 +11:00
Leith Bade
40f859e482 Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason 
Conflicts:
	gyp/mbgl-ios.gypi
	gyp/mbgl-osx.gypi
	platform/default/asset_request_libuv.cpp
	src/mbgl/storage/caching_http_file_source.cpp
	src/mbgl/storage/file_request.cpp
	src/mbgl/storage/file_request.hpp
	src/mbgl/storage/file_request_baton.hpp
 2014-12-18 12:39:36 +11:00
Konstantin Käfer
abcf978174 change comment and cache value 2014-12-17 15:01:15 +01:00
Konstantin Käfer
b5e9998b15 change file:// to asset:// to indicate that they aren't arbitrary files 
refs #579
 2014-12-17 14:59:05 +01:00
Konstantin Käfer
936e096514 Make file request overridable by platform implementations 
refs #579: Android can now rename AssetRequest to FileRequest and implement it differently
 2014-12-17 12:14:32 +01:00
Konstantin Käfer
40a5bcd7d3 never create core profile contexts; their API is subtly different 
(e.g. glGetString(GL_EXTENSIONS) doesn't work, you'd have to use glGetStringi(GL_EXTENSIONS, ...);)
 2014-12-16 11:10:41 +00:00
Konstantin Käfer
9082a83d6a don't assing nullptr to std::string 2014-12-16 11:42:58 +01:00
Konstantin Käfer
abf702046b use correct enum 2014-12-12 12:37:55 +01:00
Leith Bade
d599fc5504 Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason 
Conflicts:
	platform/default/glfw_view.cpp
	platform/default/headless_view.cpp
	src/mbgl/renderer/painter.cpp
	src/mbgl/renderer/prerendered_texture.cpp
 2014-12-11 00:09:26 +11:00
Konstantin Käfer
93d56294cf update error reporting function 2014-12-10 13:21:08 +01:00
Leith Bade
0808485453 Use CHECK_ERROR on every GL call 2014-12-10 21:57:34 +11:00
Leith Bade
6bb1a5a146 Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason 
Conflicts:
	include/mbgl/platform/default/headless_view.hpp
	platform/default/glfw_view.cpp
	platform/default/headless_view.cpp
 2014-12-10 19:22:25 +11:00
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
Konstantin Käfer
5ccc988ff7 fix typo 2014-12-09 14:55:32 +01:00
Leith Bade
d2792e2987 Tidy up HeadlessView 2014-12-09 21:47:30 +11: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
1f91be988b add user agent header 
fixes #628
 2014-12-08 11:04:08 +01:00
Leith Bade
886b622a92 Add pakced depth stencil to GLFWView and HeadlessView 2014-12-07 00:40:44 +11:00