razzaline/tahoma2d
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity
380 commits 2 branches 1 tag 122 MiB
Commit graph

65 commits

Author SHA1 Message Date
shun-iwasawa
6b7c9c5724 New option to retain original styles when loading color model's palette (#407) 
* make "append default palette" to be optional

* new option for loading raster img to color model

* remove unused sources

* add japanese translations
 2016-06-07 18:43:49 +09:00
turtletooth
1526ec939f Changed default resolution to 1920 x 1080 (#385) 
* Changed default resolution

* Resizes view to fit the window on the first time it is shown only.  Otherwise new resolution may seem too big.
 2016-06-07 17:46:11 +09:00
Shinya Kitaoka
9eb50de5fe Use std functions (#297) 
* use std functions

* replace toInt        to std::stoi
* replace toDouble     to std::stod
* replace toString     to std::to_string
* replace toWideString to std::to_wstring

* fix for MacOS

* cosmetic change
 2016-06-07 16:06:00 +09:00
turtletooth
8d9ba3307e Rooms Selection (#378) 
* Start of room choice in preferences

* Menu almost working

* Rooms Selection Working

* Removed unneeded preferences file

* Default Name for Rooms

* Rename Default room folder

* Fixed Reset to Default Rooms to reset current Roomset
 2016-06-02 20:36:29 +09:00
Shinya Kitaoka
210a8af034 Use QGLWidget instead of QOpenGLWidget (#337) 
* use QGLWidget instead of QOpenGLWidget for PlaneView

* fix ImageViewer and HexagonalColorWhell
 2016-05-25 18:19:38 +09:00
Banbury
d26accb4e8 Added checkbox 'Global Key' to edit tool. (#300) (#308) 
* Added checkbox 'Global Key' to edit tool. (#300)

The code for the global key option was still in place. The only thing missing
was the checkbox in the tool options.
 2016-05-24 20:29:28 +09:00
Keisuke Ogaki
5ff9a72ca5 get layer name encoding from preference 2016-05-24 16:26:30 +09:00
Keisuke Ogaki
0c8292e173 Revert "Use QOpenGLWidget instead of QGLWidget" (#350) 2016-05-23 16:19:32 +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
Shinya Kitaoka
12c444ee0d use std::min and std::max (#318) 2016-05-18 13:03:37 +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
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
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
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
Campbell Barton
ea4f7e9dc2 Cleanup: gcc's -Wcomment warnings 2016-04-27 10:54:30 +10: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
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
Michał Janiszewski
50e38f736b Plug some memory leaks 2016-04-25 21:54:56 +02: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
Campbell Barton
07f3e872bd Minor changes to preproc checks needed for building on Linux 2016-04-24 16:33:04 +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
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
Shinya Kitaoka
eabf183e6e fix namespace 2016-04-20 10:24:52 +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
9f5a1bd760 use _WIN32 instead of WIN32 2016-04-20 10:24:44 +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
Shinya Kitaoka
5f2af016ab add move constructors 2016-04-19 16:54:53 +09:00
tomosu
794bf5dc65 fix vector preview problems 2016-04-18 17:22:43 +09:00
shun_iwasawa
0133209a76 Merge remote-tracking branch 'origin/master' into revert_room_feature 2016-04-18 17:09:56 +09:00
Shinya Kitaoka
07d4ebbb34 Merge pull request #186 from ideasman42/linux-include-auto_ptr-fix 
Include memory, needed for auto_ptr references
 2016-04-18 13:29:40 +09:00
shun_iwasawa
dde155b61c enable customizing menubar 2016-04-18 12:17:03 +09:00
Campbell Barton
40cabe2c56 Include memory, needed for auto_ptr references 2016-04-17 15:56:16 +10:00
Shinya Kitaoka
94f329e8fb fix tsound_mac.cpp 2016-04-15 18:03:25 +09:00
Shinya Kitaoka
387b337fba fix TOStream 2016-04-15 17:38:33 +09:00
Shinya Kitaoka
c3fda32ba4 fix TOfflineGL::Imp 2016-04-15 14:42:51 +09:00
Shinya Kitaoka
a85aeb719a Merge remote-tracking branch 'upstream/master' into fix/reduce-boost-dependencies 
# Conflicts:
#	toonz/sources/include/tfarmtask.h
 2016-04-15 14:28:42 +09:00
Shinya Kitaoka
06e491a6f7 Merge pull request #62 from ideasman42/linux-header-case-fix 
Linux: Use correct upper/lower case for includes
 2016-04-15 13:42:35 +09:00
Shinya Kitaoka
e938cfcdc7 Merge pull request #63 from ideasman42/linux-basic-portability 
Linux: Basic portability edits
 2016-04-15 13:42:07 +09:00