Justin R. Miller
2aefd726e7
Merge branch 'android-mason' of github.com:mapbox/mapbox-gl-native into android-mason
2014-11-12 12:29:41 -08:00
Justin R. Miller
64f3909433
formatting tweaks
2014-11-12 12:24:58 -08:00
Leith Bade
ce2ffef38a
Scale map style to match screen DPI
2014-11-13 06:57:14 +11:00
Justin R. Miller
4383385139
add default, unburned icons to satisfy Studio
2014-11-12 10:22:45 -08:00
Justin R. Miller
f8063e840e
Merge branch 'android-mason' of github.com:mapbox/mapbox-gl-native into android-mason
...
Conflicts:
android/java/lib/src/main/java/com/mapbox/mapboxgl/lib/MapView.java
2014-11-12 09:45:46 -08:00
Leith Bade
7877d0505e
Fix crash
2014-11-12 23:17:07 +11:00
Leith Bade
0dd54c0379
Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason
...
Conflicts:
platform/default/image.cpp
2014-11-12 23:16:56 +11:00
Konstantin Käfer
27cf24171a
check library versions against header symbols in static initialization function
...
fixes #580
2014-11-12 12:12:01 +01:00
Leith Bade
82908c99f7
More tidy up
2014-11-12 22:03:27 +11:00
Leith Bade
11061ee5da
Add noncopyable
2014-11-12 22:01:32 +11:00
Leith Bade
49da2c2fa5
Tidy code up more
2014-11-12 22:00:44 +11:00
Leith Bade
6b9e3c60ef
Renamed source files using mapbox style
...
Move headers to mbgl/android
Tidy up headers and includes
2014-11-12 21:17:24 +11:00
Justin R. Miller
0f4bd9a332
add dev icon burning
2014-11-11 16:21:07 -08:00
Justin R. Miller
918f590d9b
rename icons
2014-11-11 16:11:42 -08:00
Leith Bade
a1274fbc80
Lets no get ahead of ourselves
2014-11-12 08:13:06 +11:00
Mike Morris
f4cc85340e
Merge pull request #583 from mapbox/glx-undef-none
...
repair undef None GLX wrapper, pass 0 instead of None to GLX functions
2014-11-11 14:55:03 -05:00
Justin R. Miller
dfd382c3e8
update app icons
2014-11-11 10:48:38 -08:00
Justin R. Miller
53016d65d4
use remote style URL
2014-11-11 10:48:30 -08:00
Leith Bade
beb12bada2
Missed other Map::terminate() call
2014-11-11 23:05:30 +11:00
Leith Bade
de1f37fa9e
Change Assetbridge extraction dir to data dir
...
Only extract needed files
2014-11-11 22:50:37 +11:00
Leith Bade
e8139cbcfd
Fix function name
2014-11-11 22:35:46 +11:00
Leith Bade
682e9404c4
We no longer need to call Map::terminate9
2014-11-11 22:32:43 +11:00
Leith Bade
6ee24f07d7
Be sure to terminate everything
2014-11-11 22:31:25 +11:00
Leith Bade
6109102923
Remove left over test logs
2014-11-11 22:30:55 +11:00
Mike Morris
c542bd1140
repair undef None GLX wrapper, pass 0 instead of None to GLX functions
2014-11-10 15:06:56 -05:00
Leith Bade
6b65aa62a1
Fix flixker after switch
2014-11-10 00:23:09 +11:00
Leith Bade
b6616f0aa3
Remove old comments
2014-11-10 00:04:20 +11:00
Leith Bade
145296ac11
Actually remove read fill
2014-11-09 23:55:00 +11:00
Leith Bade
1e55c332cd
Wait for pause
...
Tidy up
Remove red fill
2014-11-09 23:52:34 +11:00
Leith Bade
3696e05193
Add async asserts
2014-11-09 22:54:05 +11:00
Leith Bade
28d66bb6f8
Add Map::pause/resume
...
Fixed bug after switching apps
2014-11-09 22:36:37 +11:00
Leith Bade
b3e3c21129
Reduce calls to context swapping
2014-11-09 17:36:27 +11:00
Leith Bade
9cb874c0f2
Reduce log noise
2014-11-09 17:19:11 +11:00
Leith Bade
4854527e31
Work around emulator GL ES 2.0 bug
2014-11-09 16:40:39 +11:00
Leith Bade
25251ee634
Fix sdk path on travis
2014-11-09 09:49:04 +11:00
Leith Bade
50431652c8
More tweaks to osx android on travis
2014-11-09 09:46:29 +11:00
Leith Bade
9f74c79c7d
First attempt at osx android in travis
2014-11-09 09:37:04 +11:00
Leith Bade
59d8cb2791
Fix typo
2014-11-09 09:06:58 +11:00
Leith Bade
cc83df8bcd
Try more Travis build types
2014-11-09 09:04:48 +11:00
Leith Bade
811455d15a
Update build instructions
2014-11-09 08:50:43 +11:00
Leith Bade
54d176fed0
Implement GL extensions
2014-11-09 01:22:38 +11:00
Leith Bade
70057e1b8e
Merge branch 'master' of https://github.com/mapbox/mapbox-gl-native into android-mason
...
Conflicts:
gyp/common.gypi
include/mbgl/geometry/vao.hpp
include/mbgl/platform/event.hpp
include/mbgl/platform/gl.hpp
platform/default/http_request_baton_curl.cpp
src/storage/response.cpp
2014-11-09 00:35:52 +11:00
Leith Bade
30a420d9a3
More tidying up
2014-11-08 22:59:16 +11:00
Leith Bade
3f4623b8b7
Enable debug layer
...
Less verbose logcat spew
Fix problem with checking for depth buffer size
Disable make_inactive for testing
2014-11-08 21:41:57 +11:00
Leith Bade
78059715ac
Tidy up config choosing
2014-11-08 19:04:26 +11:00
Leith Bade
529af6de24
Fix travis
2014-11-08 16:53:55 +11:00
Leith Bade
5b6c7aa870
Stop file not found error in Makefile
...
Update JNI methods
Tiny up Java
2014-11-08 16:23:43 +11:00
Leith Bade
160712274d
Fix Linux build
2014-11-08 13:10:16 +11:00
Leith Bade
39aa91b633
Add android build instructions
2014-11-08 13:06:15 +11:00
Leith Bade
c0bcd1e260
Add cache path variable from Java
...
Use cache path for db location
Add Assetbridge to extract asset files to cache path
Fix SSL by using extracted ca bundle
Use file:// style URL using extracted styles
2014-11-08 12:49:46 +11:00
