Commit Graph

2909 Commits

Author SHA1 Message Date
Ansis Brammanis
4ec0028856 switch from low/high to from/to 2015-02-04 12:08:29 -08:00
Ansis Brammanis
93b07c3675 rename FadedFunction to PiecewiseConstant function 2015-02-04 11:36:31 -08:00
Ansis Brammanis
465b1ac3eb Merge branch 'master' into pattern-functions
Conflicts:
	src/mbgl/renderer/painter.cpp
	src/mbgl/renderer/painter.hpp
	src/mbgl/renderer/painter_fill.cpp
	src/mbgl/renderer/painter_line.cpp
	src/mbgl/style/style_layer.cpp
	src/mbgl/style/style_layer.hpp
	src/mbgl/style/style_layer_group.cpp
	src/mbgl/style/style_layer_group.hpp
2015-02-04 11:05:36 -08:00
Ansis Brammanis
002a709b67 fix copy_bitmap for wrapped bitmaps 2015-02-04 09:54:41 -08:00
Konstantin Käfer
9ac6780f73 Merge pull request #814 from mapbox/separate-config-file
Move config-*.gypi files to config/ folder
2015-02-04 18:30:58 +01:00
Konstantin Käfer
da981e7825 move config files to config/ folder 2015-02-04 18:07:32 +01:00
Konstantin Käfer
b56b618abf Merge pull request #772 from mapbox/storage
Refactor Storage and HTTP interface
2015-02-04 16:26:30 +01:00
Konstantin Käfer
f66862b422 don't use -schema for building xcode projects 2015-02-04 11:54:02 +01:00
Konstantin Käfer
3da75dd706 guard boost include with pragma ignores 2015-02-04 11:54:01 +01:00
Konstantin Käfer
b35857e4a9 run correct arch build 2015-02-04 11:54:01 +01:00
Konstantin Käfer
c160b19fcf updated mesa and other targets on osx/ios 2015-02-04 11:54:01 +01:00
Konstantin Käfer
73f7db9af2 cleanup makefiles 2015-02-04 11:54:01 +01:00
Mike Morris
f007c420ed restore PREFIX default 2015-02-04 10:49:10 +01:00
Mike Morris
f987166ee8 don't drop -L flags 2015-02-04 10:49:09 +01:00
Konstantin Käfer
69975c7094 make different abis for android 2015-02-04 10:49:09 +01:00
Konstantin Käfer
50d78fde85 fix install script 2015-02-04 10:49:09 +01:00
Mike Morris
4b3689d18e fix install.gypi deps 2015-02-04 10:49:09 +01:00
Mike Morris
9f8ddf2930 define install_prefix in CONFIG_STRING 2015-02-04 10:49:09 +01:00
Konstantin Käfer
29baacf3a5 refactor makefile 2015-02-04 10:49:09 +01:00
Konstantin Käfer
3d51e116a8 use fake linker for merging the standalone static library 2015-02-04 10:49:08 +01:00
Konstantin Käfer
46553ff00c rework linux gyp files 2015-02-04 10:49:08 +01:00
Konstantin Käfer
12341ce0ee add missing headers 2015-02-04 10:49:08 +01:00
Konstantin Käfer
d53ddb3468 add information about running tests to readme 2015-02-04 10:49:08 +01:00
Konstantin Käfer
704b3719f5 use standard DEBUG macro rather than NDEBUG 2015-02-04 10:49:07 +01:00
Konstantin Käfer
a67219ab8b allow overriding configuration variables 2015-02-04 10:49:07 +01:00
Konstantin Käfer
8730120054 move variables to their own file 2015-02-04 10:49:07 +01:00
Konstantin Käfer
272fa8935e make storage lib separate so we can build without storage libs 2015-02-04 10:49:07 +01:00
Konstantin Käfer
fbe30e04c4 move ios-specific configuration to common.gypi 2015-02-04 10:49:07 +01:00
Konstantin Käfer
6f349a796c execute the correct server path and use the exepath for application root rather than the cwd 2015-02-04 10:49:07 +01:00
Konstantin Käfer
1c91f09fda move merge_lines implementation to its own source files to avoid duplicate symbols 2015-02-04 10:49:07 +01:00
Konstantin Käfer
4a985e09f2 asset:// URLs are local to the executable path now 2015-02-04 10:49:06 +01:00
Konstantin Käfer
9a549094e0 make ios compile 2015-02-04 10:49:06 +01:00
Konstantin Käfer
78376acea7 don't override std::hash 2015-02-04 10:49:06 +01:00
Konstantin Käfer
92a7f73bbe fixes for linux 2015-02-04 10:49:06 +01:00
Konstantin Käfer
bf629c97db cancel the backoff timer when the request is canceled 2015-02-04 10:49:06 +01:00
Konstantin Käfer
032c245bfe remove unused files 2015-02-04 10:49:06 +01:00
Konstantin Käfer
4cbe665f7d add symbols to Release builds for easier debugging 2015-02-04 10:49:06 +01:00
Konstantin Käfer
aa09aa321b rearrange tests and make more robust 2015-02-04 10:49:06 +01:00
Konstantin Käfer
8a1fce547e rearrange tests and add storage tests 2015-02-04 10:49:05 +01:00
Konstantin Käfer
5503aef690 make vaos immovable 2015-02-04 10:49:05 +01:00
Konstantin Käfer
31a0d18ca1 remove circular shared_ptr and a few other memory leaks 2015-02-04 10:49:05 +01:00
Konstantin Käfer
5602ba2f07 do not leak string handles 2015-02-04 10:46:37 +01:00
Konstantin Käfer
b9bf66e67e rewrite storage layer to be independent of the Map's event loop 2015-02-04 10:46:37 +01:00
Dane Springmeyer
3bfea8bf30 Merge pull request #811 from mapbox/fix-mips
Fix mips-64
2015-02-03 19:14:54 -08:00
Dane Springmeyer
734ce7aeb4 stop allowing failures for mips-64 2015-02-03 18:52:38 -08:00
Dane Springmeyer
78a7606d78 try building against alt zlib-system2 package - refs mapbox/mason#66 2015-02-03 18:35:02 -08:00
John Firebaugh
44be486234 Remove unused
Fixes #786
Fixes #797
2015-02-03 17:05:29 -08:00
Lauren Budorick
895d90409b Add functions for layout properties. 2015-02-03 16:09:58 -08:00
Leith Bade
230963b22d Merge pull request #805 from mapbox/chrono
Use std::chrono
2015-02-04 11:05:58 +11:00
Leith Bade
63e4c75275 Merge branch 'master' of github.com:mapbox/mapbox-gl-native into chrono
Conflicts:
	ios/mapbox-gl-cocoa
2015-02-04 10:44:57 +11:00