Commit Graph

5798 Commits

Author SHA1 Message Date
Justin R. Miller
51af61c350 more robust style class handling 2014-06-20 16:45:58 -07:00
Justin R. Miller
8140827f28 refs #168: no longer need zooms 2014-06-20 11:20:11 -07:00
Justin R. Miller
efe29adfb7 fixes #278: better OS X icon 2014-06-19 17:36:51 -07:00
Dane Springmeyer
70983458f8 Merge pull request #327 from twelch/run-osx-fix
update to new GL app name
2014-06-17 10:55:24 -07:00
Tim Welch
c92e7d68ca update to new GL app name 2014-06-17 10:53:18 -07:00
Konstantin Käfer
f51fd9be58 make sure to use OpenGL ES 2.0 when compiling for nvidia chips 2014-06-17 05:52:39 -07:00
Konstantin Käfer
68c621b2a6 load glDiscardFramebufferEXT with a library function if needed 2014-06-17 05:52:24 -07:00
Konstantin Käfer
4899d72da6 only ignore diagnostics with clang 2014-06-17 04:42:23 -07:00
Dane Springmeyer
5800723ee7 Fix dependency compilation for linaro-softfp 2014-06-17 04:37:20 -07:00
Konstantin Käfer
0fa3fe523b Merge pull request #322 from mapbox/style-v3
Style Preparations
2014-06-16 18:58:04 +02:00
Konstantin Käfer
6b0f64dbfd move to namespace to fix compile error on linux/gcc 2014-06-16 17:50:23 +02:00
Konstantin Käfer
c6fc235cf7 convert to json 2014-06-16 17:12:46 +02:00
Konstantin Käfer
3cd1b8f07c template the parser 2014-06-16 17:00:25 +02:00
Konstantin Käfer
e3b9e9abf6 make code more concise 2014-06-16 16:48:21 +02:00
Konstantin Käfer
4a41b02cef move to std::map for classes 2014-06-16 15:47:37 +02:00
Konstantin Käfer
cbd8cc679d Merge pull request #321 from robpvn/patch-1
Add curl to Ubuntu apt-get install instructions
2014-06-16 13:16:02 +02:00
Robert Nordan
91738c32cb Add curl to Ubuntu apt-get install instructions
`make setup` barfed when it couldn't find curl in the path, so we need to add it to the pre-build installs on Ubuntu.
2014-06-16 13:08:45 +02:00
Konstantin Käfer
71d2b230a1 separate bucket render properties and change naming 2014-06-16 11:49:11 +02:00
Dane Springmeyer
610a9e4a63 fix linux build 2014-06-11 12:32:15 -07:00
Dane Springmeyer
2ca05154e0 adapt to mapnik/mapnik-packaging#157 2014-06-11 11:47:23 -07:00
Konstantin Käfer
d6da893e66 add comment for magic value 2014-06-11 20:24:12 +02:00
Dane Springmeyer
238488c413 fix #313 2014-06-05 00:54:38 -07:00
Dane Springmeyer
09737e150f list supported compilers 2014-06-05 00:34:58 -07:00
Dane Springmeyer
ae7e3de61c [build] make sure python 2.x build dependency is clear 2014-06-05 00:31:51 -07:00
Dane Springmeyer
5744ebc290 [build] configure and pass full path of node to xcode - fixes #211 and #311 2014-06-05 00:10:27 -07:00
Konstantin Käfer
318ee37e4d remove accidental bias value 2014-06-05 08:45:34 +02:00
Dane Springmeyer
b258d55dca fix documentation bug - closes #311 2014-06-04 23:29:02 -07:00
Dane Springmeyer
1379195811 [travis] remove caching - refs #310 2014-06-04 20:32:50 -07:00
Dane Springmeyer
9d81fa9c63 ensure zlib headers are installed 2014-06-04 18:46:24 -07:00
Dane Springmeyer
f6df8bd54a [travis] fix linux setup 2014-06-04 18:38:59 -07:00
Dane Springmeyer
e1a8d7ddc7 Merge pull request #307 from mapbox/multi-os
Multi os
2014-06-04 18:26:21 -07:00
Justin R. Miller
7ec00b767b bump Cocoa pin 2014-06-04 13:37:49 -07:00
Dane Springmeyer
36943d5ba7 update travis readme link 2014-06-04 12:24:12 -07:00
Justin R. Miller
1c025b0c8a Merge branch 'master' of github.com:mapbox/llmr-native 2014-06-04 09:49:27 -07:00
Justin R. Miller
2c6fe3cabc simply MGL Cocoa source files 2014-06-04 09:49:20 -07:00
Konstantin Käfer
af69b4fe39 unifiy constants in one place, and allow local override 2014-06-04 11:22:03 +02:00
Konstantin Käfer
580527a16c use token replacement for icon property as well
fixes #300
2014-06-04 10:58:11 +02:00
Konstantin Käfer
ef76be64a2 separate out token replacer as a standalone function in preparation for #300 2014-06-04 10:53:08 +02:00
Konstantin Käfer
f59424b00b skip background layer early 2014-06-04 10:09:38 +02:00
Dane Springmeyer
3e70a816fb headless test is gone, remove it 2014-06-03 12:17:15 -07:00
Dane Springmeyer
b6ed0b080a Merge branch 'master' of github.com:mapbox/mapbox-gl-native into multi-os
Conflicts:
	.travis.yml
2014-06-03 11:17:40 -07:00
Konstantin Käfer
fbd983f104 don't make a copy of the glyph store 2014-06-03 18:11:19 +02:00
Konstantin Käfer
2eb948115d only draw points when there actually are linejoins 2014-06-03 18:11:07 +02:00
Konstantin Käfer
08fc466107 load stylesheet file for headless test 2014-06-03 18:10:53 +02:00
Konstantin Käfer
e105e256be run tests with correct working dir 2014-06-03 18:10:34 +02:00
Konstantin Käfer
7a4a833f39 Revert "background grid"
This reverts commit 1dd3fdfba3.
2014-06-03 17:29:27 +02:00
Dane Springmeyer
851f56fc59 [build] avoid unneccessary rebuild of liboost_regex.a - refs #298 2014-06-02 16:45:46 -07:00
Nicki Dlugash
f656f4b292 Merge pull request #303 from mapbox/expressions-pois
Expressions pois
2014-06-02 19:08:25 -04:00
Nicki Dlugash
314c929233 Merge branch 'expressions' into expressions-pois 2014-06-02 19:00:42 -04:00
Dane Springmeyer
c357a17f84 [travis] don't double build libllmr.a - refs #298 2014-06-02 15:59:16 -07:00