Commit graph

131 commits

Author SHA1 Message Date
Shinya Kitaoka
7ac5ba3eff Merge pull request #111 from OriginalAdric/fix_unrefd_locals
Fix unreferenced locals/labels warnings
2016-04-13 14:11:27 +09:00
Shinya Kitaoka
818c53f8aa Merge pull request #95 from kusano/fix-lzocompress
Fix crash of lzocompres and lzodecompress
2016-04-13 14:10:51 +09:00
Shinya Kitaoka
5f610203fc Merge pull request #70 from ideasman42/cmake-whitespace-cleanup
CMake: use spaces for indentation & whitespace edits
2016-04-13 14:10:04 +09:00
kogaki
79d38796c4 Merge pull request #150 from henrich/master
remove unnecessary backup files (.bak)
2016-04-08 20:44:15 +09:00
tomosu
5545c5bfbd Merge pull request #151 from kogaki/fix/cmake_png_include
Fix cmake to be able to search custom libpng include path
2016-04-08 20:25:58 +09:00
kogaki
6f84e74154 Merge pull request #152 from tomosu/fix_rclick_osx
add clean-up at the end of SceneViewer::contextMenuEvent for OSX
2016-04-08 20:08:09 +09:00
tomosu
cb0b4d066f change clean-up location and add comment 2016-04-08 19:51:23 +09:00
tomo-suzuki
e6f45b6a60 add clean-up at the end of SceneViewer::contextMenuEvent 2016-04-08 11:56:21 +09:00
Keisuke Ogaki
b22d0cfb59 Add libpng include path search 2016-04-08 00:17:03 +09:00
Hideki Yamane
2dcddaf334 remove unnecessary backup files
It should be removed before upload... :)
2016-04-08 00:02:11 +09:00
Yuri Odagiri
6cd606de62 Merge pull request #47 from camjc/master
Fix: User facing typos throughout application
2016-04-06 12:19:10 +09:00
kogaki
74757bfa9d Merge pull request #141 from opentoonz/unformat-libtiff
Unformat thirdparty/tiff-4.0.3/libtiff/tif_getimage_64.c
2016-04-05 17:17:10 +09:00
shun-iwasawa
4095f67b3e Merge pull request #136 from opentoonz/revert_schematic_output_port
Reverting Harlequin's stage schematic output ports (with letters)
2016-04-05 16:26:55 +09:00
shun_iwasawa
49ff76e3d3 Merge remote-tracking branch 'origin/master' into revert_schematic_output_port 2016-04-04 19:05:17 +09:00
shun_iwasawa
22eaa48951 revert schematic output port 2016-04-04 19:03:52 +09:00
kogaki
81d9668757 Merge pull request #112 from opentoonz/fix-compile-error-on-clang-by-invalid-constructor
Fix compile error on clang
2016-04-04 19:00:34 +09:00
kogaki
da8c4b871f Update README.md 2016-04-04 16:55:31 +09:00
Yuri Odagiri
c0b0beedf4 Merge pull request #118 from tomByrer/patch-1
+ english website & Google forum links
2016-04-01 15:45:38 +09:00
Tom Byrer
160f503233 + english website & Google forum links 2016-03-31 09:04:36 -06:00
Toshihiro Shimizu
29896c020f Merge pull request #116 from skitaoka/english-readme
English README (merge #54 and #68)
2016-03-31 19:52:57 +09:00
Shinya Kitaoka
f262518ff0 merge #54 and #68 2016-03-31 19:29:46 +09:00
Shinya Kitaoka
00edc48870 move *.md files into a doc directory 2016-03-31 19:16:42 +09:00
Shinya Kitaoka
8dd1e50791 Merge branch 'm-grimaud-master' 2016-03-31 19:13:32 +09:00
Shinya Kitaoka
5a95ba6532 Merge branch 'master' of git://github.com/m-grimaud/opentoonz into m-grimaud-master
# Conflicts:
#	README.md
2016-03-31 19:13:05 +09:00
Shinya Kitaoka
effb83161d Merge branch 'gguillotte-readme-en' 2016-03-31 19:09:31 +09:00
Shinya Kitaoka
0026a4a07a Merge branch 'readme-en' of git://github.com/gguillotte/opentoonz into gguillotte-readme-en 2016-03-31 19:08:14 +09:00
brly
fed8a75dde Fix compile error on clang
Avoid 'chosen constructor is explicit in copy-initialization' error.
2016-03-31 01:24:00 +09:00
Toshihiro Shimizu
906ba54d9d Update README.md 2016-03-31 00:48:57 +09:00
Adric Worley
fe9b8bc573 Fixes unused label warning.
Commented out instead of deleted, as label is referenced by FIXME comment and associated goto on lines 82-84.
2016-03-30 09:28:32 -04: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
kusano
ca9c32c273 Unformat thirdparty/tiff-4.0.3/libtiff/tif_getimage_64.c
to compare with original tif_getimage.c.
2016-03-30 15:11:52 +09:00
roentgen
46416c1cad Merge pull request #64 from ideasman42/linux-resource-case-fix
Linux: Use lowercase for all resources (failed to build)
2016-03-30 02:09:49 +09:00
roentgen
881afa65d0 Merge pull request #85 from mich181189/fix-tiff-osx
Fix build when libtiff exists on system
2016-03-29 12:43:26 +09:00
kusano
d191aadc04 Fix crash of lzocompres and lzodecompress
Without stdlib.h malloc is assumed to return int, which is not compatible with void * in x64.
2016-03-29 06:55:29 +09:00
Grimaud
7c38905d3c Readme Translated, Squashed 2016-03-28 16:01:40 -05:00
Michael Cullen
b49802832b Fix build when libtiff exists on system
On OSX at least, if you have libtiff in your system include path,
it will use that instead of the bundled modified version even if
FindTIFF.cmake locates the correct version. This commit fixes that
by making sure the libtiff include directory is before the system
include paths.
2016-03-28 14:50:54 +01:00
Garrett Guillotte
c6df3f6f42 Add English README. 2016-03-27 14:06:12 -07:00
Campbell Barton
3dcf6bfa09 CMake: use tab indentation & whitespace edits 2016-03-27 14:44:29 +11:00
Campbell Barton
cc5860ee72 Use lowercase for all resources (failed to build on Linux) 2016-03-27 11:50:14 +11:00
roentgen
25e5605c50 Merge pull request #36 from ArseniyShestakov/fix-cmake-lettercase
Fix letter case in CMakeLists.txt
2016-03-27 02:11:52 +09:00
roentgen
c26f34a66e Merge pull request #52 from kusano/fix-crash
Fix crash in initializing
2016-03-27 01:55:59 +09:00
kusano
ffc911474d Fix crash in initializing
In some enviroment, access violations occures in ICOpen.
Althogh this code seems to intended to handle SEH, structured exceptions are not catched in current configulation.
2016-03-27 01:02:54 +09:00
Cameron Chamberlain
bfee0019b7 Fix: User facing typos throughout application
- inbeteween -> inbetween
- abount -> about
- seleted -> selected
- successfull -> successful
- undefinied -> undefined
- colonnesdoivent (fr) -> colonnes doivent
- seleted (fr) -> sélectionnés
- cleeanup -> removed from translations,
  wasn't translated anyway and
  was removed from english codebase
2016-03-26 22:30:38 +11:00
Arseniy Shestakov
5e9e969bb2 Fix letter case in CMakeLists.txt 2016-03-26 06:16:40 +03:00
roentgen
7e185111a8 Merge pull request #33 from opentoonz/export-pluginsdk
added package_sdk.sh to export the sdk. and toonz_plugin_helper*.h ar…
2016-03-25 20:28:53 +09:00
roentgen
edd579074d added package_sdk.sh to export the sdk. and toonz_plugin_helper*.h are moved to utils dir to plublic developers 2016-03-25 20:25:20 +09:00
Toshihiro Shimizu
6297b87921 Merge pull request #32 from opentoonz/add-how-to-build-macosx
Add how to build for OSX
2016-03-25 19:59:44 +09:00
brly
4cc5480d7a Add how to build for OSX 2016-03-25 19:56:04 +09:00
Toshihiro Shimizu
8465787d9c Merge pull request #31 from opentoonz/add-readme
Add README.md
2016-03-25 19:49:44 +09:00
kusano
52ff6ee6d4 Fix README.md 2016-03-25 19:47:54 +09:00