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

2692 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Leith Bade
46dc5e0700 Remove error 2014-12-26 08:00:47 +13:00
Leith Bade
c24b8355c5 Add error for testing new build system 2014-12-25 20:34:16 +13:00
Leith Bade
8f9da32ea2 Disable s2 upload 2014-12-25 18:27:03 +13:00
Leith Bade
3aaf1f26f3 Missed rename 2014-12-25 18:10:16 +13:00
Leith Bade
b93145afec Tidy up a few missed things in shader.cpp 2014-12-24 08:12:20 +13:00
Leith Bade
ae9fb18a8d Rename View functions 2014-12-23 11:34:27 +13: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
John Firebaugh
7eaa4fabde Merge pull request #731 from mapbox/view-rename 
Rename View functions to match conventions
 2014-12-22 13:14:44 -08: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
b5483d3e81 Remove C style casts 2014-12-22 19:42:18 +13:00
Leith Bade
2a71d54fca Add missing GL extensions 2014-12-22 16:56:20 +13:00
Leith Bade
610c112d0a Enable more lint checks 2014-12-22 16:18:38 +13:00
Leith Bade
0a031e1ab0 Remove unused member 2014-12-21 23:46:50 +13:00
Leith Bade
9ce00420a3 Fix lint warning 2014-12-21 15:14:08 +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
38e2f98314 Upload to S3 2014-12-20 19:27:44 +13:00
Leith Bade
42ebe44214 Use access key 2014-12-20 18:37:50 +13:00
Leith Bade
a2cfb944e7 Fix path to build scripts 2014-12-20 17:26:28 +13:00
Leith Bade
c3df03fcc8 Rename build scripts 2014-12-20 17:24:34 +13:00
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
2731b582f2 Merge pull request #729 from mapbox/shader-iostream 
Use iostream for saving GL program binary + check GL_NUM_PROGRAM_BINARY_FORMATS  > 0
 2014-12-20 15:15:43 +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
Leith Bade
c749d1a5ab Remove extra Travis builds 2014-12-19 15:19:10 +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
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
Konstantin Käfer
e57c57516f automatically copy the certificate bundle 2014-12-16 12:17:40 +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