Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | cleanup makefiles | Konstantin Käfer | 2015-02-04 | 5 | -32/+7 | |
| | ||||||
* | refactor makefile | Konstantin Käfer | 2015-02-04 | 14 | -17/+19 | |
| | ||||||
* | use standard DEBUG macro rather than NDEBUG | Konstantin Käfer | 2015-02-04 | 1 | -5/+3 | |
| | ||||||
* | make storage lib separate so we can build without storage libs | Konstantin Käfer | 2015-02-04 | 1 | -3/+4 | |
| | ||||||
* | execute the correct server path and use the exepath for application root ↵ | Konstantin Käfer | 2015-02-04 | 2 | -4/+2 | |
| | | | | rather than the cwd | |||||
* | asset:// URLs are local to the executable path now | Konstantin Käfer | 2015-02-04 | 15 | -147/+166 | |
| | ||||||
* | fixes for linux | Konstantin Käfer | 2015-02-04 | 1 | -8/+15 | |
| | ||||||
* | remove unused files | Konstantin Käfer | 2015-02-04 | 3 | -71/+0 | |
| | ||||||
* | rearrange tests and make more robust | Konstantin Käfer | 2015-02-04 | 34 | -331/+317 | |
| | ||||||
* | rearrange tests and add storage tests | Konstantin Käfer | 2015-02-04 | 36 | -436/+1069 | |
| | ||||||
* | remove circular shared_ptr and a few other memory leaks | Konstantin Käfer | 2015-02-04 | 2 | -3/+4 | |
| | ||||||
* | Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason | Leith Bade | 2015-01-23 | 2 | -0/+4 | |
|\ | | | | | | | | | | | | | Conflicts: src/mbgl/renderer/painter_prerender.cpp src/mbgl/renderer/prerendered_texture.cpp src/mbgl/renderer/prerendered_texture.hpp | |||||
| * | Use v7 styles / tests | John Firebaugh | 2015-01-22 | 2 | -0/+4 | |
| | | ||||||
* | | Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason | Leith Bade | 2015-01-18 | 1 | -1/+1 | |
|\ \ | |/ | | | | | | | Conflicts: src/mbgl/map/map.cpp | |||||
| * | Move class state to map | John Firebaugh | 2015-01-14 | 1 | -1/+1 | |
| | | | | | | https://github.com/mapbox/mapbox-gl-js/pull/936 | |||||
* | | Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason | Leith Bade | 2015-01-15 | 2 | -0/+94 | |
|\ \ | |/ | | | | | | | Conflicts: src/mbgl/shader/shader.cpp | |||||
| * | Merge pull request #744 from mapbox/merge-roads | John Firebaugh | 2015-01-14 | 2 | -0/+93 | |
| |\ | | | | | | | merge adjacent roads with the same text for labeling | |||||
| | * | port tests for mergeLines | Ansis Brammanis | 2015-01-13 | 2 | -0/+93 | |
| | | | | | | | | | | | | js: 867b7f4be01126663df609756049515a41e700d1 | |||||
| * | | include sqlite3_static_libs in linker flags | Mike Morris | 2015-01-13 | 1 | -0/+1 | |
| |/ | ||||||
* | | Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason | Leith Bade | 2015-01-09 | 1 | -1/+1 | |
|\ \ | |/ | ||||||
| * | fix rendering errors | Konstantin Käfer | 2014-12-12 | 1 | -1/+1 | |
| | | ||||||
* | | log headless test fixture names | Mike Morris | 2014-12-11 | 1 | -0/+2 | |
|/ | ||||||
* | add missing gyp file | Konstantin Käfer | 2014-12-08 | 1 | -0/+1 | |
| | ||||||
* | make most headers private | Konstantin Käfer | 2014-12-04 | 2 | -3/+13 | |
| | ||||||
* | break out FileSource as an abstract class | Mike Morris | 2014-12-03 | 1 | -1/+3 | |
| | | | | add CachingHTTPFileSource implementation | |||||
* | move pixel flip from headless test into HeadlessView::readPixels | Mike Morris | 2014-12-01 | 1 | -9/+0 | |
| | ||||||
* | Merge branch 'master' into nunicode | artemp | 2014-11-27 | 1 | -1/+0 | |
|\ | ||||||
| * | simplify image_readers creation implementation | artemp | 2014-11-19 | 1 | -1/+0 | |
| | | | | | | | | | | * remove static callbacks registration * link png_reader/jpeg_reader into mbgl-linux lib | |||||
* | | use nunicode conditional case mapping (lowercase) | artemp | 2014-11-17 | 1 | -3/+1 | |
|/ | ||||||
* | Merge branch 'master' into image-readers | artemp | 2014-11-13 | 1 | -1/+11 | |
|\ | ||||||
| * | add boost headers to cflags_cc for text_conversions test | Mike Morris | 2014-11-07 | 1 | -1/+11 | |
| | | ||||||
* | | fix tests for linux (todo - find a better way to run 'linux' tests on 'osx') | artemp | 2014-11-07 | 1 | -2/+3 | |
|/ | ||||||
* | [linux] let child process exit when parent hung up | Konstantin Käfer | 2014-11-06 | 1 | -0/+6 | |
| | ||||||
* | use IPv4 address instead of localhost to work around systems that don't ↵ | Konstantin Käfer | 2014-11-06 | 2 | -2/+2 | |
| | | | | resolve localhost to 127.0.0.1 | |||||
* | fix various issues in curl bindings related to tile cancelation | Konstantin Käfer | 2014-11-06 | 1 | -2/+7 | |
| | ||||||
* | don't use a cache for test cases | Konstantin Käfer | 2014-11-05 | 1 | -0/+9 | |
| | ||||||
* | rewrite the actual JSON file instead of a global search/replace | Konstantin Käfer | 2014-11-05 | 2 | -7/+41 | |
| | ||||||
* | Update test/suite | John Firebaugh | 2014-11-04 | 2 | -0/+5 | |
| | ||||||
* | Update styles | John Firebaugh | 2014-11-04 | 10 | -2305/+55 | |
| | ||||||
* | Implement v6 filters | John Firebaugh | 2014-11-04 | 2 | -500/+206 | |
| | ||||||
* | also use custom formatter for OS X | Konstantin Käfer | 2014-11-04 | 1 | -0/+0 | |
| | ||||||
* | Merge pull request #540 from mapbox/test-http | Konstantin Käfer | 2014-11-04 | 4 | -87/+56 | |
|\ | | | | | Run tests using HTTP requests | |||||
| * | use dirname() on copies of the parameter only | Konstantin Käfer | 2014-11-04 | 1 | -1/+5 | |
| | | | | | | | | glibc's dirname() modifies the parameter | |||||
| * | use execv and pass non-inline argument for gcc | Konstantin Käfer | 2014-11-04 | 1 | -1/+2 | |
| | | ||||||
| * | pass array with a single nullptr instead of nullptr for compatibility | Konstantin Käfer | 2014-11-04 | 1 | -1/+1 | |
| | | ||||||
| * | Run tests using http requests | Konstantin Käfer | 2014-11-04 | 4 | -87/+51 | |
| | | | | | | | | | | | | We now start a local HTTP server on port 2900 that serves the test fixtures. This is the same port we also use in the JS test suite fixes #532 | |||||
* | | format | artemp | 2014-11-04 | 1 | -1/+1 | |
| | | ||||||
* | | add basic toupper/tolower text conversions tests #309 | artemp | 2014-11-04 | 2 | -2/+58 | |
|/ | ||||||
* | Remove unused | John Firebaugh | 2014-11-01 | 1 | -2/+1 | |
| | ||||||
* | Merge branch 'master' into platform-image | Konstantin Käfer | 2014-10-31 | 3 | -2/+2 | |
|\ |