Commit Graph

2833 Commits

Author SHA1 Message Date
Leith Bade
2e596151e4 Merge pull request #787 from mapbox/update-mason
Update Android ABIs
2015-01-29 10:13:26 +11:00
Leith Bade
61113bf343 Update android ABIs 2015-01-29 00:52:37 +13:00
Ansis Brammanis
793985580d fix sprite atlas padding and icon centering
Pad each icon with one pixel on the bottom and right sides.

On top of this, extra padding is added to round the widths and heights
to multiples of four.

This then fixes the positions of the bottom and right vertices to
correctly center the icon's box around the center of the icon, not the
center of the padded icon.

js: 32ca4007699d1d21ab25bb38588b151510194030

fixes https://github.com/mapbox/mapbox-gl-js/issues/947
2015-01-27 19:15:22 -08:00
Leith Bade
5aefe40bf9 Fix Android lint errors 2015-01-28 12:18:58 +11:00
Leith Bade
b51c80822a Add missing xxxhdpi icon 2015-01-28 12:18:43 +11:00
Leith Bade
f65a74bbeb Remove excess semicolon in jni.hpp 2015-01-28 11:17:43 +11:00
Konstantin Käfer
9d3e60eb6c explain OS X setup process in more detail 2015-01-27 17:33:47 +01:00
Leith Bade
6262929f75 Merge pull request #778 from mapbox/remove-prog-bin
Remove program binary caching
2015-01-27 12:50:27 +11:00
Justin R. Miller
1ec80d7da0 typo fix + mobile instruction clarification 2015-01-26 17:46:54 -08:00
Leith Bade
aaedd9c83b Remove program binary caching 2015-01-27 12:38:40 +11:00
Leith Bade
a8f86d47f6 Merge pull request #777 from mapbox/android-v7
Switch to v7 on Android
2015-01-27 12:03:24 +11:00
Leith Bade
baa4b54d0e Switch to v7 on Android 2015-01-27 11:45:53 +11:00
Leith Bade
679085b4d9 Merge pull request #775 from mapbox/token-check
Don't create token.txt if it already exists
2015-01-27 11:24:56 +11:00
Leith Bade
7f41d476c1 Don't create token.txt if it already exists 2015-01-27 11:13:00 +11:00
Leith Bade
8193acdf30 Merge pull request #676 from mapbox/android-mason
Android GL mega-merge
2015-01-27 07:23:43 +11:00
Ansis Brammanis
60035d7728 Merge branch 'no-crossfade'
Conflicts:
	src/mbgl/renderer/painter_line.cpp
2015-01-26 12:19:40 -08:00
Leith Bade
fb525cde39 Fix travis script 2015-01-27 08:48:36 +13:00
Leith Bade
498acc3e7b Change all echo back to mapbox_time 2015-01-27 08:38:06 +13:00
Leith Bade
8c02249324 Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason 2015-01-27 08:28:51 +13:00
Leith Bade
8ed3d3eb50 Change back to mapbox_time 2015-01-27 08:28:23 +13:00
John Firebaugh
7694b0c1ec Merge pull request #771 from mapbox/visibility
Add visibility property for v7
2015-01-26 11:09:16 -08:00
Ansis Brammanis
8f620bed8a reduce gamma for dashes to make them sharper
because the shader uses the range [0.5 - gamma, 0.5 + gamma] gamma
should be half the distance you want to blur, not the full distance.

js: 35b42808922506a6039b8bfd3dc10098692c1268
2015-01-23 19:56:26 -05:00
Ansis Brammanis
5955ac3493 transition dashes when resetting their stretch
Dash patterns stretch from one integer zoom until the
next integer zoom where they reset. This transitions
those resets.

js: be5c7184bfd8cc9d47299041eb7fadbd41f6f6f0
2015-01-23 17:25:31 -05:00
Ansis Brammanis
d0d33a3ee7 don't permanently crossfade line patterns
js: a2e8527b4023d19fa0c58130a105aaf283f4b152
2015-01-23 17:12:41 -05:00
Ansis Brammanis
c5d5a799be Don't permanently crossfade fill patterns.
js: 00e11591106dae7eb02eff0328364d8ec03fdaa5
2015-01-23 17:05:30 -05:00
Leith Bade
3bf9efd95a Throw error on missing token 2015-01-24 07:25:02 +11:00
Leith Bade
2f1192d45b Merge branch 'android-mason' of github.com:mapbox/mapbox-gl-native into android-mason 2015-01-24 07:05:58 +11:00
Leith Bade
10db72f322 Create raw dir in gradle 2015-01-24 07:05:32 +11:00
Justin R. Miller
60257099dd update Android install docs for NDK r10d 2015-01-23 11:58:54 -08:00
Lauren Budorick
66355b7d86 Add visibility property for v7. 2015-01-22 17:11:07 -08:00
Leith Bade
42d1972732 Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason
Conflicts:
	src/mbgl/renderer/painter_prerender.cpp
	src/mbgl/renderer/prerendered_texture.cpp
	src/mbgl/renderer/prerendered_texture.hpp
2015-01-23 11:11:04 +11:00
John Firebaugh
0c2ffc251c Revert "scale dashes by line-gap-width if present"
This reverts commit 4791bac675.
2015-01-22 14:05:49 -08:00
John Firebaugh
a8b6e3dc71 Merge remote-tracking branch 'origin/dash-3' into v7 2015-01-22 13:06:30 -08:00
John Firebaugh
9495b686e7 Use v7 styles / tests 2015-01-22 12:00:26 -08:00
Leith Bade
5234cd9f79 Remove config changes 2015-01-23 00:29:43 +11:00
Leith Bade
d2105a1855 Fix terminate crash 2015-01-23 00:26:29 +11:00
Leith Bade
95e653982d Throw on egl errors 2015-01-22 23:47:09 +11:00
Leith Bade
6ae8249ede Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason 2015-01-22 21:34:11 +11:00
John Firebaugh
8e23e3a3e8 Remove support for prerendered layers
https://github.com/mapbox/mapbox-gl-style-spec/issues/232
2015-01-21 18:41:17 -08:00
Mike Morris
b6ef236d85 Merge pull request #768 from mapbox/clear-sqlite-cache
Clear sqlite cache
2015-01-21 15:56:48 -05:00
Mike Morris
ad7f68e386 simplify clear_sqlite_cache 2015-01-21 15:16:52 -05:00
Mike Morris
c18089b6d7 syntax fixes 2015-01-21 14:35:59 -05:00
Mike Morris
bee9ada450 clear sqlite cache 2015-01-21 14:29:41 -05:00
Mike Morris
161e187c6f only run clear_xcode_cache on OS X 2015-01-21 14:08:52 -05:00
Mike Morris
fc7c6d951d Merge pull request #767 from mapbox/readme-imagemagick
Add imagemagic to OSX README brew command
2015-01-21 11:17:35 -05:00
Leith Bade
acda1fcde8 Add imagemagic to OSX README brew command 2015-01-21 12:59:44 +11:00
Leith Bade
fe2dae7af1 Use LOST for GPS 2015-01-21 12:06:11 +11:00
Leith Bade
5feba9ac07 get/setAppliedStyleClasses -> get/setClasses 2015-01-18 17:05:01 +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
Ansis Brammanis
4791bac675 scale dashes by line-gap-width if present
https://github.com/mapbox/mapbox-gl-js/pull/860#issuecomment-68788411

js: a5fb9f9fb5c7ea056b6ec228e0b398815cc0d356
2015-01-16 16:29:58 -05:00