Commit Graph

16768 Commits

Author SHA1 Message Date
Konstantin Käfer
991eeaf24e fix blur fringes 2014-05-26 10:59:00 +02:00
Konstantin Käfer
0cb2d7ea48 Merge pull request #245 from mapbox/issue_241
Always build shaders during build process
2014-05-24 15:28:56 +02:00
Konstantin Käfer
225fd4c87d Merge pull request #244 from mapbox/issue_240
Correct namespace usage
2014-05-24 14:00:48 +02:00
Justin R. Miller
c73dd91307 add Core Graphics to deps for iOS app 2014-05-23 19:40:39 -07:00
Justin R. Miller
10be55f5c4 bump MVK for compass view 2014-05-23 19:31:10 -07:00
Justin R. Miller
661860d12f foundations of delegate/callback API 2014-05-23 18:32:55 -07:00
Justin R. Miller
2d7b76e2fe bump MVK for zoom/rotate gesture interactions 2014-05-23 18:29:33 -07:00
Justin R. Miller
8d678e3e9c Merge branch 'master' of github.com:mapbox/llmr-native 2014-05-23 18:25:19 -07:00
Justin R. Miller
3c5a2c7935 disallow/undo rotation at low zooms and near world edge 2014-05-23 18:24:58 -07:00
Dane Springmeyer
7f592ac2e7 Address #151 at the same time 2014-05-23 17:14:19 -07:00
Dane Springmeyer
105aa295f1 gyp: better xcode parameter usage 2014-05-23 16:51:37 -07:00
Dane Springmeyer
9e7ee02fcd remove generated shaders from git - Closes #241 2014-05-23 16:41:08 -07:00
Dane Springmeyer
7e94462747 correct namespace usage 2014-05-23 16:38:26 -07:00
Dane Springmeyer
2bfb4f6ed2 more gyp fixups in line with #232 2014-05-23 16:32:20 -07:00
Dane Springmeyer
13d390534d fix #232, refs #151 2014-05-23 16:13:39 -07:00
Nicki Dlugash
54fa90ce5b Merge pull request #238 from mapbox/road-poi-labels
Road poi labels
2014-05-23 19:06:49 -04:00
Nicki Dlugash
da6658d286 changed country_label text_field back to name 2014-05-23 18:43:28 -04:00
Nicki Dlugash
0cf3495053 updated night poi label stroke, strokeWidth, and strokeBlur 2014-05-23 18:41:10 -04:00
Nicki Dlugash
f2354ea6f2 Merge branch 'master' into road-poi-labels 2014-05-23 15:12:46 -04:00
Justin R. Miller
07e15927af remove unneeded headers 2014-05-23 11:29:58 -07:00
Konstantin Käfer
889ef68b5b first draft at blurring 2014-05-23 18:30:49 +02:00
Konstantin Käfer
7d767f518b add keys to stylesheet 2014-05-23 13:38:59 +02:00
Konstantin Käfer
ce2270eafc use boost optional to mark initialized values 2014-05-23 13:14:11 +02:00
Justin R. Miller
3f55302fb5 reset angle on resize to small zooms 2014-05-22 16:54:04 -07:00
Justin R. Miller
dbd877cb80 disallow/undo rotation at low zooms 2014-05-22 16:47:17 -07:00
Justin R. Miller
035b11e8a0 Merge branch 'master' of github.com:mapbox/llmr-native 2014-05-22 16:12:06 -07:00
Justin R. Miller
1ff173a049 fixes #48: constrain min zoom/vertical pan to within world 2014-05-22 16:11:21 -07:00
Nicki Dlugash
2ecf410504 playing around with road and poi label strokes, to match updated icons 2014-05-22 18:50:05 -04:00
Eden Halperin
a2104f074a Merge branch 'master' of https://github.com/mapbox/llmr-native 2014-05-22 14:40:02 -07:00
Eden Halperin
cb039d9b9e include noveg in wetland bucket 2014-05-22 14:39:56 -07:00
Justin R. Miller
12594ce8f1 clearer comments 2014-05-22 14:24:54 -07:00
Justin R. Miller
bccba97020 style cascading needs to happen every render for transitions 2014-05-22 14:22:54 -07:00
Justin R. Miller
05882c0f54 Merge pull request #235 from mapbox/transitions
support for style transitions
2014-05-22 12:58:28 -07:00
Justin R. Miller
80cb89a6b5 be sure to track previous composites 2014-05-22 12:52:06 -07:00
Justin R. Miller
aa92e92595 support for style transitions 2014-05-22 12:46:53 -07:00
Eden Halperin
cbe84299ed slight adjustments to landcover colors for contrast discrepencies 2014-05-22 12:01:34 -07:00
Eden Halperin
5bb1d151d4 transition bigger airport poi 2014-05-22 11:50:38 -07:00
Eden Halperin
7012d686fc landuse_snow structure 2014-05-22 11:09:59 -07:00
Eden Halperin
3efbe29199 add landuse_snow bucket 2014-05-22 11:05:49 -07:00
Konstantin Käfer
084e7af377 better sprite warnings 2014-05-22 15:19:51 +02:00
Konstantin Käfer
ba17d2cffc no need to use nonpremultiplied alpha blending 2014-05-22 15:17:26 +02:00
Konstantin Käfer
dffbb673ea read style filename from gyp file 2014-05-22 15:10:10 +02:00
Konstantin Käfer
04e70b240e Merge remote-tracking branch 'origin/master' into composite-layers
Conflicts:
	src/shader/shaders_gl.cpp
	src/shader/shaders_gles2.cpp
2014-05-22 14:49:27 +02:00
Konstantin Käfer
e1a59e0ae8 ifdef => if 2014-05-22 14:48:09 +02:00
Konstantin Käfer
6ae0b71bbb fix framebuffer drawing on ios 2014-05-22 14:15:51 +02:00
Konstantin Käfer
d1df97d46b add cleanup call to mvkmapkit 2014-05-22 12:46:26 +02:00
Konstantin Käfer
67ab9ff6f5 add cleanup call for destroying framebuffers 2014-05-22 12:41:17 +02:00
Konstantin Käfer
5bf52bfcd7 fix compile on ios 2014-05-22 12:28:19 +02:00
Konstantin Käfer
bb2cda34a7 make sure we're not calling functions that aren't threadsafe 2014-05-22 12:12:19 +02:00
Eden Halperin
1cfa10753a remove transition properties, fix poi label size descrepancy 2014-05-21 16:01:23 -07:00