Commit graph

194 commits

Author SHA1 Message Date
Shinya Kitaoka
467e9d19ae Merge pull request #229 from ideasman42/cleanup-long-lines
Cleanup: very long lines
2016-04-26 13:05:35 +09:00
Keisuke Ogaki
788747cc4a Merge pull request #215 from skitaoka/test/pr/179
Allow Qt 5.6
2016-04-25 21:31:13 +09:00
Shinya Kitaoka
cd2d2022b0 Merge pull request #225 from ideasman42/linux-preproc-tweaks
Minor changes to preproc checks needed for building on Linux
2016-04-25 17:25:42 +09:00
Shinya Kitaoka
7e54c42979 Merge pull request #224 from ideasman42/linux-config-path
Use ~/.config on Linux/Unix
2016-04-25 17:12:02 +09:00
tomosu
678e76b782 Merge pull request #217 from shun-iwasawa/revert_key_on_xsheet
Revert keyframes on xsheet cell area
2016-04-25 16:13:13 +09:00
Campbell Barton
9472c8d664 Cleanup: very long lines
While this isn't an error, this causes search tools (grep for eg), to give warnings.
2016-04-25 14:15:01 +10:00
Campbell Barton
e6d9f6df9d Use ~/.config on Linux/Unix 2016-04-25 14:04:00 +10:00
Campbell Barton
07f3e872bd Minor changes to preproc checks needed for building on Linux 2016-04-24 16:33:04 +10:00
Campbell Barton
3191db5857 Correct class use with TTimer on Linux 2016-04-24 16:28:19 +10:00
shun_iwasawa
9fb611aa7a Merge remote-tracking branch 'origin/master' into revert_key_on_xsheet 2016-04-22 20:33:35 +09:00
shun_iwasawa
9f6fb4f937 revert showing keys on xsheet 2016-04-22 20:31:38 +09:00
Shinya Kitaoka
7db469349f fix CMakeLists.txt 2016-04-22 17:51:35 +09:00
Shinya Kitaoka
2a1f2beb19 support a QT_PATH var for MacOS 2016-04-22 17:34:36 +09:00
Shinya Kitaoka
aa590765e0 keep codes for QTBUG-48288 2016-04-22 16:19:06 +09:00
Shinya Kitaoka
d75b42a25e Merge branch 'qt56' of https://github.com/ss23/opentoonz into test/pr/179 2016-04-22 15:52:56 +09:00
Shinya Kitaoka
8016de0b54 add std:: 2016-04-21 17:52:56 +09:00
Shinya Kitaoka
11d3d7de92 Merge branch 'boost_upgrade' of https://github.com/ss23/opentoonz into ss23-boost_upgrade 2016-04-21 17:52:04 +09:00
Keisuke Ogaki
322ff72902 Merge pull request #193 from shun-iwasawa/fix_brush_tool_crash
Fix brush tool crash
2016-04-21 16:50:56 +09:00
Shinya Kitaoka
cc48383f8a Merge pull request #146 from shun-iwasawa/fix_loading_reslist
Fix loading camera preset (reslist.txt)
2016-04-21 16:25:54 +09:00
Keisuke Ogaki
b147ff3ff1 Merge pull request #204 from skitaoka/fix/step-by-step-improvement/remove-using
Remove `using std::foo` from headers
2016-04-21 16:24:27 +09:00
Shinya Kitaoka
3bfa549e8b remove "using"
- using std::string;
- using std::wstring;
- using std::ostream;
- using std::istream;
- using std::iostream;
- using std::ostrstream;
- using std::istrstream;
- using std::fstream;
2016-04-21 16:23:15 +09:00
shun_iwasawa
ed249948c7 modify xsheet lock button not to use key icon 2016-04-20 20:50:41 +09:00
shun_iwasawa
2ca36a7344 small change 2016-04-20 17:30:15 +09:00
shun_iwasawa
2b222ee2c3 Merge remote-tracking branch 'origin/master' into fix_save_mesh 2016-04-20 16:38:27 +09:00
shun_iwasawa
4060ca35fe fix save mesh 2016-04-20 16:15:01 +09:00
tomosu
b8c01c142e Merge pull request #190 from skitaoka/fix/delete-deletes
Remove `delete`s with some refactoring
2016-04-20 14:25:50 +09:00
tomosu
426cbb88a7 Merge pull request #202 from shun-iwasawa/fix_palette_crash
Fix crash when clicking on/off button in palette viewer
2016-04-20 12:16:51 +09:00
Shinya Kitaoka
577b68d441 add DVGui:: prefix 2016-04-20 10:24:53 +09:00
Shinya Kitaoka
eabf183e6e fix namespace 2016-04-20 10:24:52 +09:00
Shinya Kitaoka
cba6a2c733 fix pointer operation 2016-04-20 10:24:52 +09:00
Shinya Kitaoka
ec43d4d5e6 add #include <cmath> 2016-04-20 10:24:51 +09:00
Shinya Kitaoka
61dd762587 add #include <cmath> 2016-04-20 10:24:50 +09:00
Shinya Kitaoka
c12eacf2f3 remove #define NOMINMAX 2016-04-20 10:24:50 +09:00
Shinya Kitaoka
bb1d046db8 remove using namespace DVGui; from headers 2016-04-20 10:24:49 +09:00
Shinya Kitaoka
2148c874dd remove using namespace std; from headers 2016-04-20 10:24:48 +09:00
Shinya Kitaoka
42bfb61883 remove delete[] 2016-04-20 10:24:47 +09:00
Shinya Kitaoka
6a4e01532c remove 2016-04-20 10:24:46 +09:00
Shinya Kitaoka
79e39bd35a remove 2016-04-20 10:24:46 +09:00
Shinya Kitaoka
4c5bd5e681 remove register 2016-04-20 10:24:45 +09:00
Shinya Kitaoka
9f5a1bd760 use _WIN32 instead of WIN32 2016-04-20 10:24:44 +09:00
Shinya Kitaoka
e78c895e35 remove s 2016-04-20 10:23:26 +09:00
Keisuke Ogaki
1a50d4d9ff fix bug: lzodriver should be bundled 2016-04-19 22:51:34 +09:00
Keisuke Ogaki
6c9449add3 Merge pull request #171 from skitaoka/translation/spanish
Fix Spanish UI translation
2016-04-19 19:08:46 +09:00
Keisuke Ogaki
3c27c43f43 Merge pull request #191 from tomosu/fix_vector_thumbnail_and_crash_in_preview
fix vector preview problems
2016-04-19 18:51:28 +09:00
shun_iwasawa
b5d548dbf0 fix showing preset name 2016-04-19 18:14:52 +09:00
Shinya Kitaoka
5f2af016ab add move constructors 2016-04-19 16:54:53 +09:00
shun_iwasawa
94146e1345 fix palette crash 2016-04-19 16:37:29 +09:00
tomosu
04cb6c4a49 deleted unused code 2016-04-19 13:14:11 +09:00
kogaki
4edae4f691 Merge pull request #197 from shun-iwasawa/fix_convert_image_bug
Fix convert image bug
2016-04-18 23:24:30 +09:00
shun_iwasawa
fe7dd3b14f fix convert image bug 2016-04-18 23:23:21 +09:00