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

2782 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Leith Bade
6ae8249ede Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason 2015-01-22 21:34:11 +11:00
Mike Morris
b6ef236d85 Merge pull request #768 from mapbox/clear-sqlite-cache 
Clear sqlite cache
 2015-01-21 15:56:48 -05:00
Mike Morris
ad7f68e386 simplify clear_sqlite_cache 2015-01-21 15:16:52 -05:00
Mike Morris
c18089b6d7 syntax fixes 2015-01-21 14:35:59 -05:00
Mike Morris
bee9ada450 clear sqlite cache 2015-01-21 14:29:41 -05:00
Mike Morris
161e187c6f only run clear_xcode_cache on OS X 2015-01-21 14:08:52 -05:00
Mike Morris
fc7c6d951d Merge pull request #767 from mapbox/readme-imagemagick 
Add imagemagic to OSX README brew command
 2015-01-21 11:17:35 -05:00
Leith Bade
acda1fcde8 Add imagemagic to OSX README brew command 2015-01-21 12:59:44 +11:00
Leith Bade
fe2dae7af1 Use LOST for GPS 2015-01-21 12:06:11 +11:00
Leith Bade
5feba9ac07 get/setAppliedStyleClasses -> get/setClasses 2015-01-18 17:05:01 +11:00
Leith Bade
016c2948c5 Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason 
Conflicts:
	src/mbgl/map/map.cpp
 2015-01-18 16:33:39 +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
Leith Bade
4540a8ae83 Update to Android NDK r10d in new AMI 2015-01-15 23:17:42 +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
Leith Bade
b7cc6bfaa6 Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason 
Conflicts:
	src/mbgl/shader/shader.cpp
 2015-01-15 11:39:50 +11: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
Leith Bade
ddbfcada27 Add pause to wait for slow AWS 2015-01-14 22:39:17 +11: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
65e6990582 Grab access token from environment 2015-01-13 21:14:44 +11:00
Leith Bade
d29fe6fe92 Remove binary shader caching on Android since OS already does this 2015-01-13 20:42:48 +11:00
Leith Bade
1daf2207aa Remove coffeecatch 2015-01-13 20:31:24 +11:00
Leith Bade
7cce089d78 Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason 2015-01-13 19:48:26 +11:00
Leith Bade
aa955171d7 remove extra line 2015-01-13 19:48:00 +11: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
Leith Bade
f6da4bb28a Add Android to list in README 2015-01-09 14:43:19 +11:00
Leith Bade
5ed8d4544f Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason 2015-01-09 09:30:52 +11:00
Leith Bade
3127301976 Restore deleted icons 2015-01-09 09:30:24 +11:00
Leith Bade
d6efa1e949 Update gradle version 2015-01-09 09:28:32 +11: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