Leith Bade
|
bc7e97f37e
|
Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason
Conflicts:
src/map/source.cpp
|
2014-11-23 09:45:17 +11:00 |
|
Leith Bade
|
a438459e3b
|
Rewrite EGL config choosing
|
2014-11-22 21:40:49 +11:00 |
|
Leith Bade
|
78a667762a
|
Swtitch to stdlib mutex and cond vars
|
2014-11-22 13:14:22 +11:00 |
|
John Firebaugh
|
a3ec4cf17e
|
Use noncopyable
|
2014-11-21 14:25:12 -08:00 |
|
John Firebaugh
|
c3940cf082
|
Eliminate Map::getFileSource
|
2014-11-21 14:25:12 -08:00 |
|
John Firebaugh
|
9e971095d3
|
Pass FileSource by reference
|
2014-11-21 14:25:11 -08:00 |
|
Leith Bade
|
5b718d7fc9
|
Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason
Conflicts:
ios/mapbox-gl-cocoa
|
2014-11-21 20:36:55 +11:00 |
|
John Firebaugh
|
aaa1e3a6f1
|
Remove rotation constraints
This should be an iOS SDK option, not hard coded into
low-level renderering.
Fixes #458
|
2014-11-20 15:13:23 -08:00 |
|
Jordan Hollinger
|
4e3ae54062
|
Add functionality to get default transition duration from native code. Use it to save and restore state. #617
|
2014-11-19 17:24:49 -08:00 |
|
Jordan Hollinger
|
a888e9b7f3
|
Add temporary applied classes list in map, in case they are set before style is loaded. #620
|
2014-11-19 15:17:38 -08:00 |
|
Leith Bade
|
900f6e87fa
|
Fix null string crash
|
2014-11-18 22:47:57 +11:00 |
|
Leith Bade
|
f0e4e27cd3
|
Read styles from APK
|
2014-11-17 23:17:22 +11:00 |
|
Leith Bade
|
aee724d6cf
|
Create AssetRequest
|
2014-11-17 20:00:44 +11:00 |
|
Leith Bade
|
2aed807d4c
|
Add coffeecatch to Map::run()
|
2014-11-16 20:04:36 +11:00 |
|
Leith Bade
|
97dc28883e
|
Add coffeecatch
|
2014-11-16 19:32:51 +11:00 |
|
Leith Bade
|
940b796bb4
|
Revert "Add noncopyable"
This reverts commit 11061ee5da.
|
2014-11-15 20:08:18 +11:00 |
|
Leith Bade
|
7d66632209
|
Change to proper Log functions
|
2014-11-15 11:14:37 +11: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 |
|
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 |
|
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
|
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
|
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 |
|
Konstantin Käfer
|
8fe8b2f739
|
add glx support
|
2014-11-07 09:38:07 -08:00 |
|
Konstantin Käfer
|
582d616deb
|
load VAO extension
|
2014-11-07 18:17:24 +01:00 |
|
Leith Bade
|
598bc92401
|
Make image.cpp use Log functions
|
2014-11-08 01:05:03 +11:00 |
|
Leith Bade
|
7477d0c9df
|
Finish android log backend
|
2014-11-07 23:46:28 +11:00 |
|
artemp
|
44570c1d30
|
use linear<16,4> splitting algorithm (faster running tests)
|
2014-11-05 18:43:18 +00:00 |
|
Dane Springmeyer
|
a9ca7fdf11
|
Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason
|
2014-11-04 21:28:18 -05:00 |
|
John Firebaugh
|
051e1c32ae
|
Support compound text-anchor values
|
2014-11-04 12:26:27 -08:00 |
|
John Firebaugh
|
0790b574b4
|
Single text positioning property
https://github.com/mapbox/mapbox-gl-style-spec/issues/197
|
2014-11-04 12:26:27 -08:00 |
|
John Firebaugh
|
9a3b740fcc
|
Render ⇢ layout, style ⇢ paint
https://github.com/mapbox/mapbox-gl-style-spec/issues/166
|
2014-11-04 12:26:14 -08:00 |
|
John Firebaugh
|
c151f12997
|
Implement v6 filters
|
2014-11-04 12:26:14 -08:00 |
|
Lauren Budorick
|
0d6bca0e7e
|
line-offset -> line-gap-width
|
2014-11-04 12:26:13 -08:00 |
|
Konstantin Käfer
|
75889d8124
|
replace strftime_l with our custom formatter
|
2014-11-04 06:44:50 -08:00 |
|
artemp
|
92124d3aa1
|
make util::utf8_to_utf32::convert() static
|
2014-11-03 15:44:27 +00:00 |
|
Dane Springmeyer
|
d74a98899f
|
merge with master
|
2014-11-03 10:32:27 -05:00 |
|
Dane Springmeyer
|
4084e41e7f
|
cleanup after 195560090/#309/#530
|
2014-11-03 09:12:23 -05:00 |
|
Dane Springmeyer
|
490a4bb17f
|
centralize android ifdefs
|
2014-11-02 22:55:23 -05:00 |
|
Dane Springmeyer
|
d7b0a34bdd
|
mason-based android port
|
2014-11-01 22:41:40 -04:00 |
|
Konstantin Käfer
|
a50042349c
|
Merge branch 'master' into platform-image
|
2014-10-31 16:33:45 -04:00 |
|
Konstantin Käfer
|
38d17532c6
|
use binary mesa on travis to speed up build times
|
2014-10-31 12:35:36 -04:00 |
|
Konstantin Käfer
|
80366bc615
|
allow providing a callback to uv_messenger_stop to prevent mismatched new/free
|
2014-10-30 17:47:34 -04:00 |
|
artemp
|
1955600904
|
use boost::unicode_iterator on all platform (experimental)
|
2014-10-30 17:43:55 -04:00 |
|
Konstantin Käfer
|
b6dea0d8de
|
also allow underscores in token names
|
2014-10-30 15:06:18 -04:00 |
|
Konstantin Käfer
|
e3bc69b7e7
|
use CoreImage for decoding/encoding images on osx/ios
|
2014-10-30 12:02:28 -04:00 |
|