shun-iwasawa
57bc09cd02
make filesystemwatcher optional ( #1060 )
2017-03-08 12:32:25 +09:00
shun_iwasawa
3f8574e522
fix import scene
2017-02-27 16:27:07 +09:00
jabarrera
53e290644c
Checks data sound is valid to save. Issue #957 ( #971 )
...
close #957
2017-02-27 14:24:11 +09:00
jabarrera
15baedffe1
Fixes crash in History Panel when a level is unlinked. ( #975 )
...
close #965
2017-01-31 21:12:59 +09:00
shun_iwasawa
3639da6d5a
arrowkey to shift cell selection, input w/o dblclk
2017-01-19 17:46:54 +09:00
shun_iwasawa
a3cdd885f5
added color filter feature and modified composition with colorscale
2017-01-16 20:33:23 +09:00
Jeremy Bullock
8e6dfb6112
Merge pull request #945 from shun-iwasawa/mod_fieldguide
...
Change the default size of field guide
2016-12-08 00:01:06 -07:00
Jeremy Bullock
1d47b826ed
Clear project folder of non-project files ( #701 )
...
* clear project folder of non-project files, moving them from projects to config
2016-12-02 13:09:13 +09:00
shun_iwasawa
fe1261a638
modify field guide's default value
2016-12-02 13:01:04 +09:00
masafumi-inoue
297fcfe29e
Merge pull request #908 from shun-iwasawa/fix_convert_to_painted_tlv
...
Fix style removal problem on Convert to Painted TLV from non AA source
2016-11-11 16:52:46 +09:00
shun_iwasawa
22ad9ee8ef
fix convert to painted tlv
2016-11-09 16:20:58 +09:00
Jeremy Bullock
3bb5efc4ee
Quick Export Feature ( #725 )
...
* Added Fast Render to MP4 command which does not need to set anything in output settings.
2016-11-09 11:46:03 +09:00
shun_iwasawa
7d08f6e97e
small fixes and change default shortcuts
2016-11-02 15:32:21 +09:00
shun_iwasawa
7292b3f0dc
Merge remote-tracking branch 'origin/master' into numpad_for_palette_shortcut
2016-10-31 19:57:30 +09:00
Jeremy Bullock
c21b57cc2f
Merge pull request #853 from shun-iwasawa/convert_to_painted_tlv
...
Improved convert command from non AA raster images to painted tlv
2016-10-28 12:42:07 -06:00
Jeremy Bullock
128b64d4da
Merge pull request #879 from shun-iwasawa/save_fmtprops_to_prj
...
Fix Save Default Settings command to save format properties to project settings
2016-10-28 10:09:42 -06:00
Jeremy Bullock
7e1154bda4
Fix for FFmpeg renders wrong range if previous exported range was bigger ( #814 )
...
* fix render using old render range for changed range
2016-10-28 14:53:33 +09:00
Jeremy Bullock
2c13b22d29
Merge pull request #868 from shun-iwasawa/loadscene
...
Fix Load Scene popup to initialize correctly
2016-10-27 08:23:21 -06:00
shun_iwasawa
53bef61327
Merge remote-tracking branch 'origin/master' into numpad_for_palette_shortcut
2016-10-26 20:54:28 +09:00
shun_iwasawa
d4ffc77bb9
save format properties
2016-10-21 20:50:52 +09:00
Jeremy Bullock
bfe8613d31
Startup popup when OT starts ( #793 )
...
* startup popup which provides quick access to new project, new scene and open recent scenes.
2016-10-18 15:29:19 +09:00
shun_iwasawa
472b705fd5
fix load scene for relative project folder
2016-10-18 12:02:45 +09:00
Jeremy Bullock
e8903b4e25
Shortcuts Selection Choice and Proposed New Shortcuts ( #691 )
...
* Enabled to save shortcuts and to select from shortcut configurations of other softwares
2016-10-07 20:45:49 +09:00
shun_iwasawa
1fa45a0da6
add remove unused styles option
2016-10-03 21:04:35 +09:00
Jeremy Bullock
63610baef4
Merge pull request #764 from shun-iwasawa/organize_palette
...
"Organize palette" and "Update colors by using picked position" features for the workflow using raster level as a color model
2016-10-02 22:33:36 -06:00
Jeremy Bullock
b84282fcc8
Merge pull request #817 from shun-iwasawa/turtletooth-stylelink
...
Modified: Linked styles enabled and style right click menu organized by turtletooth
2016-09-28 22:48:36 -06:00
Campbell Barton
4cdcb009ef
Fix/Workaround bug #591
...
We could check for the extensions but these OpenGL options are never used,
so no need to disable them.
2016-09-29 07:01:26 +10:00
Jeremy Bullock
33e7d1707e
Save settings updated - Updated and Fixed ( #474 )
...
* Auto-save settings updated - now auto-save will save not only the current scene but also all levels, according to preferences option.
N.B. Note that the default value of "Automatically save non-scene files" is ON. Please make sure to disable it if you would like to automatically save the scene only.
2016-09-26 17:35:34 +09:00
shun_iwasawa
9f19cf15da
small fixes
2016-09-20 17:32:21 +09:00
Jeremy Bullock
e59b1fa741
Additional Project Root Location ( #664 )
...
Enabled to select additional project root location via Preferences.
close #736
2016-09-15 18:56:03 +09:00
shun_iwasawa
4635d82930
numpad for palette shortcut
2016-09-12 19:51:52 +09:00
MCCCS
a0ce326e1b
🐛 Fix spelling mistakes
2016-09-07 16:28:50 +03:00
Campbell Barton
4121b4ed18
Merge pull request #723 from ckorn/format
...
Add format string literal
2016-09-01 17:47:40 +10:00
Jeremy Bullock
48c6fc0de2
Typo fixes ( #531 )
...
* Typo fixes for the file access warning
close #501
2016-09-01 14:24:19 +09:00
shun_iwasawa
c53f280f96
Merge remote-tracking branch 'origin/master' into organize_palette
2016-08-26 21:01:24 +09:00
shun_iwasawa
9cbd0e8743
organize_palette 4
2016-08-26 20:59:54 +09:00
Jeremy Bullock
1bad81ba81
Merge pull request #739 from shun-iwasawa/stageinch2
...
Introducing Stage::standardDpi instead of updating Stage::inch
2016-08-23 21:17:05 -06:00
shun-iwasawa
5e2a8ff232
Improvement of direct inputting feature in Xsheet ( #722 )
...
* improve xsheet direct input
* small fix
2016-08-19 18:31:00 +09:00
shun_iwasawa
98ad89fbd3
Merge remote-tracking branch 'origin/master' into stageinch2
2016-08-19 12:33:38 +09:00
shun_iwasawa
e897af4ff2
organize palette 3
2016-08-18 20:25:44 +09:00
Jeremy Bullock
17d8f9dfaf
Disable onionskin during playback ( #708 )
...
* disable onionskin during playback
* added option to show onion skin during playback in preference
close #486
2016-08-18 18:41:31 +09:00
shun_iwasawa
bb0d83547a
add dpi compatibility check and remove comment
2016-08-18 17:27:10 +09:00
shun_iwasawa
4b846056c9
Merge remote-tracking branch 'origin/master' into organize_palette
2016-08-16 18:41:23 +09:00
shun_iwasawa
d6df3f9261
introducing stage-standarddpi
2016-08-16 13:52:38 +09:00
Christoph Korn
c17229f066
Add format string literal
...
Prevents security issues when the string contains
format specifiers.
Fixes: warning: format not a string literal and
no format arguments [-Wformat-security]
2016-08-10 22:30:04 +02:00
shun-iwasawa
27b0cfd38c
clang formatting ( #703 )
2016-08-04 16:23:36 +09:00
shun_iwasawa
ff185f4824
Merge remote-tracking branch 'origin/master' into organize_palette
2016-07-29 17:25:00 +09:00
shun_iwasawa
48c6711cad
organize palette 2
2016-07-29 17:23:11 +09:00
turtletooth
04d8fdc45c
FFmpeg Integration - mp4, webm, gif ( #624 )
...
* Webm and Gif Export
* added intermediate jpg conversion to save hard drive space
* Started preferences ffmpegPath selection
* grouped ffmpeg files together
* Working with intermediate format
* Fixed running multiple CPU cores for export
* audio works
* all working, need refactoring and error checking
* Changed Qt includes
* revisited Qt includes
* Clean up code, refactor file cleanup, clean up includes
* started gif import
* import working
* Removed import again, fixed export settings being remembered
* import working, bypassed precompute, back to single core export
* clang formatting applied
* added beta warnings in Preferences Popup
* fixed frame flipping and made looping gif default
* added toonzlibs
* added format checks
* added check to help t32bitsrv crash
* sliders for settings are back
* added customizable timeout for ffmpeg
* fixed gif fps and scale for no palette
2016-07-29 14:35:10 +09:00
Campbell Barton
9ece9c0c92
Cleanup: CMake style
...
Use parens on newline, avoids diff-noise when adding values.
2016-07-23 04:59:47 +10:00
turtletooth
fef27f08d4
changed default icon size to 16 by 9 ( #662 )
2016-07-22 17:20:38 +09:00
Campbell Barton
8c6c57f1b4
Enable missing-declarations warning ( #643 )
...
Finish ensuring symbols use headers correctly
2016-07-22 13:38:33 +09:00
Shinya Kitaoka
0f12b3ee16
use new context ( #659 )
2016-07-21 10:34:09 +09:00
Shinya Kitaoka
2a7129aa92
use std::unique_ptr<> instead of std::auto_ptr<> ( #601 )
2016-07-20 21:49:32 +09:00
shun_iwasawa
c382b8addd
Merge remote-tracking branch 'origin/master' into organize_palette
2016-07-20 12:47:43 +09:00
tomosu
8d9526db1b
add doneCurrent in fx and raster code ( #636 )
2016-07-14 17:42:21 +09:00
shun-iwasawa
535d3f26d8
Merge pull request #400 from turtletooth/pixels
...
Add pixels - Finished.
2016-07-14 12:40:30 +09:00
Campbell Barton
b3bd842e04
Make functions static, ensure declarations match headers ( #610 )
...
This patch used -Wmissing-declarations warning
to show functions and symbols that had no declarations, and either:
- Make static
- Add to header
This helps avoid possability that declarations and functions get out of sync.
And ensures all source files reference headers correctly.
It also makes sure functions defined with extern "C",
have this defined in the header. An error found in calligraph.h while writing this patch.
This has been applied to toonzlib, to avoid making very large global changes.
If accepted, -Wmissing-declarations warning could be added to CMake.
2016-07-13 21:05:06 +09:00
Jeremy Bullock
2e52c6995c
reverted default units
2016-07-13 00:38:17 -06:00
Jeremy Bullock
59dbbf498a
Clang formatting applied
2016-07-12 21:09:46 -06:00
shun_iwasawa
06bcc2ea0a
organize palette 1
2016-07-11 18:55:17 +09:00
Campbell Barton
a9c3dad75a
CMake: differentiate system includes ( #604 )
2016-07-09 00:47:11 +09:00
Shinya Kitaoka
7abdb2380a
Merge pull request #547 from ideasman42/warn-undefined-pr
...
Quiet -Wundef warning
2016-07-06 20:42:14 +09:00
Shinya Kitaoka
c08330d1ae
Merge pull request #567 from opentoonz/cmake-cleanup-defines-pr
...
CMake: use multi-line defines
2016-07-06 13:56:49 +09:00
shun_iwasawa
fd6c3c05ac
revert behavior on dblclking style, and more
2016-07-05 16:15:29 +09:00
Shinya Kitaoka
fd19c4eedf
Support Visual Studio 2015 ( #544 )
...
* Small changes, for some reason VS 2015 can't link cprintf and they added a second function std::map::count and bind couldn't resolve the function. Substituted with a lambda-expression.
* Created all 64bit version of the 3rd party libs.
* Cleanup popup opens CleanupSettings instead of CleanupSettingsPane. Not finished, panel is wrong now (also uses CleanupSettings).
* Tried to get Twain working, failed.
* When there are more then 3 peg holes create additional holes.
* When a hole touches the boundary it should still be considered a hole.
* Do not compare dot size against fixed size. Will not work in some scan resolutions. Used the same value (PERCENT * max dot size) as later in the code in compare_dots.
* When there are more than three peg holes the code looked for the best fit and used that. The problem was, that the middle hole was used as center for auto center. For three peg holes that is correct, but does not work for more than three. Now the best fit is calculated and from there the offset of the middle of the three best fit holes is calculated and applied.
* One of the last changes broke VS2015 compatibility, it chocked on a missing include.
* fix for msvs2013
* revert autopos.cpp
* apply clang-format
* use GIT-LFS
2016-07-04 17:50:30 +09:00
Jeremy Bullock
fdd72e63f6
set pixels as default
2016-07-03 13:48:39 -06:00
Jeremy Bullock
f44848c78d
reverted stage::inch change, should be its own PR
2016-07-03 00:15:54 -06:00
Jeremy Bullock
93c27a36d0
removed debug code
2016-07-02 23:40:23 -06:00
Campbell Barton
f2d492861f
CMake: use multi-line defines
...
Easier to read and avoids merge conflicts
2016-07-02 22:23:18 +10:00
Jeremy Bullock
0049ac939d
removed image dpi modification
2016-06-30 23:49:53 -06:00
Jeremy Bullock
20a966a908
set stage::inch to 120
2016-06-30 23:46:29 -06:00
Jeremy Bullock
b99ed3bab6
added shun-iwasawa's suggestions
2016-06-30 21:41:31 -06:00
Jeremy Bullock
5e3b5e8cc3
Merge branch 'master' into pixels
2016-06-30 20:57:15 -06:00
Campbell Barton
d89022ce19
Fix checking the left-node before operating on the right
2016-07-01 09:38:27 +10: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
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
a6309b14b7
Use std::max_element
2016-06-24 10:35:50 +02:00
tomosu
965183e43c
Merge pull request #475 from skitaoka/refactoring/add-override
...
REFACTORING: add override specifiers
2016-06-23 17:03:53 +09:00
shun-iwasawa
76270a4b64
Merge pull request #395 from turtletooth/palettes
...
Toonz Palettes folder now working and has 3 starter palettes
2016-06-20 15:55:47 +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
turtletooth
2382549b47
Onion Skin default color changed ( #396 )
2016-06-16 16:04:38 +09:00
Jeremy Bullock
946edbcf47
Fixed for 1.0.3
2016-06-15 23:15:05 -06:00
Campbell Barton
22fd3b0447
CMake: changes needed to build on Linux ( #452 )
...
Note that these are the main changes from the linux port.
Not a fully working linux port.
2016-06-16 13:52:02 +09:00
Shinya Kitaoka
120a6e041c
apply clang-format
2016-06-15 15:43:10 +09:00
JosefMeixner
e932c2e9b3
Handle more then 3 peg holes ( #314 )
...
* When there are more then 3 peg holes create additional holes.
* When a hole touches the boundary it should still be considered a hole.
* Do not compare dot size against fixed size. Will not work in some scan resolutions. Used the same value (PERCENT * max dot size) as later in the code in compare_dots.
* When there are more than three peg holes the code looked for the best fit and used that. The problem was, that the middle hole was used as center for auto center. For three peg holes that is correct, but does not work for more than three. Now the best fit is calculated and from there the offset of the middle of the three best fit holes is calculated and applied.
* Changed the type of a variable, missed that when I changed the usage of the variable.
2016-06-14 16:18:10 +09:00
tomosu
eea0acf6fa
Use stringstream instead of strstream ( #431 )
...
* replace strstream with string stream
* all change
Signed-off-by: tomosu <tomosu@users.noreply.github.com>
* small changes
2016-06-13 21:50:05 +09:00
Shinya Kitaoka
ee259ffaf7
remove duplicated constants ( #296 )
2016-06-13 21:37:09 +09:00
shun-iwasawa
99b9e225b0
enable debug build ( #421 )
2016-06-08 17:51:40 +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
Banbury
09a48e32a3
Fix: Allow negative frame id in scene.setCell (scripting). ( #345 )
...
This fix is necessary for creating animations in Javascript from raster images
with only one frame. For this Opentoonz expects a frame id of -2.
A frame id of -1 is an empty frame.
The original implementation onyl allows positive numbers.
2016-06-07 17:19:18 +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
Jeremy Bullock
b37830bb62
Toonz Palettes folder now working and has 3 starter palettes
2016-06-02 20:51:51 -06:00
tomosu
e5f7d89527
Keep the consistency of mesh image addr, after save operation ( #380 )
...
* change MESH_XSHLEVEL to be isImageCompatible true
* add comment and split comparison operator return into true and false
2016-06-02 20:37:45 +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
822411ba0e
Support German translation ( #363 )
...
German translations
* Added files via upload
First translation draft. Corrections need to be made with actual in hand program
* Added files via upload
* Japanese characters
正方ピクセルを保持 -> Force Squared Pixel translated as "Quadratische Pixel erzwingen"
* Small spelling error
Blur value ->Weichheitsgrad
* add loc/german/*.qm
* modify loc dir names to their local script
* fixup! update loc/*/*.qm
* fix "Sensitivity"
2016-05-27 14:27:54 +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
Keisuke Ogaki
5ff9a72ca5
get layer name encoding from preference
2016-05-24 16:26:30 +09:00
Keisuke Ogaki
8b06ffc4e3
💄 force encoding in SJIS for psd layer name
2016-05-24 15:11:55 +09:00
Shinya Kitaoka
3fa3e1e9b8
Use "range-based for" instead of iterators ( #339 )
...
* use "range-based for" instead of iterators
* fix assertions
2016-05-23 17:40:49 +09:00
Campbell Barton
5ea53c8c6b
Quiet GCC -Wparentheses warning with assignment ( #310 )
2016-05-20 17:37:59 +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
Shinya Kitaoka
8105532604
add #pragma once ( #303 )
2016-05-17 00:04:11 +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
shun-iwasawa
0c0a0a798f
revert onionskin on xsheet ( #280 )
2016-05-11 17:43:59 +09:00
Campbell Barton
f08982dd33
CMake: cleanup indentation, remove redundant endif args
2016-04-27 21:48:12 +10:00
Shinya Kitaoka
a1c5b0a22d
remove hasOpenGLFramebufferObjects
2016-04-27 18:37:16 +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
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
108c32fcab
create a context
2016-04-27 14:25:50 +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
Campbell Barton
4aa85c3899
Cleanup: -Wwrite-strings warning
2016-04-27 10:55:26 +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
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
36e06f3235
fix "library" and "fxs" folder locations
2016-04-25 18:45:04 +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
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
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
shun_iwasawa
2ca36a7344
small change
2016-04-20 17:30:15 +09:00
shun_iwasawa
2b222ee2c3
Merge remote-tracking branch 'origin/master' into fix_save_mesh
2016-04-20 16:38:27 +09:00
shun_iwasawa
4060ca35fe
fix save mesh
2016-04-20 16:15:01 +09:00
Shinya Kitaoka
eabf183e6e
fix namespace
2016-04-20 10:24:52 +09:00
Shinya Kitaoka
cba6a2c733
fix pointer operation
2016-04-20 10:24:52 +09:00
Shinya Kitaoka
ec43d4d5e6
add #include <cmath>
2016-04-20 10:24:51 +09:00
Shinya Kitaoka
61dd762587
add #include <cmath>
2016-04-20 10:24:50 +09:00
Shinya Kitaoka
c12eacf2f3
remove #define NOMINMAX
2016-04-20 10:24:50 +09:00
Shinya Kitaoka
2148c874dd
remove using namespace std;
from headers
2016-04-20 10:24:48 +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
shun_iwasawa
fe7dd3b14f
fix convert image bug
2016-04-18 23:23:21 +09:00
kogaki
5bbc3c26fa
Revert "Remove strstream"
2016-04-18 22:16:18 +09:00
kogaki
417c1d6f96
Merge pull request #169 from skitaoka/fix/remove-strstream
...
Remove strstream
2016-04-18 19:14:23 +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
Campbell Barton
40cabe2c56
Include memory, needed for auto_ptr references
2016-04-17 15:56:16 +10: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
16a82fca96
Merge branch 'stringstream' of https://github.com/janisozaur/opentoonz into janisozaur-stringstream
2016-04-13 14:18:53 +09:00
Shinya Kitaoka
9c6c0f1688
Merge pull request #132 from janisozaur/parentheses
...
Encapsulate expressions in parentheses
2016-04-13 14:14:19 +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
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
df394d6939
Move to stringstream
...
std::strstream is deprecated, stringstream is the suggested replacement.
2016-04-03 02:22:18 +02:00
Adric Worley
f63c1a0076
Fixes unreferenced local variable warnings.
...
Deleted variables in most cases. Commented out or moved to IFDEF where referenced by existing but disabled code.
2016-03-30 09:25:34 -04:00
roentgen
22e1399821
Merge pull request #2 from opentoonz/mod_qss_problem
...
modification of style sheet problem
2016-03-23 23:49:05 +09:00
shun_iwasawa
6c7e74ae4c
modify qss problem
2016-03-22 15:04:28 +09:00
shun_iwasawa
28dc08231d
modify problem in new project
2016-03-22 12:59:10 +09:00
Toshihiro Shimizu
890dddabbd
first commit
2016-03-19 02:57:51 +09:00