Brad Leege
044d1fc3c2
Merge branch 'master' of github.com:mapbox/mapbox-gl-native into 1033-metrics
...
Conflicts:
gyp/platform-ios.gypi
platform/ios/MGLMapView.mm
styles
2015-03-23 10:52:27 -05:00
Justin R. Miller
0e2d6c8277
fixes #1053 : umbrella Cocoa header
2015-03-22 12:25:10 -07:00
Justin R. Miller
ecb8e2800d
Cocoa annotations API
2015-03-22 00:53:36 -07:00
Brad Leege
8a73f2186a
#1033 - Adding CoreTelephony dependency and fixing access token setting method name.
2015-03-20 16:37:49 -05:00
Brad Leege
ec304d37ac
#1033 - Integrating MapboxEvents class.
2015-03-20 16:01:52 -05:00
Brad Leege
253643f57d
#1033 - Renaming MBLocationManager to MGLMetricsLocationManager to better comply with naming scheme.
2015-03-20 11:37:50 -05:00
Brad Leege
c42e83fcc6
#1033 - Moving MBLocationManager to Core GL from app specific instance.
2015-03-20 11:11:06 -05:00
Konstantin Käfer
48c55af5c1
fix sprites for pixel ratios that are not 1 and 2
...
- OpenGL ES 2 doesn't allow NPOT textures with wrap-around
- The Sprite object reported the map's pixelRatio, even though it loaded @2x assets
- Copying icons from the sprite into the atlas now uses bilinear scaling to scale up to the actual size
2015-03-17 12:30:40 +01:00
Konstantin Käfer
5e40f72b7c
scripts for running linux tests with docker
2015-03-13 12:06:11 +01:00
Konstantin Käfer
47ede853c4
fixes black flicker on rotating the device
...
fixes #838
instead of rendering ad libitum on the map thread, we are now driving rendering from the UI thread on iOS via the map.renderSync() function. There are still white bars during the rotation, but the general content of the view is kept visible.
- upgrades GLFW to 3.1
- removes swapped/needsSwap in favor of a more explicit scheme
- View#invalidate() now replaces View#swap() and is called whenever the View needs to trigger a rerender. GLFW and Android to this right away, while iOS goes back to the main thread and does the Map redrawing as part of the GLKView update
- sets all iOS deployment targets to 7.0
- disables SQLite3 version check, since the library version changed on iOS 8.2
2015-03-12 12:16:38 +01:00
Konstantin Käfer
9781785ab7
scope Requests to an Environment object for easier cancelation
...
we are now scoping all file requests to an environment object. The FileSource implementation treats
this as an opaque pointer, but allows canceling all Requests that are associated with that pointer.
This is necessary to abort all file requests that originated from a particular Map object. Aborting
a file request is different from canceling a file request: A canceled request doesn't have its
callback called, while an aborted request will have its callback called with an error, indicating
that the environment is going to be shut down.
2015-03-06 08:21:47 -08:00
Konstantin Käfer
b29bce0936
add ca bundle loading back to CURL
2015-02-17 11:42:47 -08:00
Konstantin Käfer
fe0baffe0d
update uv_zip and add tests
2015-02-16 18:30:19 -08:00
Leith Bade
8f416ee2d5
Add assetRoot for Android
2015-02-10 19:33:22 -08:00
Mike Morris
eaef4c0874
chmod +x python builds scripts, run directly instead of with python gyp var
2015-02-10 14:09:32 -08:00
Justin R. Miller
d4d4cd4415
move iOS code from gl-cocoa to this project
2015-02-09 18:01:40 -08:00
Konstantin Käfer
73f7db9af2
cleanup makefiles
2015-02-04 11:54:01 +01:00
Mike Morris
f987166ee8
don't drop -L flags
2015-02-04 10:49:09 +01:00
Konstantin Käfer
69975c7094
make different abis for android
2015-02-04 10:49:09 +01:00
Konstantin Käfer
50d78fde85
fix install script
2015-02-04 10:49:09 +01:00
Mike Morris
4b3689d18e
fix install.gypi deps
2015-02-04 10:49:09 +01:00
Konstantin Käfer
29baacf3a5
refactor makefile
2015-02-04 10:49:09 +01:00
Konstantin Käfer
3d51e116a8
use fake linker for merging the standalone static library
2015-02-04 10:49:08 +01:00
Konstantin Käfer
46553ff00c
rework linux gyp files
2015-02-04 10:49:08 +01:00
Konstantin Käfer
704b3719f5
use standard DEBUG macro rather than NDEBUG
2015-02-04 10:49:07 +01:00
Konstantin Käfer
8730120054
move variables to their own file
2015-02-04 10:49:07 +01:00
Konstantin Käfer
272fa8935e
make storage lib separate so we can build without storage libs
2015-02-04 10:49:07 +01:00
Konstantin Käfer
fbe30e04c4
move ios-specific configuration to common.gypi
2015-02-04 10:49:07 +01:00
Konstantin Käfer
9a549094e0
make ios compile
2015-02-04 10:49:06 +01:00
Konstantin Käfer
4cbe665f7d
add symbols to Release builds for easier debugging
2015-02-04 10:49:06 +01:00
Konstantin Käfer
8a1fce547e
rearrange tests and add storage tests
2015-02-04 10:49:05 +01:00
Konstantin Käfer
31a0d18ca1
remove circular shared_ptr and a few other memory leaks
2015-02-04 10:49:05 +01:00
Konstantin Käfer
b9bf66e67e
rewrite storage layer to be independent of the Map's event loop
2015-02-04 10:46:37 +01:00
Leith Bade
33f611cdf8
Fix -W flags for boost
...
Fixes #801
2015-02-03 11:38:43 -08:00
Dane Springmeyer
33b4922220
Adapt to c104c2f972 and 49fd477740
2015-02-02 15:18:01 -08:00
Leith Bade
aaedd9c83b
Remove program binary caching
2015-01-27 12:38:40 +11: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
Mike Morris
1b2f38d330
pass sqlite3_static_libs in install.gypi
2015-01-13 14:31:50 -05:00
Mike Morris
f1609ef329
include sqlite3_static_libs in linker flags
2015-01-13 14:31:50 -05:00
Mike Morris
fa0d20194e
break out version.hpp copy task into a separate gyp target to eliminate a possible race condition in parallel builds
2015-01-13 14:15:48 -05:00
Leith Bade
1dd3ad8e64
Fix build
2014-12-18 20:35:55 +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
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
Leith Bade
6bb1a5a146
Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason
...
Conflicts:
include/mbgl/platform/default/headless_view.hpp
platform/default/glfw_view.cpp
platform/default/headless_view.cpp
2014-12-10 19:22:25 +11:00
Leith Bade
2db8134d20
Add Android user-agent info
2014-12-10 19:14:05 +11:00
Leith Bade
69cd7268d7
Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason
...
Conflicts:
platform/default/http_request_baton_curl.cpp
2014-12-10 19:13:21 +11:00
Konstantin Käfer
753b6eedd6
also install the version header
2014-12-09 14:35:27 +01:00
Konstantin Käfer
917c0168ab
don't include the source file in every library
2014-12-09 14:14:11 +01:00
Konstantin Käfer
318ef5d443
Merge pull request #705 from mapbox/user-agent-os
...
Include operating system and actual version number in User Agent string
2014-12-08 23:18:09 +01:00