Commit graph

490 commits

Author SHA1 Message Date
Shinya Kitaoka
74a1b285db Merge pull request #278 from jcome/chinese
Chinese (Simplified) UI translation
2016-05-11 15:24:49 +09:00
Shinya Kitaoka
a7259791fb Merge pull request #281 from shun-iwasawa/fix_level_settings_crash
Fix crash when setting "Level Subsampling" to 0
2016-05-11 12:03:28 +09:00
Yu Chen
ac10ccfce2 Add chinese/*.qm to stuff/config/loc 2016-05-10 22:35:33 +08:00
Yu Chen
1f519fed0b Rename translation folder to chinese 2016-05-10 22:25:10 +08:00
Yu Chen
953f29211b Add chinese to build targets 2016-05-10 22:23:42 +08:00
shun_iwasawa
a81a8b2bce fix level settings crash 2016-05-10 19:24:33 +09:00
Yu Chen
bd86876c50 Use the same chinese strings for "Ease" 2016-05-08 16:14:11 +08:00
Yu Chen
81ab179074 Chinese (Simplified) UI translation 2016-05-08 12:06:49 +08:00
Campbell Barton
f08982dd33 CMake: cleanup indentation, remove redundant endif args 2016-04-27 21:48:12 +10:00
tomosu
8095ea442c Merge pull request #258 from shun-iwasawa/fix_angle_unit_expression
Fix saving/loading an angle unit (degree sign) used in expression
2016-04-27 19:10:03 +09:00
shun-iwasawa
3e3c164802 Merge pull request #257 from skitaoka/fix/remove-hasOpenGLFramebufferObjects
remove hasOpenGLFramebufferObjects
2016-04-27 18:39:11 +09:00
shun_iwasawa
db3444ca99 fix angle unit (degree sign) expression 2016-04-27 18:37:49 +09:00
Shinya Kitaoka
a1c5b0a22d remove hasOpenGLFramebufferObjects 2016-04-27 18:37:16 +09:00
Shinya Kitaoka
85e0644e93 Merge pull request #245 from ideasman42/cleanup-gcc-Wcomment
Cleanup: gcc's -Wcomment warnings
2016-04-27 17:32:04 +09:00
Shinya Kitaoka
911b7e916a Merge pull request #247 from ideasman42/cleanup-gcc-Wwrite-strings
Cleanup: gcc's -Wwrite-strings warning
2016-04-27 17:24:52 +09:00
tomosu
b3369f897d Merge pull request #256 from skitaoka/fix/issue/253-254
Fix issue 253-254
2016-04-27 17:19:32 +09:00
tomosu
de525f2146 pen/touch device support (#206)
* change XsheetViewer::wheelEvent

* change horizontal mouse wheel move distance

* align 'Natural' direction with OSX policy

* change wheelEvent in SpreadSheetViewer (but function editor scroll still not working sufficiently)

* fix unintended zoom with pen-tablet
2016-04-27 15:11:23 +09:00
Shinya Kitaoka
6526c73583 Fix t32bitsrv build conflicts (#211)
add #include <memory>, fix QT_PATH

* add #include <memory>

* fix QT_PATH
2016-04-27 15:04:18 +09:00
Shinya Kitaoka
b6a3408983 Merge pull request #244 from shun-iwasawa/fix_pinchtool_crash
Fix pinch tool crash
2016-04-27 14:56:24 +09:00
Shinya Kitaoka
1ab7cf5db2 Merge pull request #246 from shun-iwasawa/fix_function_editor_crash
Fix crash when typing an expression without selecting curve in function editor
2016-04-27 14:55:02 +09:00
Shinya Kitaoka
fec1c80188 Merge pull request #239 from janisozaur/master
Janitorial: minor fixes
2016-04-27 14:43:00 +09:00
Shinya Kitaoka
108c32fcab create a context 2016-04-27 14:25:50 +09:00
tomosu
732b19e9a3 Merge pull request #250 from skitaoka/feature/add-build-time
Show build time on the about-dialog
2016-04-27 14:14:30 +09:00
Shinya Kitaoka
82ce0b9627 Merge pull request #236 from shun-iwasawa/fix_keyboard_shortcut_feature
Adding default keyboard shortcuts + Enable to delete default shortcuts
2016-04-27 13:51:47 +09:00
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
Campbell Barton
4aa85c3899 Cleanup: -Wwrite-strings warning 2016-04-27 10:55:26 +10:00
Campbell Barton
ea4f7e9dc2 Cleanup: gcc's -Wcomment warnings 2016-04-27 10:54:30 +10: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
Shinya Kitaoka
b3706349e9 show build time to about-dialog 2016-04-26 20:30:42 +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
shun_iwasawa
9f8808c937 fix function editor crash 2016-04-26 17:13:12 +09:00
shun_iwasawa
091edd3f55 fix pinch tool crash 2016-04-26 15:45:22 +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
Michał Janiszewski
28790b32b9 Plug memory leak in common 2016-04-25 22:24:05 +02:00
Michał Janiszewski
e69068915f Remove assignment from assert condition 2016-04-25 22:23:31 +02:00
Michał Janiszewski
5e553c07ee Drop unnecessary dereference 2016-04-25 22:04:42 +02:00
Michał Janiszewski
50e38f736b Plug some memory leaks 2016-04-25 21:54:56 +02:00
Michał Janiszewski
b82824518a Make sure all the sqrt coeffs have space for storage 2016-04-25 21:54:52 +02:00
Michał Janiszewski
f91771fdbe Plug memory leak in psd.cpp 2016-04-25 21:54:48 +02:00
Michał Janiszewski
bb8dc0a880 Fix loop counter 2016-04-25 21:54:42 +02:00
shun_iwasawa
b0d7ffd3c0 Merge remote-tracking branch 'origin/master' into fix_keyboard_shortcut_feature 2016-04-25 22:56:01 +09:00