Leith Bade
|
5feba9ac07
|
get/setAppliedStyleClasses -> get/setClasses
|
2015-01-18 17:05:01 +11:00 |
|
Leith Bade
|
016c2948c5
|
Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason
Conflicts:
src/mbgl/map/map.cpp
|
2015-01-18 16:33:39 +11:00 |
|
Leith Bade
|
d950e986b7
|
Merge pull request #757 from mapbox/move-terminate
Move terminate() call to GLFWView to avoid problems with node
|
2015-01-16 10:16:30 +11:00 |
|
Leith Bade
|
5e44256fe8
|
Move terminate() call to GLFWView to avoid problems with node
|
2015-01-16 09:50:05 +11: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 |
|
Leith Bade
|
8cca0a27ba
|
Check for IO errors when loading binary shader. Fixes #740
|
2015-01-14 10:35:33 +13:00 |
|
Leith Bade
|
1daf2207aa
|
Remove coffeecatch
|
2015-01-13 20:31:24 +11:00 |
|
Leith Bade
|
8eceb082ba
|
Add failsafe to program binary loading
|
2015-01-05 12:28:32 +13:00 |
|
Leith Bade
|
ff3ea3e20b
|
Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason
Conflicts:
platform/default/glfw_view.cpp
platform/default/headless_view.cpp
src/mbgl/map/map.cpp
|
2014-12-23 11:33:26 +13:00 |
|
Leith Bade
|
0771e50460
|
Rename View functions to match conventions. Also tidy up view classes and remove C style casts. Closes #656
|
2014-12-23 09:29:45 +13:00 |
|
Leith Bade
|
df19683b6a
|
Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason
Conflicts:
Makefile
platform/default/headless_view.cpp
src/mbgl/map/map.cpp
|
2014-12-21 15:02:47 +13:00 |
|
Konstantin Käfer
|
57e6bc6e1b
|
fix error in non-debug builds
|
2014-12-15 14:16:30 +01:00 |
|
Konstantin Käfer
|
21e9e0a5ea
|
set rendering mode so that we can skip intermediate renders for static images
|
2014-12-12 15:01:09 +01:00 |
|
Konstantin Käfer
|
1fe545aee4
|
fix crashes when running in non-continuous mode
|
2014-12-11 18:32:25 +01:00 |
|
Konstantin Käfer
|
a81e822ef0
|
add cli tool for rendering a map to an image
|
2014-12-11 17:58:36 +01:00 |
|
Leith Bade
|
0487b0c6a3
|
Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason
Conflicts:
src/mbgl/map/map.cpp
|
2014-12-08 20:19:41 +11:00 |
|
John Firebaugh
|
de098591c5
|
Remove Map::cleanup and Painter::cleanup
Both were noops.
|
2014-12-06 14:08:40 -08:00 |
|
Leith Bade
|
de9eb00276
|
Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason
Conflicts:
.gitignore
gyp/mbgl-ios.gypi
gyp/mbgl-linux.gypi
gyp/mbgl-osx.gypi
include/mbgl/map/map.hpp
src/mbgl/map/map.cpp
src/mbgl/storage/caching_http_file_source.cpp
|
2014-12-05 23:16:49 +11:00 |
|
John Firebaugh
|
ff640132de
|
Move setAccessToken to CachingHTTPFileSource
|
2014-12-04 17:03:23 -08:00 |
|
John Firebaugh
|
0a942b6f14
|
Change Map::stop to use std::function<void()>
Fixes #685
|
2014-12-04 15:58:04 -08:00 |
|
John Firebaugh
|
13564fb876
|
Create GlyphStore up front
|
2014-12-04 15:26:54 -08:00 |
|
John Firebaugh
|
36500b9f95
|
Add CachingHTTPFileSource::clearLoop()
So loop state can be cleaned up in the appropriate thread.
This is a hack; loop needs to be externalized from Map.
Fixes #686
|
2014-12-04 15:26:54 -08:00 |
|
John Firebaugh
|
16fe8e64c4
|
Move setReachability to CachingHTTPFileSource
|
2014-12-04 15:14:40 -08:00 |
|
Konstantin Käfer
|
abafb52f37
|
make most headers private
|
2014-12-04 20:02:50 +01:00 |
|