Mike Morris
|
6408e40a60
|
revert 992815cc3d
|
2014-08-13 16:04:53 -04:00 |
|
Konstantin Käfer
|
22e179aa37
|
remove trailing whitespace
[skip ci]
|
2014-08-12 16:30:27 +02:00 |
|
Konstantin Käfer
|
213b6ad4dc
|
Merge branch 'master' into rasterize
[skip ci]
|
2014-08-12 15:12:31 +02:00 |
|
Konstantin Käfer
|
6f80264291
|
remove uv.h dependency from header files
|
2014-08-12 11:45:30 +02:00 |
|
Lauren Budorick
|
ec7f7de5c4
|
still not working
|
2014-08-11 12:13:22 -07: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
|
bff4f4b334
|
skip null byte
|
2014-08-11 12:15:42 +02: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 |
|
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
|
056b4a988c
|
fix boolean operators
|
2014-08-04 18:46:43 +02:00 |
|
Konstantin Käfer
|
9dd50a29e1
|
update shaders and backport some collision changes
|
2014-08-04 12:59:22 +02:00 |
|
John Firebaugh
|
992815cc3d
|
Avoid libuv resource leaks (fixes #395)
|
2014-08-02 14:39:42 -07:00 |
|
Konstantin Käfer
|
4ea281c750
|
rename llmr => mbgl
|
2014-07-16 18:53:56 -07:00 |
|