Shinya Kitaoka
dc288075e4
Merge pull request #232 from shun-iwasawa/fix_library_and_fxs_folder_locations
...
Fix "library" and "fxs" folder locations
2016-04-27 13:50:45 +09:00
Shinya Kitaoka
43167d966f
Merge pull request #230 from shun-iwasawa/add_save_all_command
...
"Save All" menu which saves current scene and all the levels. (modified from pr#153)
2016-04-27 13:50:24 +09:00
Shinya Kitaoka
3f27e3f731
Merge pull request #219 from shun-iwasawa/fix_crash_on_new_style
...
Fix crash with New Style command on empty palette
2016-04-27 13:46:14 +09:00
Shinya Kitaoka
6bd53158fb
Merge pull request #252 from opentoonz/fix/revert-to-fix-vector-rendering
...
Revert refactoring for vector rendering
2016-04-27 00:58:01 +09:00
Shinya Kitaoka
70f81d091c
fix ImageRasterizer::build
2016-04-27 00:20:01 +09:00
Shinya Kitaoka
6f097405b3
Revert "Merge pull request #248 from skitaoka/fix/issue/134"
...
This reverts commit ebfd3b7b4d
, reversing
changes made to 467e9d19ae
.
2016-04-27 00:11:57 +09:00
Shinya Kitaoka
c7321c0d77
Revert "Merge pull request #251 from skitaoka/fix/remove-glext-h"
...
This reverts commit 86c457716a
, reversing
changes made to ebfd3b7b4d
.
2016-04-27 00:11:29 +09:00
Shinya Kitaoka
86c457716a
Merge pull request #251 from skitaoka/fix/remove-glext-h
...
Fix glext.h
2016-04-26 22:52:47 +09:00
Shinya Kitaoka
6bcca29276
remove glext.h
2016-04-26 22:12:56 +09:00
tomosu
ebfd3b7b4d
Merge pull request #248 from skitaoka/fix/issue/134
...
Fix vector level rendering bug
2016-04-26 19:38:18 +09:00
Shinya Kitaoka
7bc9064955
fix convert vector image to raster image
issue
...
- remove NEW_REGION_FILL macro
- use glBlendFuncSeparate
- some refactoring
2016-04-26 18:40:16 +09:00
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
b42e43d4b8
Merge pull request #216 from skitaoka/support-travis-ci
...
Add .travis.yml
2016-04-26 10:12:04 +09:00
Shinya Kitaoka
b8d5f5b2ad
add .travis.yml
2016-04-25 22:14:06 +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
shun_iwasawa
3ce1efb28e
add save all command to template
2016-04-25 20:38:35 +09:00
Keisuke Ogaki
02a058a9d7
Merge pull request #208 from kogaki/fix/guide_to_installers
...
Add the guide to older/nightly installers
2016-04-25 19:38:11 +09:00
shun_iwasawa
36e06f3235
fix "library" and "fxs" folder locations
2016-04-25 18:45:04 +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
shun_iwasawa
38d9ba86f6
remove permission check
2016-04-25 17:02:52 +09:00
shun_iwasawa
723f49bcab
Merge remote-tracking branch 'origin/master' into add_save_all_command
2016-04-25 16:41:00 +09:00
shun_iwasawa
0b5f3366ed
add Save All command
2016-04-25 16:39:15 +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
Shinya Kitaoka
f8c590adc8
Merge pull request #223 from ideasman42/linux-timer-message-fix
...
Correct class use with TTimer on Linux
2016-04-25 13:58:50 +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
shun_iwasawa
93f4764414
Merge branch 'master' of https://github.com/walkerka/opentoonz into add_save_all_command
2016-04-25 12:15:05 +09: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
01874c2b40
fix crash on new style
2016-04-22 22:20:32 +09: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
663ee2ab9e
Merge pull request #212 from skitaoka/test/pr/177
...
Allow Boost 1.6.0
2016-04-21 19:04:28 +09:00
Shinya Kitaoka
8016de0b54
add std::
2016-04-21 17:52:56 +09:00
Shinya Kitaoka
610da192b7
Merge branch 'ss23-boost_upgrade' into test/pr/177
2016-04-21 17:52:20 +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
997092521e
Merge pull request #201 from shun-iwasawa/fix_vector_brush_lib
...
Fix vector brush library
2016-04-21 16:26:33 +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
Keisuke Ogaki
e1ec5f23c7
guide to older/nightly installers
2016-04-20 23:26:43 +09:00
Keisuke Ogaki
7f1cbfc776
Merge pull request #207 from shun-iwasawa/fix_save_mesh
...
Fix saving mesh levels problem + Modify style sheet for mesh columns
2016-04-20 23:09:00 +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