Jeremy Bullock
f44848c78d
reverted stage::inch change, should be its own PR
2016-07-03 00:15:54 -06:00
Jeremy Bullock
733ddbef67
hid gui elements if pixels selected
2016-07-02 23:30:00 -06:00
Jeremy Bullock
20a966a908
set stage::inch to 120
2016-06-30 23:46:29 -06:00
Jeremy Bullock
5e3b5e8cc3
Merge branch 'master' into pixels
2016-06-30 20:57:15 -06:00
Michał Janiszewski
dfbb44814b
Mark TTileSet destructor as virtual
...
This class gets inherited, yet the destructor is not marked as virtual.
2016-06-30 17:17:40 +02:00
Campbell Barton
d869b5f8e6
Quiet -Wundef warning
...
Exposes accidental typos when checking exact values of a define.
2016-06-30 12:28:26 +10:00
Campbell Barton
f493896cc0
Cleanup: typo (sensibility)
2016-06-29 20:49:17 +10:00
Shinya Kitaoka
00c547d5c1
Merge pull request #521 from janisozaur/aligner-type
...
Rename aligner_type redefinitions
2016-06-29 18:55:30 +09:00
Shinya Kitaoka
d1f6c4e95b
REFACTORING: Add final
specifiers ( #537 )
...
* add final specifiers
* apply clang-format
* fix for macOS
2016-06-29 15:17:12 +09:00
Michał Janiszewski
5387bee4bd
Rename aligner_type redefinitions
2016-06-27 08:33:20 +02:00
shun-iwasawa
c86c5d6189
Organizing the Tool option bar layout ( #443 )
...
* edit tool, selection tool, brush tool
* other tools
* include cmath
2016-06-27 15:22:54 +09:00
tomosu
f0ee5d1373
Merge pull request #506 from skitaoka/fix/use-atomic
...
Use std::atomic instead of native implementations
2016-06-24 16:25:55 +09:00
Michał Janiszewski
d37dbb57f2
Add missing override
specifier
2016-06-23 13:41:27 +02:00
Shinya Kitaoka
0d7879fb9b
Merge pull request #495 from shun-iwasawa/revert_planeviewer
...
(incompletely) Fix crash on using Shader Fx
2016-06-23 17:06:54 +09:00
Shinya Kitaoka
652c93c8f8
fix build for windows
2016-06-23 15:19:53 +09:00
shun_iwasawa
2bdc044b89
revert planeviewer to inherit qglwidget
2016-06-22 20:46:24 +09:00
Shinya Kitaoka
38fd868138
apply clang-format
2016-06-20 11:34:17 +09:00
Shinya Kitaoka
473e70432a
add override specifier
2016-06-20 11:34:15 +09:00
Jeremy Bullock
7c096e2b82
starter interface options
2016-06-18 21:47:11 -06:00
Michał Janiszewski
d8b454fc1b
Change atomic_t to be of std::atomic<long> type
2016-06-17 12:42:25 +02:00
Michał Janiszewski
163bdb9319
Simplify atomic code to rely on C++11-provided std::atomic
2016-06-17 12:20:41 +02:00
turtletooth
0bae6721d5
Level Create Popup now sets default name and updates paths correctly ( #437 )
...
* Starter level name working. Double check folder paths.
* New Level Dialog now works as expected added focus on save dialog also
2016-06-17 17:58:06 +09:00
Campbell Barton
deffae3359
Linux ifdef and defines ( #454 )
2016-06-17 17:48:03 +09:00
Shinya Kitaoka
120a6e041c
apply clang-format
2016-06-15 15:43:10 +09:00
Shinya Kitaoka
ee259ffaf7
remove duplicated constants ( #296 )
2016-06-13 21:37:09 +09:00
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
Shinya Kitaoka
262a92f130
use smart pointer for m_imp
2016-04-14 19:15:09 +09:00
Shinya Kitaoka
d57726081c
remove BOOST_NO_RVALUE_REFERENCES
2016-04-14 16:55:33 +09:00
Shinya Kitaoka
e5734ac437
replace smart pointers
2016-04-14 16:51:50 +09:00
Keisuke Ogaki
e76b224937
fix to include cmath
...
this fixes commit#6dca1d3a6d64f6b55d5545fd209acc0f81aab9ec
in OSX, need to include cmath to use std::abs
2016-04-13 19:25:54 +09:00
Shinya Kitaoka
9c6c0f1688
Merge pull request #132 from janisozaur/parentheses
...
Encapsulate expressions in parentheses
2016-04-13 14:14:19 +09:00
Shinya Kitaoka
6dca1d3a6d
Merge pull request #131 from janisozaur/abs
...
Fixes for abs()
2016-04-13 14:12:56 +09:00
Campbell Barton
d0e335dfee
Fix include case
2016-04-12 02:58:51 +10:00
Campbell Barton
107701249b
Basic edits for Linux portability
2016-04-12 02:56:45 +10:00
shun_iwasawa
22eaa48951
revert schematic output port
2016-04-04 19:03:52 +09:00
Michał Janiszewski
b1cc3ceeac
Encapsulate expressions in parentheses
...
Some expressions appear to be confusing, adding parentheses removes
doubt in those cases.
2016-04-03 02:24:43 +02:00
Michał Janiszewski
0585eef453
Fixes for abs()
...
abs() only returns integer values, while arguments and results are real
in the cases fixed.
Also fixes some unexpected tokens after `#endif`.
2016-04-03 02:23:59 +02:00
kusano
92d713df09
Remove unused members in TFlash
2016-03-24 00:49:38 +09:00
kusano
a0ab5dec40
Fix the compile error in tflash.h
...
Member functions with argument of vector<TSegment> or vector<TQuadratic> cannot be inline defined.
2016-03-24 00:43:29 +09:00
brly
9e73b85832
Remove TFlash::Imp class and sources/common files
2016-03-23 23:32:56 +09:00
Toshihiro Shimizu
890dddabbd
first commit
2016-03-19 02:57:51 +09:00