Konstantin Käfer
066fa64dad
make icons work again
2014-07-15 17:17:37 -07:00
Konstantin Käfer
c2efeaf876
do not reallocate the texture data on every update; use glTexSubImage2D instead
2014-07-15 17:01:00 -07:00
Mike Morris
056f9e88d5
noncopyable log
2014-07-15 17:12:37 -04:00
Mike Morris
a2336cf7ad
Merge branch 'master' into fuzz-pipe
2014-07-15 17:06:35 -04:00
Konstantin Käfer
5459d80d47
disallow copying to avoid accidental unchecked message output
2014-07-15 13:31:55 -07:00
Mike Morris
9437d0d7cc
check log messages from style_parser
2014-07-15 16:16:52 -04:00
Justin R. Miller
cdda9f12b5
flesh out 'will change region' notifications
2014-07-15 12:52:19 -07:00
Mike Morris
fb91537466
print unchecked log messages
2014-07-15 14:01:08 -04:00
Mike Morris
973a2f5550
fix quotes in log output
2014-07-15 14:00:38 -04:00
Mike Morris
c29883bb54
why u no write to FixtureLogBackend?
2014-07-15 11:42:34 -04:00
Mike Morris
d1977dc53f
Merge branch 'master' into fuzz-pipe
...
Conflicts:
test/test.gyp
2014-07-15 11:16:54 -04:00
Konstantin Käfer
471dafc1d1
change halo-width/blur units
...
refs mapbox/mapbox-gl-style-spec#66
2014-07-14 18:25:07 -07:00
Konstantin Käfer
9213f8d8e0
fix font halo units
2014-07-14 17:35:47 -07:00
Konstantin Käfer
22ed777a82
make gcc happy
2014-07-14 16:44:40 -07:00
Konstantin Käfer
ba7d8c7731
fix errors
2014-07-14 16:38:34 -07:00
Konstantin Käfer
bdc97d55d2
add enum class to unify parsing/stringification
2014-07-14 16:33:02 -07:00
Mike Morris
b327a2cb34
hook up style_parser to new log backend
2014-07-14 18:46:34 -04:00
Konstantin Käfer
37bb2ff048
don't force Testing build on linux
...
[skip ci]
2014-07-14 15:31:39 -07:00
Konstantin Käfer
af9293a65b
fix includes
2014-07-14 15:09:05 -07:00
Konstantin Käfer
d91aa9c7e2
don't initialize sources multiple times
2014-07-14 15:01:45 -07:00
Konstantin Käfer
8b775573c1
move std::erase_if => util::erase_if
2014-07-14 15:01:45 -07:00
Mike Morris
97ec376614
C++ exception with description "array value has unexpected number of elements" thrown in the test body.
2014-07-14 16:16:20 -04:00
Justin R. Miller
ab472ed8bb
simplify OS X access token use
2014-07-14 12:16:46 -07:00
Justin R. Miller
7c03f89079
fix up access token docs for Xcode
2014-07-14 11:41:29 -07:00
Mike Morris
935089c239
dont exit early from npm_install.sh
2014-07-11 18:05:40 -07:00
Mike Morris
98ac12817f
Merge branch 'master' into fuzz-pipe
2014-07-11 17:21:51 -07:00
Mike Morris
6c71d70197
Merge pull request #362 from mapbox/stylesource
...
Break out StyleSource struct
2014-07-11 17:17:08 -07:00
Mike Morris
edc13c8509
Merge branch 'stylesource' into fuzz-pipe
2014-07-11 16:53:32 -07:00
Mike Morris
9031278344
Merge branch 'master' into stylesource
2014-07-11 16:53:18 -07:00
Mike Morris
43726dbf22
Merge branch 'stylesource' into fuzz-pipe
2014-07-11 16:50:04 -07:00
Mike Morris
5bc77d4243
add forward-declared Source shared_ptr to style_bucket
2014-07-11 16:49:39 -07:00
Konstantin Käfer
30298be270
add cstdarg headers
2014-07-11 16:42:09 -07:00
Konstantin Käfer
54fe8aab36
Merge branch 'master' of github.com:mapbox/mapbox-gl-native
2014-07-11 16:34:18 -07:00
Konstantin Käfer
2fc62f941a
add missing include header
2014-07-11 16:30:13 -07:00
Konstantin Käfer
fbec72cd47
allow formatted messages
2014-07-11 16:25:20 -07:00
Konstantin Käfer
2dc9133006
fix linux app build
2014-07-11 15:18:01 -07:00
Mike Morris
86c5367bae
Merge branch 'master' into stylesource
2014-07-11 14:52:39 -07:00
Konstantin Käfer
7ffe4a7858
add nslog and stderr log backends
2014-07-11 14:34:17 -07:00
Konstantin Käfer
f3c55eba9d
add logging facility and check logs in tests
2014-07-11 13:55:18 -07:00
Mike Morris
d230b9a587
remove link_gl from test/style gyp
2014-07-10 17:29:07 -07:00
Mike Morris
97486f3e0d
Merge branch 'stylesource' into fuzz-pipe
...
Conflicts:
src/map/source.cpp
src/style/style_layer.cpp
2014-07-10 17:24:50 -07:00
Mike Morris
f89de635ad
Merge branch 'master' into stylesource
2014-07-10 17:21:20 -07:00
Konstantin Käfer
8fc4d61025
allow setting classes in the test case
2014-07-10 17:19:53 -07:00
Mike Morris
af7b5e0615
break out StyleSource from Source, move getActiveSources and
...
updateSources into Map::Map, move getAccessToken from Style to Map
Conflicts:
include/llmr/style/style.hpp
src/map/source.cpp
src/style/style_layer.cpp
src/style/style_parser.cpp
Conflicts:
include/llmr/map/source.hpp
include/llmr/style/style_parser.hpp
include/llmr/style/style_source.hpp
src/map/map.cpp
src/map/source.cpp
src/style/style_parser.cpp
2014-07-10 17:19:23 -07:00
Mike Morris
7cde26247d
Merge branch 'master' into stylesource
2014-07-10 17:15:04 -07:00
Mike Morris
4590adc115
break out StyleSource from Source, move getActiveSources and
...
updateSources into Map::Map, move getAccessToken from Style to Map
Conflicts:
include/llmr/style/style.hpp
src/map/source.cpp
src/style/style_layer.cpp
src/style/style_parser.cpp
2014-07-10 17:12:02 -07:00
Konstantin Käfer
0719ca73be
remove duplicate setAppliedClasses function
2014-07-10 17:10:34 -07:00
Konstantin Käfer
ac11adf48c
Merge branch 'master' of https://github.com/mapbox/mapbox-gl-native
2014-07-10 17:02:10 -07:00
Konstantin Käfer
6a202fc197
allow processing multiple renders per test
2014-07-10 16:59:48 -07:00
Justin R. Miller
170d57cbe4
bump Cocoa for access tokens
2014-07-10 18:39:58 -05:00
