tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,207 Commits 3 Branches 22 Tags
70057e1b8eb40bf2d7ba85d7aae4e7c56eaefd99
Commit Graph

2207 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Leith Bade
9e81ab5228 Merge branch 'android-mason' of https://github.com/mapbox/mapbox-gl-native into android-mason 2014-11-08 11:58:00 +11:00
Leith Bade
7de5c03cfb Move style url and spi key to java 
Try 565 config then 8888
Remove unused perm
 2014-11-08 11:56:30 +11:00
Justin R. Miller
ee482fbf6e fix styles path 2014-11-07 16:28:19 -08:00
Justin R. Miller
8f4a6452e6 require GL ES 2 (even if ignored by emulator) 2014-11-07 16:28:11 -08:00
Leith Bade
0ac4247f72 Temp disable SSL cert validation 2014-11-08 08:44:39 +11:00
Leith Bade
01ead83b39 Android mapbogl now loads maps! 
(had to change JSON loading to http - temp fix)
 2014-11-08 08:07:47 +11:00
Konstantin Käfer
9038e963be Merge pull request #564 from mapbox/load-extensions 
Load extensions with *GetProcAddress
 2014-11-07 20:11:45 +01:00
Konstantin Käfer
8fe8b2f739 add glx support 2014-11-07 09:38:07 -08:00
Mike Morris
b5198374e7 add boost headers to cflags_cc for text_conversions test 2014-11-07 12:20:40 -05:00
Konstantin Käfer
582d616deb load VAO extension 2014-11-07 18:17:24 +01:00
Konstantin Käfer
7e65c88b46 bump cocoa bindings 2014-11-07 17:25:50 +01:00
Leith Bade
6c5331ee73 Add more detail to TileJSON error 2014-11-08 02:29:07 +11:00
Leith Bade
585805a754 Add logging of http requests 2014-11-08 02:15:19 +11:00
Leith Bade
f01428b697 Work around gamma crash 2014-11-08 02:14:53 +11:00
Leith Bade
a86fff1ab7 Rename old log functions 2014-11-08 01:05:49 +11:00
Leith Bade
598bc92401 Make image.cpp use Log functions 2014-11-08 01:05:03 +11:00
Leith Bade
ee11f36093 Non https style URL 2014-11-07 23:59:45 +11:00
Leith Bade
4a5f61e7a1 Make sure to install mason before env 2014-11-07 23:47:17 +11:00
Leith Bade
7477d0c9df Finish android log backend 2014-11-07 23:46:28 +11:00
Leith Bade
4a35b831fc Better way to avoid warnings 2014-11-07 21:04:59 +11:00
Leith Bade
2164afd2f0 Merge pull request #542 from ljbade/android-mason 
Android mason: Get android building
 2014-11-07 17:57:31 +11:00
Dane Springmeyer
fbb43cb5ea have mbgl-config report mbgl-core only (without libuv) 2014-11-06 16:53:05 -05:00
Konstantin Käfer
fb7f23884b don't error on unused parameters 2014-11-06 17:21:55 +01:00
Konstantin Käfer
37afa5af5b explicitly cast to 32 bit integer 2014-11-06 15:40:16 +01:00
Leith Bade
86f8f626f1 Change clear to red to debug tile loading 2014-11-07 01:40:05 +11:00
Leith Bade
56e26749d4 Start working on android log hook 2014-11-07 01:39:44 +11:00
Leith Bade
5ad9e14926 Enable debug rendering, work around make_inactive bug 2014-11-07 01:22:28 +11:00
Leith Bade
aa39ffe74c Fix bad count 2014-11-07 00:38:27 +11:00
Konstantin Käfer
618a4a5785 add -Werror to os x as well 2014-11-06 14:18:52 +01:00
Leith Bade
1ace7d6d18 Revert "Add GCC to travis to see if other messages" 
This reverts commit 89fad21fb9.
 2014-11-06 23:53:01 +11:00
Leith Bade
7b290b09c8 Add missing platform to travis 2014-11-06 23:35:08 +11:00
Konstantin Käfer
d7cfc05cea Merge pull request #544 from mapbox/fix-curl 
Update CURL bindings to be more stable
 2014-11-06 13:31:27 +01:00
Konstantin Käfer
01d4cdbb02 clean up poll handle data in close() function so that assert() won't fail 2014-11-06 13:21:46 +01:00
Konstantin Käfer
0480c10f90 [linux] let child process exit when parent hung up 2014-11-06 13:06:01 +01:00
Konstantin Käfer
3303db79d9 fix undefined value 
[skip ci]
 2014-11-06 13:05:52 +01:00
Konstantin Käfer
2e38b5964c use IPv4 address instead of localhost to work around systems that don't resolve localhost to 127.0.0.1 2014-11-06 13:05:51 +01:00
Konstantin Käfer
3038cdbbf3 fix various issues in curl bindings related to tile cancelation 2014-11-06 13:05:51 +01:00
Leith Bade
38ec9f03c1 Rename angle to bearing 2014-11-06 21:08:18 +11:00
Leith Bade
4caf8b5b50 Remove source functions 2014-11-06 20:52:50 +11:00
Leith Bade
bc375763f8 Fix bug with callback into Java 2014-11-06 20:47:09 +11:00
Leith Bade
398e5f933a Fix tabs 2014-11-06 20:39:00 +11:00