Commit Graph

2706 Commits

Author SHA1 Message Date
Leith Bade
646742e256 Handle pull requests better 2014-12-28 22:18:03 +13:00
Leith Bade
a66846ab00 Update styles for new outdoors 2014-12-28 21:49:42 +13:00
Leith Bade
98ea7366f3 Use two cores for gradle 2014-12-26 19:53:36 +13:00
Leith Bade
4f84082660 Use two cores 2014-12-26 19:45:40 +13:00
Leith Bade
9396cb6559 Production AMI and fix s3 perms in role 2014-12-26 18:37:58 +13:00
Leith Bade
06fdecfc2f Change to bucket in production 2014-12-26 18:18:56 +13:00
Leith Bade
c852a9c2a4 Add pass role perm 2014-12-26 14:02:37 +13:00
Leith Bade
62d7bab59d Update travis stack 2014-12-26 13:30:21 +13:00
Leith Bade
a9061120ce Add EC2 permissions 2014-12-26 11:32:56 +13:00
Leith Bade
7760d7f5ae Fix typo 2014-12-26 11:18:17 +13:00
Leith Bade
a3ba85b1c3 Fix bash syntax 2014-12-26 11:15:51 +13:00
Leith Bade
7f086b4989 Don't configure on Android 2014-12-26 11:12:14 +13:00
Leith Bade
2ad74d5fb0 Move android build to ec2 2014-12-26 11:08:11 +13:00
Leith Bade
f2af329f2f Add script for ec2 build system 2014-12-26 08:01:35 +13:00
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