Commit Graph

7032 Commits

Author SHA1 Message Date
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
Justin R. Miller
10d7781766 move to just a single Outdoors style 2014-11-28 00:16:02 +11:00
Leith Bade
896695833a Fix styles ordering 2014-11-28 00:15:05 +11:00
Leith Bade
e2b56e8d3e Enable satellite layer 2014-11-28 00:15:05 +11:00
Leith Bade
b3a0a205df Fix jpeg android gyp 2014-11-28 00:15:05 +11:00
artemp
6d62aad0ed image_readers: premultiply alpha 2014-11-28 00:15:05 +11:00
artemp
fc805cc41c image-readers: move concrete implementations headers into platform/default 2014-11-28 00:15:04 +11:00
artemp
3f8efa6985 move std.hpp include into image_reader.hpp (g++) 2014-11-28 00:15:04 +11:00
artemp
8c524e1ac6 return unique_ptr from get_image_reader 2014-11-28 00:15:04 +11:00
artemp
a2a303a1d1 ensure all exceptions are caught in Image ctor 2014-11-28 00:15:04 +11:00
artemp
fcebd44571 simplify image_readers creation implementation
* remove static callbacks registration
* link png_reader/jpeg_reader into mbgl-linux lib
2014-11-28 00:15:04 +11:00
artemp
33cc51c1d2 image-readers: only register readers that are used
create_png_reader(char const* data, size_t size)
create_jpeg_reader(char const* data, size_t size)
2014-11-28 00:15:04 +11:00
artemp
34d9d55846 fix png_reader 2014-11-28 00:15:04 +11:00
artemp
3193d97efe Revert "remove travis default installed libs which might conflict"
This reverts commit 23d3588f50.
2014-11-28 00:15:04 +11:00
artemp
ecd7826588 remove travis default installed libs which might conflict 2014-11-28 00:15:02 +11:00
artemp
15973741d5 simplify factory class to not rely on singleton + cleanups 2014-11-28 00:14:15 +11:00
artemp
46e9d46028 remove unused pragmas 2014-11-28 00:14:15 +11:00