summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* fix text/icon rendering order (#470)artemp2014-10-281-15/+14
|
* fix 'flip' logic to take into account rotation_alignment and keep_upright (#470)artemp2014-10-281-7/+7
|
* Merge branch 'master' of github.com:mapbox/mapbox-gl-nativeJustin R. Miller2014-10-27135-1207/+1790
|\
| * Merge pull request #506 from mapbox/fix-linux-installKonstantin Käfer2014-10-275-0/+5
| |\ | | | | | | Mark libraries as standalone
| | * standalone flag for mbgl-headlessYoung Hahn2014-10-271-0/+1
| | |
| | * mark as standalone static libraries so they get placed into the correct ↵Konstantin Käfer2014-10-274-0/+4
| |/ | | | | | | directory on non-osx targets
| * canonical move ctorartemp2014-10-271-3/+2
| |
| * add new line at the endartemp2014-10-271-1/+1
| |
| * c++ - don't test if pointer is nullptr before deletingartemp2014-10-271-4/+1
| |
| * c++ style memory allocations/deallocationsartemp2014-10-271-7/+4
| |
| * use prefix operator++artemp2014-10-271-1/+1
| |
| * make addGlyphsToAtlas static method of SymbolBucket + add addGlyphs method ↵artemp2014-10-274-16/+34
| | | | | | | | to minimise number of mutex locking
| * prefer c++ style memory allocartemp2014-10-271-3/+4
| |
| * Merge pull request #505 from mapbox/fix-libuv-0.11Konstantin Käfer2014-10-274-22/+17
| |\ | | | | | | Fix compiling with libuv 0.11
| | * bump cocoaKonstantin Käfer2014-10-271-0/+0
| | |
| | * fix build with libuv 0.11Konstantin Käfer2014-10-273-22/+17
| |/
| * Merge pull request #504 from mapbox/headless-displayKonstantin Käfer2014-10-27132-1151/+1722
| |\ | | | | | | Headless display
| | * build all architectures in Release modeKonstantin Käfer2014-10-271-1/+8
| | |\ | | |/ | |/|
| | * Reverts AWS key changeKonstantin Käfer2014-10-272-6/+5
| | | | | | | | | | | | | | | | | | This reverts commit 38023928ad44ef86e84c045c77c571ce252306dc. This reverts commit 5d46caaf87e315a4c221e8c5f0ed10236b244b43. This reverts commit b3d064d1bbdfce42f394e96c63371b7f313b60d0.
| | * allow installing the libraryKonstantin Käfer2014-10-2718-52/+96
| | |
| | * make tests workKonstantin Käfer2014-10-2415-198/+168
| | |
| | * Merge remote-tracking branch 'origin/headless-display' into gyp-restructuringKonstantin Käfer2014-10-2496-525/+985
| | |\ | | | | | | | | | | | | | | | | | | | | Conflicts: Makefile ios/mapbox-gl-cocoa
| | | * disable the thread sanitizer on clang/Debug for now since this prevents core ↵Konstantin Käfer2014-10-231-11/+11
| | | | | | | | | | | | | | | | dumps from being generated on segfaults
| | | * fix typoKonstantin Käfer2014-10-231-3/+3
| | | |
| | | * show more debug informationKonstantin Käfer2014-10-231-3/+4
| | | |
| | | * show that the program crashedKonstantin Käfer2014-10-231-2/+8
| | | |
| | | * print core dumps on application crashesKonstantin Käfer2014-10-233-2/+23
| | | |
| | | * gcc fixesKonstantin Käfer2014-10-2321-62/+72
| | | |
| | | * add missing headerKonstantin Käfer2014-10-221-0/+2
| | | |
| | | * force exceptions and rtti in case they're disabled by another gyp fileKonstantin Käfer2014-10-221-12/+16
| | | |
| | | * fix variable shadowingKonstantin Käfer2014-10-2260-278/+276
| | | |
| | | * add missing include headerKonstantin Käfer2014-10-221-0/+2
| | | |
| | | * remove erroneous output during test runKonstantin Käfer2014-10-221-2/+0
| | | |
| | | * replace boost optional with mapbox optionalKonstantin Käfer2014-10-225-35/+85
| | | |
| | | * fix typoKonstantin Käfer2014-10-221-1/+1
| | | |
| | | * fixes for libuv 0.11Konstantin Käfer2014-10-223-385/+1
| | | |
| | | * Merge branch 'master' of github.com:mapbox/mapbox-gl-nativeKonstantin Käfer2014-10-2214-37/+158
| | | |\
| | | * \ Merge branch 'libuv-0.10-headless-display' into masonKonstantin Käfer2014-10-2232-132/+884
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: common/http_request_baton_curl.cpp include/mbgl/map/map.hpp include/mbgl/util/uv_detail.hpp scripts/travis_before_install.sh setup-libraries.sh src/map/map.cpp src/storage/file_request_baton.cpp src/storage/http_request.cpp src/util/uv-messenger.c
| | | | * | don't time xvfb startupKonstantin Käfer2014-10-161-1/+0
| | | | | |
| | | | * | fix misnamed functionKonstantin Käfer2014-10-161-3/+3
| | | | | |
| | | | * | better timing functionsKonstantin Käfer2014-10-162-11/+37
| | | | | |
| | | | * | export all required functionsKonstantin Käfer2014-10-161-0/+5
| | | | | |
| | | | * | export function to subshellsKonstantin Käfer2014-10-166-8/+3
| | | | | |
| | | | * | remove spaces from fold command and put in separate fileKonstantin Käfer2014-10-165-26/+35
| | | | | |
| | | | * | add more instrumentation and code folding to travis buildsKonstantin Käfer2014-10-164-0/+43
| | | | | |
| | | | * | we don't need a root_fbo function anymoreKonstantin Käfer2014-10-163-11/+0
| | | | | | | | | | | | | | | | | | | | | | | | [skip ci]
| | | | * | we now always use the fboKonstantin Käfer2014-10-161-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | [skip ci]
| | | | * | first attempt to create an opengl core profile version before falling back ↵Konstantin Käfer2014-10-162-19/+82
| | | | | | | | | | | | | | | | | | | | | | | | to legacy opengl contexts
| | | | * | lower our expectations towards the pbuffer and use framebuffers insteadKonstantin Käfer2014-10-153-37/+21
| | | | | |
| | | | * | cast to correct int typeKonstantin Käfer2014-10-151-2/+2
| | | | | |
View Lorry Controller Status