Commit Graph

5798 Commits

Author SHA1 Message Date
Leith Bade
1daf2207aa Remove coffeecatch 2015-01-13 20:31:24 +11: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
aa955171d7 remove extra line 2015-01-13 19:48:00 +11:00
Leith Bade
f20a17a291 Merge pull request #748 from mapbox/fix-swap
Correctly handle swapping
2015-01-13 09:23:28 +11:00
John Firebaugh
bac75f1c7a Allow characters outside \w to be used in token
https://github.com/mapbox/mapbox-gl-js/pull/926
2015-01-12 10:17:01 -08:00
John Firebaugh
ab7122831a Merge pull request #747 from mapbox/fix-resize
Correctly call resize with width and height
2015-01-12 10:15:31 -08:00
Ansis Brammanis
5670fb397f get rid of separate vector for symbol geometries 2015-01-12 12:33:24 -05: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
Ansis Brammanis
e4858b6a02 merge adjacent roads with same text for labelling
js: https://github.com/mapbox/mapbox-gl-js/pull/683
2015-01-08 23:44:11 -05:00
Leith Bade
f6da4bb28a Add Android to list in README 2015-01-09 14:43:19 +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
Leith Bade
3127301976 Restore deleted icons 2015-01-09 09:30:24 +11:00
Leith Bade
d6efa1e949 Update gradle version 2015-01-09 09:28:32 +11:00
Ansis Brammanis
166a3e21fa rephrase line uniform calculations to match js
js: 359a576471e20373333cae80a5eccda95ee4cdc2
2015-01-08 14:40:19 -05:00
Ansis Brammanis
59b51f0a9f fix fill pattern spacing
js: 22e24f7f67c4db89d09c0b65df67d0fcf1c3b614
2015-01-08 14:00:06 -05:00
John Firebaugh
c32f7dfa88 Merge branch 'master' into shader-performance 2015-01-07 15:15:11 -08:00
Leith Bade
1d0aba8196 Remove burned icons 2015-01-06 02:56:55 +13:00
Leith Bade
8e657bc485 Handle tags with leading non-numeric chars 2015-01-06 02:54:01 +13:00
Leith Bade
ff87965f92 Bump version 2015-01-05 13:03:52 +13:00
Leith Bade
433a94ab02 Fix find argument order 2015-01-05 12:57:38 +13:00
Leith Bade
097650b7db Don't change path 2015-01-05 12:55:39 +13:00
Leith Bade
3ac8111994 Change update_icons.sh to bash 2015-01-05 12:50:07 +13:00
Leith Bade
8eceb082ba Add failsafe to program binary loading 2015-01-05 12:28:32 +13:00
Leith Bade
ff6492e5a3 Remove old cd 2015-01-02 14:22:11 +13:00
Leith Bade
b35b6e359e Change to ami with jq 2015-01-02 14:01:58 +13:00
Leith Bade
32b7f2898c Need to forward testmunk key 2015-01-02 13:17:56 +13:00
Leith Bade
b7ba35f95b Fix android test path 2015-01-02 12:33:14 +13:00
Leith Bade
58c7c770a7 New AMI with zip installed 2015-01-02 12:10:08 +13:00
Leith Bade
6f4cfba8e0 Fix script typo 2015-01-02 11:10:58 +13:00
Leith Bade
e6b8c4c047 Clang-format on Android code 2015-01-02 10:14:00 +13:00
Leith Bade
937d8ef8d6 Use testmunk from EC2 2015-01-02 09:56:55 +13:00
Leith Bade
e7db2ecd9a Improve build instructions 2015-01-02 09:47:14 +13:00
Leith Bade
edd8be54e5 Handle JOBS not being set 2014-12-31 08:06:41 +13:00
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