Commit Graph

1601 Commits

Author SHA1 Message Date
Leo Lou
ada88f59e9 add missing git fetch for mapnik-packaging
When there is a local mapnik-packaging repo, 
git checkout a future commit requires a git fetch
2014-08-19 12:26:46 +02:00
Konstantin Käfer
d1ce6fdbeb Merge pull request #429 from mapbox/texture-updates
Use texSubImage2D to avoid texture memory reallocation
2014-08-19 11:52:35 +02:00
Konstantin Käfer
d778f60d1b Merge pull request #433 from mapbox/update-variant
Update variant implementation
2014-08-19 11:52:13 +02:00
Konstantin Käfer
d147e18153 update mapbox/variant 2014-08-19 11:38:26 +02:00
Justin R. Miller
dbf6d7bcb5 Merge pull request #432 from mapbox/travis-bash-strict
refs #431: bring back Travis Bash strictness
2014-08-18 12:12:25 -07:00
Justin R. Miller
a89c610a0f refs #431: bring back Travis Bash strictness 2014-08-18 11:52:16 -07:00
Konstantin Käfer
de72cf45af Merge pull request #430 from mapbox/fix-build-warnings
Fix build warnings
2014-08-18 15:43:06 +02:00
Konstantin Käfer
598c755cbd use texsubimage2d to avoid texture memory reallocation 2014-08-18 15:19:52 +02:00
Konstantin Käfer
c1d1237e97 bump cocoa bindings 2014-08-18 14:10:26 +02:00
Konstantin Käfer
5a59b5f5fc fix warnings 2014-08-18 14:05:52 +02:00
Konstantin Käfer
2076d3d97b Merge pull request #428 from mapbox/cache-osx-dependencies
Cache OS X dependencies
2014-08-18 12:26:55 +02:00
Konstantin Käfer
077bff33a6 install awscli on osx 2014-08-18 11:51:15 +02:00
Konstantin Käfer
46fc26837d fix downloading 2014-08-18 11:46:51 +02:00
Konstantin Käfer
599ed18d58 use cached dependencies for os x build 2014-08-18 11:40:17 +02:00
Justin R. Miller
03a6c80fa7 update README for latest style details 2014-08-15 18:01:49 -07:00
Justin R. Miller
8225b113ef Merge pull request #426 from mapbox/travis_dual_os
fixes #414: build Travis on both Linux & OS X (including for iOS)
2014-08-15 17:51:47 -07:00
Justin R. Miller
5ff80c711f fixes #414: build Travis on both Linux & OS X (including for iOS) 2014-08-15 17:34:41 -07:00
Justin R. Miller
f0f01b334a update README with more iOS info 2014-08-15 15:25:09 -07:00
Dane Springmeyer
714545f3c3 update mapnik-packaging to work around openssl problem
- refs 6d7e83e804
2014-08-15 15:00:16 -07:00
Dane Springmeyer
1dbe8ae708 install node in cross-platform way + fix mapnik-packaging checkout 2014-08-15 13:51:53 -07:00
Dane Springmeyer
e5399eb8ed pin to mapnik-packaging@848c6e8d6692a9 for now to protect against upstream refactoring 2014-08-15 13:23:59 -07:00
Konstantin Käfer
dd88bb6774 Merge pull request #420 from mapbox/remove-composite
remove support for composite layers
2014-08-15 16:12:15 +02:00
Konstantin Käfer
bf143f7340 remove composite enums from tests 2014-08-15 15:53:29 +02:00
Konstantin Käfer
b57399f162 fix stylesheet indentation 2014-08-15 15:53:28 +02:00
Konstantin Käfer
bc17bc0b87 remove trailing whitespace + use local image sprite 2014-08-15 15:52:53 +02:00
Ansis Brammanis
32a1711d8c remove support for composite layers 2014-08-15 15:52:53 +02:00
Konstantin Käfer
478a1dae67 Merge pull request #419 from mapbox/crosstile
allow crosstile labels and add `symbol-avoid-edges`
2014-08-15 15:50:36 +02:00
Konstantin Käfer
0407a4e119 Merge pull request #423 from mapbox/coalesce-texture-uploads
Upload textures at the beginning of a frame
2014-08-15 15:26:04 +02:00
Konstantin Käfer
937f82fcda use pimpl for collision in tile_parser 2014-08-15 15:18:29 +02:00
Ansis Brammanis
6c45972502 allow crosstile labels and add symbol-avoid-edges 2014-08-15 15:18:29 +02:00
Konstantin Käfer
8c2c7f769f coalesce texture uploads at the beginning of a frame 2014-08-15 15:10:49 +02:00
Konstantin Käfer
69f71e9431 Merge pull request #415 from mapbox/fix-vao
Line drawing slowdowns on OS X
2014-08-15 14:50:02 +02:00
Konstantin Käfer
8c3675755e base static vertexbuffer on buffer object 2014-08-15 13:39:49 +02:00
Konstantin Käfer
ba67fcd830 refactor vao object to use acutal OpenGL IDs rather than object pointers 2014-08-15 13:37:19 +02:00
Konstantin Käfer
a81c2efba2 don't replace shaders on duplicate setup() call
fixes #408
2014-08-15 13:36:14 +02:00
Konstantin Käfer
3ec4446ee6 add missing include 2014-08-15 11:11:37 +02:00
Konstantin Käfer
d6bfb4be65 fix binding to vaos 2014-08-14 18:30:45 +02:00
Konstantin Käfer
1799c1b04c fix image pattern rendering 2014-08-14 12:58:41 +02:00
Konstantin Käfer
e5c8099860 remove compositing from stylesheet 2014-08-14 12:58:41 +02:00
Konstantin Käfer
a0e8851530 use vaos only when the value is 1, not when it is merely defined 2014-08-14 12:58:41 +02:00
Konstantin Käfer
bfd1281285 only set changed glDepthRange values 2014-08-14 12:58:41 +02:00
Justin R. Miller
6ed3d67b62 bump Cocoa for bundled style API 2014-08-13 14:32:45 -07:00
Justin R. Miller
386ce0ec3e Merge branch 'master' of github.com:mapbox/mapbox-gl-native 2014-08-13 13:54:04 -07:00
Justin R. Miller
b15cdf568e bump Cocoa 2014-08-13 13:53:46 -07:00
Lauren Budorick
badc1ea28b Merge pull request #418 from mapbox/raster-styling
Raster styling
2014-08-13 11:00:04 -07:00
Lauren Budorick
8a9a43af7f fix std::sqrt 2014-08-13 09:52:54 -07:00
Konstantin Käfer
3492a55f97 remove unnecessary variable
[skip ci]
2014-08-13 10:44:44 +02:00
Lauren Budorick
b2aa60baac std namespacing trig fns 2014-08-12 22:56:16 -07:00
Lauren Budorick
4de2aafd30 rm commented line [skip ci] 2014-08-12 19:01:40 -07:00
Lauren Budorick
adb04662f9 parsing brightness correctly 2014-08-12 18:56:42 -07:00