Commit graph

264 commits

Author SHA1 Message Date
Campbell Barton
5ea53c8c6b Quiet GCC -Wparentheses warning with assignment (#310) 2016-05-20 17:37:59 +09:00
Keisuke Ogaki
cd46cc8362 Fix to stop creating zero-size image (#333)
* 🐛 systemvar path should not contain revision number

* 🐛 Don't forget break after case

* 🐛 avoid creating zero size image

* 🔥 remove duplicated assertion
2016-05-20 16:42:36 +09:00
tomosu
953a4a705d Use std::unique_ptr instead of UniquePtr in plasticdeformer.cpp (#332)
* replace UniquePtr with std::unique_ptr
2016-05-20 16:18:26 +09:00
Shinya Kitaoka
dd27936d94 Use QOpenGLWidget instead of QGLWidget (#315)
* use QOpenGLWidget instead of QGLWidget for ImageViewer

* use update() instead of updateGL()

* fix doSwapBuffers

* fix HexagonalColorWheel

* fix Viewer

* support AA_ShareOpenGLContexts & AA_EnableHighDpiScaling

* check Qt version
2016-05-19 19:44:34 +09:00
shun-iwasawa
5ddd75cc52 fix magnet tool crash (#324) 2016-05-18 20:45:12 +09:00
shun-iwasawa
fc0e222c4a fix minimize raster memory fragmentation option (#322) 2016-05-18 14:37:27 +09:00
Shinya Kitaoka
12c444ee0d use std::min and std::max (#318) 2016-05-18 13:03:37 +09:00
Keisuke Ogaki
b592dbfa79 Fix creating empty level fails (#317)
* 🐛 Don't forget break after case
2016-05-18 00:51:00 +09:00
Keisuke Ogaki
71a0aa4bb0 🐛 systemvar path should not contain revision number (#316) 2016-05-17 21:38:09 +09:00
shun-iwasawa
c6c5ac3d45 Added menu item 'Toggle Edit in Place' (with small modification) (#306)
* Added menu item 'Toggle Edit in Place'.

This readds the ability to edit Sub-XSheets in place. The menu item has to be
added to the menu of a room, before it can be used.

* small modification
2016-05-17 17:46:32 +09:00
Campbell Barton
14c02ece7f Fix incorrect assignments in if statements (#311) 2016-05-17 14:28:51 +09:00
Shinya Kitaoka
8105532604 add #pragma once (#303) 2016-05-17 00:04:11 +09:00
Shinya Kitaoka
1660e0d627 Fix conflicts (Remove license and edition defines and code) (#291)
* Remove license support, and old editions

Previously, old code to support various editions of Toonz, as well as
license activiation code, was cluttering the repository.
Support for LINETEST is retained.

* fix conflicts
2016-05-16 20:45:31 +09:00
Shinya Kitaoka
7be7e612c4 Fix a version text (Rewrite update check) (#290)
* Rewrite update check

Before release, the update URL will need to be changed to an official
one.

* remove syntax macros: CASE, __OR, and DEFAULT

* define VC_EXTRALEAN

* modify the URL of opentoonz-version.txt

* fix a type of updateUrl

* remove meanless comments
2016-05-16 14:16:01 +09:00
Shinya Kitaoka
d4642c34e8 Remove macros: CASE, __OR, and DEFAULT (#286)
* remove syntax macros: CASE, __OR, and DEFAULT

* define VC_EXTRALEAN

* remove meaningless comments
2016-05-13 19:49:17 +09:00
Keisuke Ogaki
3c21d0ab9c Cmake should be able to be run in other directories (#233)
* enable to run cmake from every directory

* enable to run cmake from every directory
2016-05-13 18:22:50 +09:00
tomosu
b5810ffd5e delete assert(is3DView()) (#289) 2016-05-12 14:45:33 +09:00
shun-iwasawa
0c0a0a798f revert onionskin on xsheet (#280) 2016-05-11 17:43:59 +09:00
tomosu
302138d7c6 add fake mouseReleaseEvent in contextMenuEvent (#285) 2016-05-11 16:45:27 +09:00
Shinya Kitaoka
42c736d27d Merge pull request #260 from ideasman42/cleanup-cmake
CMake: cleanup indentation, remove redundant endif args
2016-05-11 15:25:35 +09:00
Shinya Kitaoka
74a1b285db Merge pull request #278 from jcome/chinese
Chinese (Simplified) UI translation
2016-05-11 15:24:49 +09: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
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
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
6bcca29276 remove glext.h 2016-04-26 22:12:56 +09:00