Ansis Brammanis
2643a0efc7
start porting dash lines from js
...
- switches to dash units that are scaled by line width
- adds a lineatlas to store patterns line dashed lines
- adds linesdf shader which renders line fill from the lineatlas
js: 8e83d76af3bd877eb9639c02e296363e2c0186f8
2015-01-14 20:56:18 -05:00
John Firebaugh
d24b73b1a6
Move class state to map
...
https://github.com/mapbox/mapbox-gl-js/pull/936
2015-01-14 17:43:44 -08:00
Leith Bade
b7cc6bfaa6
Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason
...
Conflicts:
src/mbgl/shader/shader.cpp
2015-01-15 11:39:50 +11:00
John Firebaugh
c6ca57045f
Merge pull request #744 from mapbox/merge-roads
...
merge adjacent roads with the same text for labeling
2015-01-14 10:12:45 -08:00
Mike Morris
6260643924
Merge pull request #743 from mapbox/sqlite-3.8.6
...
SQLite 3.8.6
2015-01-14 12:25:22 -05:00
Leith Bade
ddbfcada27
Add pause to wait for slow AWS
2015-01-14 22:39:17 +11:00
Ansis Brammanis
4fbb7d614c
port tests for mergeLines
...
js: 867b7f4be01126663df609756049515a41e700d1
2015-01-13 22:29:28 -05:00
Ansis Brammanis
b54c0e2447
simplify erase
...
so you don't have to think about whether find might return an end()
iterator (which is invalid for erase).
2015-01-13 22:26:37 -05:00
Leith Bade
f76bd8a6f4
Merge pull request #745 from mapbox/fix-binary-shader
...
Check for IO errors when loading binary shader
2015-01-14 12:19:32 +11:00
Leith Bade
8cca0a27ba
Check for IO errors when loading binary shader. Fixes #740
2015-01-14 10:35:33 +13:00
Mike Morris
1b2f38d330
pass sqlite3_static_libs in install.gypi
2015-01-13 14:31:50 -05:00
Mike Morris
0d1764c43e
sqlite3_static_libs on linux
2015-01-13 14:31:50 -05:00
Mike Morris
f1609ef329
include sqlite3_static_libs in linker flags
2015-01-13 14:31:50 -05:00
Mike Morris
139c0c6da6
build against mason sqlite 3.8.6
2015-01-13 14:31:50 -05:00
Mike Morris
5eb838d3f4
Merge pull request #752 from mapbox/copy-version
...
break out version.hpp copy task into a separate gyp target
2015-01-13 14:26:41 -05:00
Mike Morris
fa0d20194e
break out version.hpp copy task into a separate gyp target to eliminate a possible race condition in parallel builds
2015-01-13 14:15:48 -05:00
Mike Morris
7c88ad9a00
Merge pull request #751 from mapbox/clear-xcode-cache
...
Fix xcode_clear_cache
2015-01-13 13:35:30 -05:00
Mike Morris
4533dcaf34
fix hard tabs in Makefile so clear_xcode_cache task actually runs, remove cache.db in Application Support if it exists
2015-01-13 12:49:41 -05:00
Leith Bade
65e6990582
Grab access token from environment
2015-01-13 21:14:44 +11:00
Leith Bade
d29fe6fe92
Remove binary shader caching on Android since OS already does this
2015-01-13 20:42:48 +11:00
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
