Commit Graph

5798 Commits

Author SHA1 Message Date
Leith Bade
21460f0c6a Remove token 2014-12-02 23:22:06 +11:00
Leith Bade
6bfc6a2b10 Fix deadlock in tests 2014-12-02 22:13:31 +11:00
Leith Bade
0935cef9c3 Fix tests when using GL 3.0+ context 2014-12-02 21:40:23 +11:00
Leith Bade
cfb6e2752c Fix Linux build 2014-12-02 20:04:12 +11:00
Leith Bade
2b86522412 Share asset_request between platforms 2014-12-02 19:41:50 +11:00
Leith Bade
9a8c018a32 Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason 2014-12-02 19:05:05 +11:00
Leith Bade
42966004f3 Merge pull request #670 from mapbox/gl-debug
Use GL debug callbacks
2014-12-02 19:02:16 +11:00
Mike Morris
9aa638201d Merge pull request #673 from mapbox/pixel-flip
Move pixel flip from headless test into HeadlessView::readPixels
2014-12-01 19:28:47 -05:00
Mike Morris
7e7b85e132 fix memcpy includes/namespace 2014-12-01 13:49:47 -08:00
Mike Morris
0fd7f26533 move pixel flip from headless test into HeadlessView::readPixels 2014-12-01 16:36:11 -05:00
Leith Bade
67d513816a Fix typo 2014-12-02 04:42:07 +11:00
Leith Bade
5ad094e823 Fix iOS compile 2014-12-02 03:43:04 +11:00
Leith Bade
2800f36142 Add debug markers and labels 2014-12-02 03:24:42 +11:00
Leith Bade
66349e33ab Add GL_ARB_debug_output 2014-12-02 03:09:09 +11:00
Dane Springmeyer
917c6d1925 readme setup: android on linux does not need all linux deps 2014-12-01 07:58:44 -08:00
Leith Bade
204700ff7e Stop mipmap allocation for textures 2014-12-02 02:29:07 +11:00
Leith Bade
763e636fd7 Improve formatting 2014-12-02 02:01:10 +11:00
Leith Bade
d27ede63fe Enable all messages 2014-12-02 01:57:18 +11:00
Leith Bade
2113e27990 Implement debug callback 2014-12-02 01:53:44 +11:00
Leith Bade
bbfe5d5ce4 Define GL callback func. Improve GL err macro. 2014-12-02 01:21:40 +11:00
Leith Bade
8f60624bec Fix import problem 2014-12-02 00:52:43 +11:00
Leith Bade
6998c6ecb9 Load KHR_debug on Linux 2014-12-02 00:44:08 +11:00
Leith Bade
c732f5c712 Merge pull request #669 from mapbox/fix-vaos
Fix VAOs on Linux
2014-12-02 00:36:16 +11:00
Leith Bade
759e806516 Add KHR_debug definitions 2014-12-02 00:35:30 +11:00
Leith Bade
c8552e1b28 Fix VAOs on Linux 2014-12-02 00:05:45 +11:00
Leith Bade
5f91003f57 Fix mason submodule 2014-12-01 22:52:28 +11:00
Leith Bade
5b41feccf3 Fix submodules 2014-12-01 22:43:10 +11:00
Leith Bade
e563f356a7 Improve GPS button response #661 2014-11-30 21:05:12 +11:00
Leith Bade
634a15332d Fix typo 2014-11-30 19:46:43 +11:00
Leith Bade
fdc8bb5221 Remove cat 2014-11-30 13:11:56 +11:00
Leith Bade
164596d0cb Fix access key for android on travis 2014-11-30 12:46:44 +11:00
Leith Bade
cbbcbd3c8d Debug access keys on travis 2014-11-30 12:28:27 +11:00
Leith Bade
0886db76e5 Use new libnu version on Android 2014-11-30 12:26:56 +11:00
Leith Bade
e5317b5237 Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason 2014-11-30 12:17:52 +11:00
Artem Pavlenko
d5fee5d716 Merge pull request #657 from mapbox/nunicode
Nunicode
2014-11-27 18:24:08 +01:00
artemp
2586cfb9e3 use ``const var&`` notation in public interface 2014-11-27 18:11:18 +01:00
Leith Bade
8ae2cd3985 Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason
Conflicts:
	README.md
	configure
	gyp/mbgl-linux.gypi
	include/mbgl/map/map.hpp
	include/mbgl/platform/default/image_reader.hpp
	include/mbgl/platform/default/jpeg_reader.hpp
	include/mbgl/platform/default/png_reader.hpp
	include/mbgl/util/uv_detail.hpp
	ios/mapbox-gl-cocoa
	platform/default/image.cpp
	platform/default/image_reader.cpp
	platform/default/jpeg_reader.cpp
	platform/default/png_reader.cpp
	src/map/map.cpp
2014-11-28 01:51:21 +11:00
Leith Bade
014ebd2f13 Add compass for #644 2014-11-28 00:58:48 +11:00
Leith Bade
65424a374e Revert "Switch back to Java 1.6 to fix warnings from apache commons"
This reverts commit c34788cc9f.
2014-11-28 00:41:48 +11:00
Leith Bade
c34788cc9f Switch back to Java 1.6 to fix warnings from apache commons 2014-11-28 00:26:58 +11:00
Leith Bade
8c4d1e4d80 Fix access token on travis 2014-11-28 00:19:11 +11:00
Leith Bade
b1c793d1e0 Add fps mode for #646 2014-11-28 00:19:11 +11:00
Leith Bade
b07a6ba9ee Add debug mode toggle 2014-11-28 00:19:08 +11:00
Leith Bade
b084313616 Fix access token check 2014-11-28 00:17:14 +11:00
Leith Bade
d90c63e52d Fix build 2014-11-28 00:17:14 +11:00
Leith Bade
838eb9ebad Fix README 2014-11-28 00:17:14 +11:00
Leith Bade
6702bdab83 More validation for #645 2014-11-28 00:17:14 +11:00
Leith Bade
1a59112f36 Quick check for #645 2014-11-28 00:17:14 +11:00
John Firebaugh
c066126e84 Update linux instructions 2014-11-28 00:17:12 +11:00
Vincent Schüßler
49519ba7f3 Fix member shadowing warnings 2014-11-28 00:16:06 +11:00