Commit Graph

2273 Commits

Author SHA1 Message Date
Leith Bade
314eba0002 api 16 compat 2014-11-15 20:08:34 +11:00
Leith Bade
940b796bb4 Revert "Add noncopyable"
This reverts commit 11061ee5da.
2014-11-15 20:08:18 +11:00
Leith Bade
bd9d7fe776 Forgot osx 2014-11-15 19:55:26 +11:00
Leith Bade
16c8b3198a Ignore *~ 2014-11-15 19:50:33 +11:00
Leith Bade
2404f6ca0e Android api 17 compat 2014-11-15 19:49:13 +11:00
Leith Bade
6f78ec8a70 Give Travis latest build tools 2014-11-15 19:37:41 +11:00
Leith Bade
6ffb4951df Update to new build tools 2014-11-15 18:57:38 +11:00
Leith Bade
1a7b9a1669 Make Travis load submodules in init 2014-11-15 11:38:06 +11:00
Leith Bade
2853d79780 Revert "Travis needs submodules too"
This reverts commit d1389cc7ec.
2014-11-15 11:36:15 +11:00
Leith Bade
7f2d876fc4 Fix some lint errors 2014-11-15 11:29:11 +11:00
Leith Bade
7d66632209 Change to proper Log functions 2014-11-15 11:14:37 +11:00
Leith Bade
1512617ede Add missing apt-get to Linux instructions 2014-11-15 10:24:19 +11:00
Leith Bade
d1389cc7ec Travis needs submodules too 2014-11-14 18:35:00 +11:00
Justin R. Miller
30bea1dde4 Revert "Ensure error when the styles submodule is not loaded"
This reverts commit 14714a1088.
2014-11-13 18:15:34 -08:00
Justin R. Miller
dce0f0b6d9 Revert "Fix Makefile"
This reverts commit 990be6743f.
2014-11-13 18:15:29 -08:00
Leith Bade
990be6743f Fix Makefile 2014-11-14 08:07:56 +11:00
Leith Bade
a7d582a3e0 Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason 2014-11-14 08:05:13 +11:00
Mike Morris
2408ea30c9 Merge pull request #600 from mapbox/png-other-ldflags
pass png_static_libs to other_ldflags in install.gypi on Linux
2014-11-13 15:15:41 -05:00
Mike Morris
e0b4107595 pass png_static_libs to other_ldflags in install.gypi on Linux, closes #581 2014-11-13 11:47:06 -08:00
Leith Bade
0c2e3be5af Implement connectivity monitoring
Enable map debug mode in debug builds
Go back to MainActivity
2014-11-14 01:15:09 +11:00
Leith Bade
14714a1088 Ensure error when the styles submodule is not loaded 2014-11-13 18:50:47 +11:00
Justin R. Miller
6743cb6140 fix typo 2014-11-12 12:40:04 -08:00
Justin R. Miller
a5ac35d392 refs #556: OS X Android build instructions 2014-11-12 12:38:22 -08:00
Justin R. Miller
2071247689 tabs -> spaces 2014-11-12 12:37:38 -08:00
Justin R. Miller
79179c96b6 indicate submodule setup in common header of install info 2014-11-12 12:37:06 -08:00
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