summaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into platform-imageKonstantin Käfer2014-10-316-124/+126
|\
| * rename to .hpp to avoid compiling twiceKonstantin Käfer2014-10-302-1/+3
| * allow providing a callback to uv_messenger_stop to prevent mismatched new/freeKonstantin Käfer2014-10-303-6/+15
| * simplify debug font lookupKonstantin Käfer2014-10-302-111/+99
| * don't use std::map for checking color constantsKonstantin Käfer2014-10-301-6/+9
* | use CoreImage for decoding/encoding images on osx/iosKonstantin Käfer2014-10-302-188/+1
* | do not crash for missing imagesKonstantin Käfer2014-10-302-0/+4
* | use unique_ptr for automatic deallocationKonstantin Käfer2014-10-301-10/+10
|/
* remove regex/boost regex usageKonstantin Käfer2014-10-301-8/+0
* pass Tile::ID by const refartemp2014-10-303-3/+3
* merge with mbgl-configDane Springmeyer2014-10-2915-342/+323
|\
| * access member variables directly inside class methodsartemp2014-10-291-3/+2
| * store uv::loop as unique_ptrartemp2014-10-291-1/+1
| * simplify - remove before/afterParse and create Parser on stack in worker threadartemp2014-10-292-17/+5
| * store spriteAtlas by value + make TileParser noncopyableartemp2014-10-292-11/+8
| * remove commented out assertartemp2014-10-291-1/+0
| * store glyphAtlas by value in Map object, pass by refartemp2014-10-296-18/+14
| * c++ - use const qualifierartemp2014-10-291-1/+1
| * Fix variable shadowingJohn Firebaugh2014-10-292-5/+5
| * Replace uv::rwlock with std::recursive_mutexJohn Firebaugh2014-10-291-29/+28
| * Render map with a copy of TransformStateJohn Firebaugh2014-10-299-221/+229
| * Hold internal reference to Sprite in SpriteAtlasJohn Firebaugh2014-10-295-33/+29
| * 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
* | gyp fixesKonstantin Käfer2014-10-283-12/+12
|/
* 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 to...artemp2014-10-272-14/+28
* prefer c++ style memory allocartemp2014-10-271-3/+4
* fix build with libuv 0.11Konstantin Käfer2014-10-271-15/+16
* gcc fixesKonstantin Käfer2014-10-2314-39/+43
* add missing headerKonstantin Käfer2014-10-221-0/+2
* fix variable shadowingKonstantin Käfer2014-10-2232-171/+168
* add missing include headerKonstantin Käfer2014-10-221-0/+2
* fixes for libuv 0.11Konstantin Käfer2014-10-222-2/+1
* Merge branch 'master' of github.com:mapbox/mapbox-gl-nativeKonstantin Käfer2014-10-225-15/+130
|\
| * New mason-based build systemKonstantin Käfer2014-10-2212-30/+72
| |\
| * | background-image supportJohn Firebaugh2014-10-175-15/+130
* | | Merge branch 'libuv-0.10-headless-display' into masonKonstantin Käfer2014-10-228-17/+62
|\ \ \ | |_|/ |/| |
| * | add int status arg to uv_messenger_callbackMike Morris2014-10-131-1/+1
| * | adjust file_request_baton and http_request for libuv 0.10 apiMike Morris2014-10-102-7/+8
| * | Merge branch 'master' into libuv-0.10-headless-displayMike Morris2014-10-1042-308/+2518
| |\ \ | | |/
| * | don't do concurrent access to a static member variableKonstantin Käfer2014-10-083-8/+30
| * | make view active/inactive around Map::setup, don't leave active after view.re...Mike Morris2014-09-301-0/+2
| * | Merge branch 'libuv010' into libuv-0.10-fix-context-shutdownMike Morris2014-09-243-165/+158
| |\ \
| | * \ Merge branch 'master' into libuv010Mike Morris2014-09-243-165/+158
| | |\ \
| * | | | bump mapnik-packaging, remove unnecessary view.make_active callsMike Morris2014-09-191-9/+4
View Lorry Controller Status