Commit Graph

16768 Commits

Author SHA1 Message Date
Leith Bade
ec7474bcf0 Fix travis 2014-12-18 20:48:24 +11:00
Leith Bade
1dd3ad8e64 Fix build 2014-12-18 20:35:55 +11:00
Leith Bade
465ae587a2 Use file for access token 2014-12-18 19:29:55 +11:00
Leith Bade
62038bb344 Make compass smaller 2014-12-18 18:53:49 +11:00
Leith Bade
228f997f99 Fix for OSX BSD flavour sed 2014-12-18 18:46:22 +11:00
Leith Bade
f73eebe47c Add run to AssetRequest 2014-12-18 18:41:44 +11:00
Leith Bade
6adc0e67b3 Update android build tools on travis 2014-12-18 16:28:25 +11:00
Leith Bade
e2e36e0c7f Fix lint warning about string 2014-12-18 15:59:14 +11:00
Leith Bade
2e43fd6b8b Update SDK libs 2014-12-18 15:04:32 +11:00
Leith Bade
40f859e482 Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason
Conflicts:
	gyp/mbgl-ios.gypi
	gyp/mbgl-osx.gypi
	platform/default/asset_request_libuv.cpp
	src/mbgl/storage/caching_http_file_source.cpp
	src/mbgl/storage/file_request.cpp
	src/mbgl/storage/file_request.hpp
	src/mbgl/storage/file_request_baton.hpp
2014-12-18 12:39:36 +11:00
Konstantin Käfer
a8dec01230 Merge pull request #723 from mapbox/overridable-file-request
Make FileRequest overridable by platform implementations
2014-12-17 15:12:34 +01:00
Konstantin Käfer
abcf978174 change comment and cache value 2014-12-17 15:01:15 +01:00
Konstantin Käfer
b5e9998b15 change file:// to asset:// to indicate that they aren't arbitrary files
refs #579
2014-12-17 14:59:05 +01:00
Konstantin Käfer
936e096514 Make file request overridable by platform implementations
refs #579: Android can now rename AssetRequest to FileRequest and implement it differently
2014-12-17 12:14:32 +01:00
Jon Rowe
02e43c6d30 Update READMD.md for OS X Yosemite 2014-12-16 11:51:19 -08:00
Justin R. Miller
c3d2f3e664 indicate submodule setup in common header of install info 2014-12-16 11:47:29 -08:00
Konstantin Käfer
e57c57516f automatically copy the certificate bundle 2014-12-16 12:17:40 +01:00
Konstantin Käfer
40a5bcd7d3 never create core profile contexts; their API is subtly different
(e.g. glGetString(GL_EXTENSIONS) doesn't work, you'd have to use glGetStringi(GL_EXTENSIONS, ...);)
2014-12-16 11:10:41 +00:00
Konstantin Käfer
9082a83d6a don't assing nullptr to std::string 2014-12-16 11:42:58 +01:00
Mike Morris
b5ed45a6f6 Merge pull request #721 from mapbox/clear-loop
fix CachingHTTPFileSource::clearLoop
2014-12-15 15:12:48 -05:00
Mike Morris
3a8036413f fix CachingHTTPFileSource::clearLoop 2014-12-15 14:32:48 -05: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
abf702046b use correct enum 2014-12-12 12:37:55 +01:00
Konstantin Käfer
6cabaf0230 provide explicit constructor to appease GCC 2014-12-12 12:37:55 +01:00
Konstantin Käfer
bec97a3d40 warp in MBGL_CHECK_ERROR() call 2014-12-12 12:37:55 +01:00
Konstantin Käfer
febfb7ac09 fix rendering errors 2014-12-12 12:37:55 +01:00
Konstantin Käfer
f8ba23377d [performance] remove glFlush() 2014-12-12 12:37:55 +01:00
Konstantin Käfer
2648e6a964 add debug line for showing the sprite atlas 2014-12-12 12:37:55 +01:00
Konstantin Käfer
06735c6544 depend on mbgl-core instead of -standalone so we don't have to run the packaging script every time
(this speeds up the build slightly)
2014-12-12 12:37:55 +01:00
Konstantin Käfer
5b14c85b78 use 4-byte aligned vertex attributes for performance reason
reverts 9d5f02ccaa and 4c0b4a7901
2014-12-12 12:37:54 +01:00
Leith Bade
6f56e88ee5 Stop services only on Linux 2014-12-12 10:36:54 +11:00
Leith Bade
3c021085a1 jq is now installed by default 2014-12-12 10:25:18 +11:00
Leith Bade
30c80af0d2 Fix bash error 2014-12-12 09:59:27 +11:00
Leith Bade
80016cd469 Don't need X for android builds 2014-12-12 09:49:06 +11:00
Mike Morris
76909d18fb log headless test fixture names 2014-12-11 16:37:48 -05:00
Konstantin Käfer
1fe545aee4 fix crashes when running in non-continuous mode 2014-12-11 18:32:25 +01:00
Konstantin Käfer
a4ce5152e8 don't provide a default value for the stylesheet file 2014-12-11 18:32:09 +01:00
Konstantin Käfer
343fd4bcac allow setting the cache database 2014-12-11 18:31:56 +01:00
Konstantin Käfer
41d9e7730f add xcode project for render cli util 2014-12-11 18:31:32 +01:00
Konstantin Käfer
8b5bba08b3 show default values and allow setting the output filename 2014-12-11 18:02:24 +01:00
Konstantin Käfer
a81e822ef0 add cli tool for rendering a map to an image 2014-12-11 17:58:36 +01:00
John Firebaugh
8f380af381 More explict Android OSX instructions 2014-12-10 14:16:51 -08:00
Leith Bade
87ef90b896 Use libnu 1.5.1 2014-12-11 07:24:20 +11:00
Leith Bade
911da56ea6 Fix service name 2014-12-11 00:19:34 +11:00
Leith Bade
df2ebadaa3 Add missing CHECK_ERROR 2014-12-11 00:14:46 +11:00
Leith Bade
d599fc5504 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/renderer/painter.cpp
	src/mbgl/renderer/prerendered_texture.cpp
2014-12-11 00:09:26 +11:00
Konstantin Käfer
0c62cd0655 Merge pull request #711 from mapbox/check-gl-error
Use CHECK_ERROR on every GL call
2014-12-10 13:55:39 +01:00
Konstantin Käfer
4ad28c931a only report STACK_OVERFLOW/STACK_UNDERFLOW when the GL implementation has them 2014-12-10 13:46:26 +01:00
Konstantin Käfer
93d56294cf update error reporting function 2014-12-10 13:21:08 +01:00