Konstantin Käfer
|
46e754f806
|
change directory, as the other won't make xcode update the files
[skip ci]
|
2014-08-12 16:30:58 +02:00 |
|
Konstantin Käfer
|
7f968f52e6
|
Merge pull request #370 from mapbox/style-parser-test
Malformed stylesheet tests
|
2014-08-12 14:19:05 +02:00 |
|
Konstantin Käfer
|
df47a7be90
|
explicitly define destructor to avoid destructing with forward declaration
|
2014-08-12 13:35:04 +02:00 |
|
Konstantin Käfer
|
52939ce2fa
|
pass absolute path to npm executable
|
2014-08-12 13:29:26 +02:00 |
|
Konstantin Käfer
|
9b9ad20a90
|
Merge branch 'master' into style-parser-test
Conflicts:
mapboxgl.gyp
|
2014-08-12 13:16:20 +02:00 |
|
Konstantin Käfer
|
bdfc1036d3
|
Merge branch 'no-uv-headers'
|
2014-08-12 13:05:20 +02:00 |
|
Konstantin Käfer
|
d7ff2e09ff
|
Merge branch 'master' of https://github.com/mapbox/mapbox-gl-native
Conflicts:
mapboxgl.gyp
|
2014-08-12 13:05:08 +02:00 |
|
Konstantin Käfer
|
000831ad5a
|
bump cocoa bindings
|
2014-08-12 13:01:03 +02:00 |
|
Konstantin Käfer
|
ecedce7994
|
Merge pull request #410 from mapbox/no-uv-headers
remove header dependency on uv.h
|
2014-08-12 12:48:45 +02:00 |
|
Konstantin Käfer
|
49df931935
|
bump cocoa dependency
|
2014-08-12 12:36:12 +02:00 |
|
Konstantin Käfer
|
fd8280eb51
|
include correct uv header in test fixture
|
2014-08-12 12:26:07 +02:00 |
|
Konstantin Käfer
|
367b35998d
|
fix gyp builds
|
2014-08-12 12:26:00 +02:00 |
|
Konstantin Käfer
|
919947e6c7
|
remove uv.h dependency in darwin-specific code
|
2014-08-12 11:54:11 +02:00 |
|
Konstantin Käfer
|
d7058eb0df
|
make output empty
|
2014-08-12 11:46:34 +02:00 |
|
Konstantin Käfer
|
6f80264291
|
remove uv.h dependency from header files
|
2014-08-12 11:45:30 +02:00 |
|
Mike Morris
|
fae1c157f6
|
build fixes
|
2014-08-11 13:24:25 -04:00 |
|
Mike Morris
|
702c74fbd9
|
Revert "dont exit early from npm_install.sh"
This reverts commit 935089c239.
|
2014-08-11 12:44:37 -04:00 |
|
Mike Morris
|
851d8251c1
|
pass --clang=1 to npm install, per https://github.com/mapbox/mapbox-gl-native/pull/364#issuecomment-51735692
|
2014-08-11 12:44:26 -04:00 |
|
Mike Morris
|
a79afb78d8
|
Merge branch 'master' into style-parser-test
Conflicts:
bin/build-style.js
bin/default.style.json
mapboxgl.gyp
src/style/style_parser.cpp
test/test.gyp
|
2014-08-11 12:42:49 -04:00 |
|
Konstantin Käfer
|
e4c311a864
|
remove uv.h dependency in util/time.hpp
|
2014-08-11 17:41:08 +02:00 |
|
Konstantin Käfer
|
7a98ad4cf9
|
Merge pull request #407 from mapbox/filesource
Use style.json directory as base path for loading sprite images
|
2014-08-11 16:57:33 +02:00 |
|
Konstantin Käfer
|
225b5e01cb
|
don't automatically move back to main thread
|
2014-08-11 07:41:52 -07:00 |
|
Konstantin Käfer
|
eef51a8679
|
fix test gyp file
|
2014-08-11 13:00:15 +02:00 |
|
Konstantin Käfer
|
be15af7e04
|
consolidate into one line
|
2014-08-11 12:17:27 +02:00 |
|
Konstantin Käfer
|
bff4f4b334
|
skip null byte
|
2014-08-11 12:15:42 +02:00 |
|
Justin R. Miller
|
e39ae931b9
|
Merge branch 'master' of github.com:mapbox/mapbox-gl-native
|
2014-08-08 12:29:56 -07:00 |
|
John Firebaugh
|
d53bc57f50
|
Support dashes in tokens
https://github.com/mapbox/mapbox-gl-js/issues/678
|
2014-08-08 11:17:07 -07:00 |
|
Konstantin Käfer
|
4657e6e023
|
use a file source object to abstract loading of resources
|
2014-08-08 18:25:45 +02:00 |
|
Konstantin Käfer
|
a045d9c9d4
|
use filesource object for loading all http stuff
|
2014-08-08 15:08:41 +02:00 |
|
John Firebaugh
|
70a31baf5c
|
Eliminate warnings
|
2014-08-07 13:02:40 -07:00 |
|
Justin R. Miller
|
73db681d1e
|
redo of 2397019347
|
2014-08-06 15:53:37 -07:00 |
|
Konstantin Käfer
|
6dc3911949
|
Merge pull request #403 from mapbox/symbols
Symbols
|
2014-08-06 18:52:00 +02:00 |
|
Konstantin Käfer
|
9dc48b773f
|
fix crash bug for styles that have no glyph url specified
|
2014-08-06 18:33:21 +02:00 |
|
Konstantin Käfer
|
915e89bee8
|
Merge branch 'master' into symbols
Conflicts:
src/renderer/painter_text.cpp
|
2014-08-06 15:32:48 +02:00 |
|
Konstantin Käfer
|
02526f49f2
|
use debug style (currently not using layer compositing)
|
2014-08-06 15:26:37 +02:00 |
|
Konstantin Käfer
|
1f992b1de8
|
fix icons on retina screens
|
2014-08-06 14:54:37 +02:00 |
|
Konstantin Käfer
|
3043b5608f
|
fix black border around icon
|
2014-08-06 14:35:57 +02:00 |
|
Konstantin Käfer
|
b281313266
|
use linear interpolation for icons placed along a line
|
2014-08-06 14:34:14 +02:00 |
|
Konstantin Käfer
|
5781d12ff1
|
linearly interpolate rotated icons
|
2014-08-06 12:38:57 +02:00 |
|
Konstantin Käfer
|
625ad1efe2
|
fix icon rendering
|
2014-08-06 12:36:19 +02:00 |
|
Ansis Brammanis
|
3ec51f5a5a
|
Merge pull request #402 from mapbox/line-blur
implement `line-blur` and fix retina antialiasing
|
2014-08-05 15:27:41 -07:00 |
|
Ansis Brammanis
|
4220bfcb6c
|
implement line-blur and fix retina antialiasing
|
2014-08-05 14:17:00 -07:00 |
|
Konstantin Käfer
|
8cd6a99716
|
convert offset to em
|
2014-08-05 17:37:13 +02:00 |
|
Konstantin Käfer
|
7d44da82ec
|
allow moving to map positions with mapboxgl://?center=[lat],[lon]&zoom=[z]&bearing=[b]
|
2014-08-05 17:13:48 +02:00 |
|
Konstantin Käfer
|
898c5dc7c3
|
port text alignment algorithm
|
2014-08-05 16:18:23 +02:00 |
|
Konstantin Käfer
|
05b95ab057
|
show zom/lat/lon/bearing in window title
|
2014-08-05 15:28:46 +02:00 |
|
Konstantin Käfer
|
af4ecc6260
|
we account differently for the ascender already
|
2014-08-05 15:08:26 +02:00 |
|
Konstantin Käfer
|
a790e080a5
|
include <array>
|
2014-08-05 15:03:01 +02:00 |
|
Konstantin Käfer
|
5ebb23521f
|
change gamma back to old value
|
2014-08-05 14:57:40 +02:00 |
|
Konstantin Käfer
|
23ceaf7d66
|
code style fixes
|
2014-08-05 14:54:31 +02:00 |
|