tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,331 Commits 3 Branches 22 Tags
acda1fcde8993c5abe4e4505c95bb2e7a53316b2
Commit Graph

2331 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Leith Bade
acda1fcde8 Add imagemagic to OSX README brew command 2015-01-21 12:59:44 +11:00
Mike Morris
9b2c8d0391 update bin/render for recent changes 2015-01-16 11:42:42 -05:00
Leith Bade
d950e986b7 Merge pull request #757 from mapbox/move-terminate 
Move terminate() call to GLFWView to avoid problems with node
 2015-01-16 10:16:30 +11:00
Leith Bade
5e44256fe8 Move terminate() call to GLFWView to avoid problems with node 2015-01-16 09:50:05 +11:00
John Firebaugh
d24b73b1a6 Move class state to map 
https://github.com/mapbox/mapbox-gl-js/pull/936
 2015-01-14 17:43:44 -08:00
John Firebaugh
c6ca57045f Merge pull request #744 from mapbox/merge-roads 
merge adjacent roads with the same text for labeling
 2015-01-14 10:12:45 -08:00
Mike Morris
6260643924 Merge pull request #743 from mapbox/sqlite-3.8.6 
SQLite 3.8.6
 2015-01-14 12:25:22 -05:00
Ansis Brammanis
4fbb7d614c port tests for mergeLines 
js: 867b7f4be01126663df609756049515a41e700d1
 2015-01-13 22:29:28 -05:00
Ansis Brammanis
b54c0e2447 simplify erase 
so you don't have to think about whether find might return an end()
iterator (which is invalid for erase).
 2015-01-13 22:26:37 -05:00
Leith Bade
f76bd8a6f4 Merge pull request #745 from mapbox/fix-binary-shader 
Check for IO errors when loading binary shader
 2015-01-14 12:19:32 +11:00
Leith Bade
8cca0a27ba Check for IO errors when loading binary shader. Fixes #740 2015-01-14 10:35:33 +13:00
Mike Morris
1b2f38d330 pass sqlite3_static_libs in install.gypi 2015-01-13 14:31:50 -05:00
Mike Morris
0d1764c43e sqlite3_static_libs on linux 2015-01-13 14:31:50 -05:00
Mike Morris
f1609ef329 include sqlite3_static_libs in linker flags 2015-01-13 14:31:50 -05:00
Mike Morris
139c0c6da6 build against mason sqlite 3.8.6 2015-01-13 14:31:50 -05:00
Mike Morris
5eb838d3f4 Merge pull request #752 from mapbox/copy-version 
break out version.hpp copy task into a separate gyp target
 2015-01-13 14:26:41 -05:00
Mike Morris
fa0d20194e break out version.hpp copy task into a separate gyp target to eliminate a possible race condition in parallel builds 2015-01-13 14:15:48 -05:00
Mike Morris
7c88ad9a00 Merge pull request #751 from mapbox/clear-xcode-cache 
Fix xcode_clear_cache
 2015-01-13 13:35:30 -05:00
Mike Morris
4533dcaf34 fix hard tabs in Makefile so clear_xcode_cache task actually runs, remove cache.db in Application Support if it exists 2015-01-13 12:49:41 -05:00
Leith Bade
f20a17a291 Merge pull request #748 from mapbox/fix-swap 
Correctly handle swapping
 2015-01-13 09:23:28 +11:00
John Firebaugh
bac75f1c7a Allow characters outside \w to be used in token 
https://github.com/mapbox/mapbox-gl-js/pull/926
 2015-01-12 10:17:01 -08:00
John Firebaugh
ab7122831a Merge pull request #747 from mapbox/fix-resize 
Correctly call resize with width and height
 2015-01-12 10:15:31 -08:00
Ansis Brammanis
5670fb397f get rid of separate vector for symbol geometries 2015-01-12 12:33:24 -05:00
Leith Bade
f05a530529 Correctly handle swapping. Fixes #666 2015-01-12 13:50:00 +11:00
Leith Bade
6aee86d5ff Correctly call resize with width and height. Fixes #746 2015-01-12 13:30:40 +11:00
Ansis Brammanis
e4858b6a02 merge adjacent roads with same text for labelling 
js: https://github.com/mapbox/mapbox-gl-js/pull/683
 2015-01-08 23:44:11 -05:00
Ansis Brammanis
166a3e21fa rephrase line uniform calculations to match js 
js: 359a576471e20373333cae80a5eccda95ee4cdc2
 2015-01-08 14:40:19 -05:00
Ansis Brammanis
59b51f0a9f fix fill pattern spacing 
js: 22e24f7f67c4db89d09c0b65df67d0fcf1c3b614
 2015-01-08 14:00:06 -05:00
John Firebaugh
c32f7dfa88 Merge branch 'master' into shader-performance 2015-01-07 15:15:11 -08:00
John Firebaugh
7eaa4fabde Merge pull request #731 from mapbox/view-rename 
Rename View functions to match conventions
 2014-12-22 13:14:44 -08:00
Leith Bade
0771e50460 Rename View functions to match conventions. Also tidy up view classes and remove C style casts. Closes #656 2014-12-23 09:29:45 +13:00
Leith Bade
2731b582f2 Merge pull request #729 from mapbox/shader-iostream 
Use iostream for saving GL program binary + check GL_NUM_PROGRAM_BINARY_FORMATS  > 0
 2014-12-20 15:15:43 +13:00
Leith Bade
15b47197a7 Use iostream for saving GL program binary. Also check for GL_NUM_PROGRAM_BINARY_FORMATS > 0. 2014-12-20 15:08:06 +13:00
John Firebaugh
4a2cf4aa62 Merge pull request #718 from mapbox/cli-render 
CLI render
 2014-12-18 18:00:33 -08:00
Konstantin Käfer
a8dec01230 Merge pull request #723 from mapbox/overridable-file-request 
Make FileRequest overridable by platform implementations
 2014-12-17 15:12:34 +01:00
Konstantin Käfer
abcf978174 change comment and cache value 2014-12-17 15:01:15 +01:00
Konstantin Käfer
b5e9998b15 change file:// to asset:// to indicate that they aren't arbitrary files 
refs #579
 2014-12-17 14:59:05 +01:00
Konstantin Käfer
936e096514 Make file request overridable by platform implementations 
refs #579: Android can now rename AssetRequest to FileRequest and implement it differently
 2014-12-17 12:14:32 +01:00
Jon Rowe
02e43c6d30 Update READMD.md for OS X Yosemite 2014-12-16 11:51:19 -08:00
Justin R. Miller
c3d2f3e664 indicate submodule setup in common header of install info 2014-12-16 11:47:29 -08:00
Konstantin Käfer
e57c57516f automatically copy the certificate bundle 2014-12-16 12:17:40 +01:00
Konstantin Käfer
40a5bcd7d3 never create core profile contexts; their API is subtly different 
(e.g. glGetString(GL_EXTENSIONS) doesn't work, you'd have to use glGetStringi(GL_EXTENSIONS, ...);)
 2014-12-16 11:10:41 +00:00
Konstantin Käfer
9082a83d6a don't assing nullptr to std::string 2014-12-16 11:42:58 +01:00
Mike Morris
b5ed45a6f6 Merge pull request #721 from mapbox/clear-loop 
fix CachingHTTPFileSource::clearLoop
 2014-12-15 15:12:48 -05:00
Mike Morris
3a8036413f fix CachingHTTPFileSource::clearLoop 2014-12-15 14:32:48 -05:00
Konstantin Käfer
57e6bc6e1b fix error in non-debug builds 2014-12-15 14:16:30 +01:00
Konstantin Käfer
21e9e0a5ea set rendering mode so that we can skip intermediate renders for static images 2014-12-12 15:01:09 +01:00
Konstantin Käfer
abf702046b use correct enum 2014-12-12 12:37:55 +01:00
Konstantin Käfer
6cabaf0230 provide explicit constructor to appease GCC 2014-12-12 12:37:55 +01:00
Konstantin Käfer
bec97a3d40 warp in MBGL_CHECK_ERROR() call 2014-12-12 12:37:55 +01:00