Merge remote-tracking branch 'origin/master' into krita-testing-wolthera
Description
Description
Details
Details
- Committed
woltherav Jun 16 2016, 11:28 AM - Parents
- R37:d58645ede9a1: Merge remote-tracking branch 'origin/master' into video-export-kazakov
R37:e2ee9ff5774c: Cache the transform unelegantly. - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| d58645ede9a1 | dkazakov | Merge remote-tracking branch 'origin/master' into video-export-kazakov | Jun 15 2016 | |||
| abf6ab0faa41 | dkazakov | Remove avTranscoder and FFmpeg from the deps | Jun 15 2016 | |||
| 70552d5013df | dkazakov | Add custom options line for the ffmpeg filters | Jun 15 2016 | |||
| fd24a0f8df4d | dkazakov | Fix back progress reporting | Jun 15 2016 | |||
| d7aead33d1e2 | dkazakov | Added code for auto-detecting the ffmpeg presence | Jun 15 2016 | |||
| 493f58d609bd | dkazakov | Drop the dependency on avTranscoder | Jun 15 2016 | |||
| 401a73000ade | dkazakov | Use direct ffmpeg binary calls to convert Krita animation | Jun 15 2016 | |||
| fcd632f69e5a | dfaure | Fix security issue: KisTemplateCreateDia.cpp:323:95: error: format not a string… | Jun 13 2016 | |||
| 84292ca1d47d | rempt | Merge branch 'krita/3.0' | Jun 13 2016 | |||
| eb0d266b9302 | rempt | BUG:364047 Use the exactbounds, not extent for saving layers | Jun 13 2016 | |||
| 69d88cbd0e14 | rempt | KisPaintOp: Remove setCurrentScale,setCurrentRotation and family. | Jun 13 2016 | |||
| a133de18f722 | rempt | Fix runtime warning "QTextCursor::setPosition: Position 11 out of range" | Jun 13 2016 | |||
| fb1dfd65a481 | rempt | Merge branch 'krita/3.0' | Jun 13 2016 | |||
| a17b0a585f33 | timotheegiet/rempt | japanese animation template | Jun 13 2016 | |||
| 1985a9b29555 | timotheegiet/rempt | fix krita icon svgz source | Jun 13 2016 | |||
| 4d8daa1c2d96 | timotheegiet/rempt | new icon for krita document mimetype | Jun 13 2016 | |||
| 745804c4628c | timotheegiet/rempt | add some breeze color themes | Jun 13 2016 | |||
| 5f42350f13de | scottpetrovic | Merge branch 'petrovic-mirrorToolUpdates' | Jun 12 2016 | |||
| 2dc2a1a615d1 | scottpetrovic | remove unneeded pointer initializer | Jun 12 2016 | |||
| f46fed0b5ee8 | timotheegiet | add some breeze color themes | Jun 12 2016 | |||
| d9e188418ee1 | l10n daemon script | SVN_SILENT made messages (.desktop file) - always resolve ours | Jun 12 2016 | |||
| 14d0d6ef93ce | timotheegiet | new icon for krita document mimetype | Jun 9 2016 | |||
| 62bbc7d77b77 | timotheegiet | fix krita icon svgz source | Jun 9 2016 | |||
| f23863f04d1d | timotheegiet | japanese animation template | Jun 9 2016 | |||
| c24eecb6ba7e | rempt | BUG: 362064 Fix saving templates | Jun 9 2016 | |||
| d0460855ea58 | rempt | Remove unused member variable | Jun 9 2016 | |||
| 2dd26c598e1e | rempt | Histogram Improvements | Jun 9 2016 | |||
| 690808e6df3b | dkazakov | Switch video export log with KRITA_DEBUG_FFMPEG environment variable | Jun 8 2016 | |||
| 0672195f905d | dkazakov | Disable "Tune" field for now | Jun 8 2016 | |||
| c57f63c1e923 | dkazakov | Added ability to save the the default values of the export options | Jun 8 2016 | |||
| e421c480969f | dkazakov | Added Profile and Tune options for h.264 | Jun 8 2016 | |||
| 7790b1da2f94 | dkazakov | Implement configuration dialog for video plugin | Jun 8 2016 | |||
| d469ae9abf25 | timotheegiet/rempt | add document-properties icons | Jun 8 2016 | |||
| 8101d233613b | timotheegiet | add document-properties icons | Jun 8 2016 | |||
| 15a5d6876a84 | dkazakov | Implemented saving the animation into mkv, ogv, gif and mp4 | Jun 8 2016 | |||
| a572d54b9788 | l10n daemon script | SVN_SILENT made messages (.desktop file) - always resolve ours | Jun 8 2016 | |||
| 744773de8fd3 | scottpetrovic | clean up extra function that I do not think we need. Also add a little extra… | Jun 7 2016 | |||
| 5c0fcf009bd3 | scottpetrovic | make the move to center canvas work on the mirror tool options | Jun 7 2016 | |||
| 7e7ded7acd62 | scottpetrovic | debug line-- | Jun 7 2016 | |||
| 449144e38fc8 | scottpetrovic | BUG323264 add option to hide the symmetry line | Jun 7 2016 | |||
| 0d89210e0a3d | kossebau | Readd appimage build files accidentally removed in… | Jun 7 2016 | |||
| c9e711c16e8c | rempt | Add ffmpeg (mainly for osx) | Jun 7 2016 | |||
| 733b15c664db | rempt | Also look for ffmpeg | Jun 7 2016 | |||
| 15d5e5bb756f | rempt | Add a 3rdparty project for avtranscoder | Jun 7 2016 | |||
| e3c50382e5d4 | rempt | BUG:363769 Do not add double dots between filename and extension | Jun 7 2016 | |||
| 391eba6cd01a | dkazakov | Implement a skeleton for the Video export plugin | Jun 7 2016 | |||
| 2872a8396478 | rempt | Move KisBrushSizeOption to the deform brush | Jun 7 2016 | |||
| 6bc432f8d4e7 | rempt | BUG:363845 Do not derefence a deleted point | Jun 7 2016 | |||
| 427995d43ca5 | scottpetrovic | hook up lock option so it removes the grab tool | Jun 7 2016 | |||
| 17881e11d356 | scottpetrovic | add UI elements for the X and Y mirror tool options | Jun 7 2016 |
