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

2659 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Leith Bade
409ce196c5 chmod +x scripts 2014-12-20 17:21:37 +13:00
Leith Bade
3c968672d9 Prepare for android-gl-build 2014-12-20 17:15:55 +13:00
Leith Bade
c749d1a5ab Remove extra Travis builds 2014-12-19 15:19:10 +13:00
Leith Bade
1fb2a24c1b Make compass even smaller 2014-12-19 08:07:06 +11:00
Leith Bade
2a4b39c67f Fix path again 2014-12-19 06:05:59 +11:00
Leith Bade
2aa7fb361d Merge branch 'android-mason' of github.com:mapbox/mapbox-gl-native into android-mason 2014-12-19 06:03:45 +11:00
Leith Bade
6de470d1b4 Tidy up script 2014-12-19 06:03:22 +11:00
Justin R. Miller
8bf5cb9335 refs #725: add large source icon 2014-12-18 09:36:47 -08:00
Leith Bade
3d3887cb47 Fix path 2014-12-18 23:22:13 +11:00
Leith Bade
cd671f2e78 Try different path 2014-12-18 20:54:16 +11:00
Leith Bade
ec7474bcf0 Fix travis 2014-12-18 20:48:24 +11:00
Leith Bade
1dd3ad8e64 Fix build 2014-12-18 20:35:55 +11:00
Leith Bade
465ae587a2 Use file for access token 2014-12-18 19:29:55 +11:00
Leith Bade
62038bb344 Make compass smaller 2014-12-18 18:53:49 +11:00
Leith Bade
228f997f99 Fix for OSX BSD flavour sed 2014-12-18 18:46:22 +11:00
Leith Bade
f73eebe47c Add run to AssetRequest 2014-12-18 18:41:44 +11:00
Leith Bade
6adc0e67b3 Update android build tools on travis 2014-12-18 16:28:25 +11:00
Leith Bade
e2e36e0c7f Fix lint warning about string 2014-12-18 15:59:14 +11:00
Leith Bade
2e43fd6b8b Update SDK libs 2014-12-18 15:04:32 +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
a8dec01230 Merge pull request #723 from mapbox/overridable-file-request 
Make FileRequest overridable by platform implementations
 2014-12-17 15:12:34 +01: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
Jon Rowe
02e43c6d30 Update READMD.md for OS X Yosemite 2014-12-16 11:51:19 -08:00
Justin R. Miller
c3d2f3e664 indicate submodule setup in common header of install info 2014-12-16 11:47:29 -08:00
Mike Morris
b5ed45a6f6 Merge pull request #721 from mapbox/clear-loop 
fix CachingHTTPFileSource::clearLoop
 2014-12-15 15:12:48 -05:00
Mike Morris
3a8036413f fix CachingHTTPFileSource::clearLoop 2014-12-15 14:32:48 -05:00
Leith Bade
6f56e88ee5 Stop services only on Linux 2014-12-12 10:36:54 +11:00
Leith Bade
3c021085a1 jq is now installed by default 2014-12-12 10:25:18 +11:00
Leith Bade
30c80af0d2 Fix bash error 2014-12-12 09:59:27 +11:00
Leith Bade
80016cd469 Don't need X for android builds 2014-12-12 09:49:06 +11:00
Mike Morris
76909d18fb log headless test fixture names 2014-12-11 16:37:48 -05:00
John Firebaugh
8f380af381 More explict Android OSX instructions 2014-12-10 14:16:51 -08:00
Leith Bade
87ef90b896 Use libnu 1.5.1 2014-12-11 07:24:20 +11:00
Leith Bade
911da56ea6 Fix service name 2014-12-11 00:19:34 +11:00
Leith Bade
df2ebadaa3 Add missing CHECK_ERROR 2014-12-11 00:14:46 +11: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
0c62cd0655 Merge pull request #711 from mapbox/check-gl-error 
Use CHECK_ERROR on every GL call
 2014-12-10 13:55:39 +01:00
Konstantin Käfer
4ad28c931a only report STACK_OVERFLOW/STACK_UNDERFLOW when the GL implementation has them 2014-12-10 13:46:26 +01:00
Konstantin Käfer
93d56294cf update error reporting function 2014-12-10 13:21:08 +01:00
Leith Bade
127600ef8c Fix unused param 2014-12-10 22:23:53 +11:00
Leith Bade
08b07c30a7 Reduce GL log spew 2014-12-10 22:15:41 +11: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
c38bd5e403 Merge branch 'android-mason' of github.com:mapbox/mapbox-gl-native into android-mason 2014-12-10 19:14:12 +11:00
Leith Bade
2db8134d20 Add Android user-agent info 2014-12-10 19:14:05 +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
Leith Bade
e6c8365767 Stop DB services 2014-12-10 09:46:28 +11:00
Mike Morris
392150dd48 Merge pull request #707 from mapbox/start-group 
wrap mbgl-core and mbgl-linux in -Wl,--start-group/-Wl,--end-group
 2014-12-09 12:11:12 -05:00