Ansis Brammanis
|
99c5976498
|
port minor collision code cleanup, fix #1705
https://github.com/mapbox/mapbox-gl-js/pull/1261
|
2015-08-24 18:41:51 -04:00 |
|
Ansis Brammanis
|
93fc67ba55
|
re-add sprite atlas pollution fix
It got missed in a merge.
03d5e2da80
|
2015-06-02 11:33:03 -04:00 |
|
Ansis Brammanis
|
fd19eb7905
|
fix shaped icon box sizes
|
2015-05-28 19:17:07 -04:00 |
|
Ansis Brammanis
|
7abd7950c9
|
Merge branch 'master' into new-labelling
Conflicts:
src/mbgl/map/tile_parser.cpp
src/mbgl/map/tile_parser.hpp
src/mbgl/renderer/painter.hpp
src/mbgl/renderer/painter_symbol.cpp
src/mbgl/renderer/symbol_bucket.cpp
src/mbgl/renderer/symbol_bucket.hpp
src/mbgl/text/collision.cpp
src/mbgl/text/collision.hpp
src/mbgl/text/placement.cpp
|
2015-05-19 11:09:33 -04:00 |
|
Ansis Brammanis
|
7ac01660d7
|
port line icon angle fix
-js: 37a498a7aa2c37d6b94611b614b4efe134e6dd59
|
2015-04-09 12:17:43 -07:00 |
|
Ansis Brammanis
|
68ae21d8f4
|
fix android and Release builds
|
2015-04-02 13:33:50 -07:00 |
|
Ansis Brammanis
|
02d2ddef52
|
fix quad offsets by subtracting buffer
-js doesn't have this here because it subtracts the buffer earlier.
617e590c83/js/symbol/glyph_source.js (L75)
We should match -js eventually.
|
2015-04-02 12:39:30 -07:00 |
|
Ansis Brammanis
|
7b02800ad9
|
remove old symbol collision types
|
2015-04-02 12:16:42 -07:00 |
|
Ansis Brammanis
|
9309f59de3
|
split generating symbol quads from collision code
Collision prevention is temporarily disabled.
|
2015-03-31 15:33:57 -07:00 |
|