Commit graph

4042 commits

Author SHA1 Message Date
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
shun_iwasawa
b05ca51266 revert room edit feature 2016-04-07 16:09:59 +09:00
Campbell Barton
5db682049d Remove redundant array allocation 2016-04-07 14:38:39 +10:00
shun_iwasawa
0732762e90 Merge remote-tracking branch 'origin/master' into fix_loading_reslist 2016-04-06 13:58:55 +09:00
shun_iwasawa
2e13bcc2f6 fix loading reslist 2016-04-06 13:53:42 +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
Keisuke Ogaki
9cb85ebe60 fix OSX build 2016-04-04 19:34:40 +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
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
Michał Janiszewski
df394d6939 Move to stringstream
std::strstream is deprecated, stringstream is the suggested replacement.
2016-04-03 02:22:18 +02: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
Campbell Barton
42d601e918 Use #error preprocessor
We had a report (that I can't confirm), that this caused errors.
Best to use `error` here.
2016-04-01 05:19:41 +11:00
Tom Byrer
160f503233 + english website & Google forum links 2016-03-31 09:04:36 -06:00
jpumc
a8cd98dd0c Fix CMAKE_MODULE_PATH for out-of-source build 2016-03-31 17:09:25 +03: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
Gabriel Gazzán
d9d05a72fe Spanish UI - toonzlib.ts [100%] 2016-03-29 13:10:29 -03:00
Gabriel Gazzán
27e293b565 Spanish toonzqt.ts - minor fix 2016-03-29 03:50:52 -03:00
Gabriel Gazzán
720ea50bec Spanish UI toonzqt.ts - [100%] 2016-03-29 03:07:31 -03:00
Campbell Barton
b696885d9a Fix error with ifdef blocks
noted by @linkmauve
2016-03-29 15:49:16 +11: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
Gabriel Gazzán
3d229965a5 Spanish UI colorfx.ts - [100%] 2016-03-28 13:40:18 -03: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
Gabriel Gazzán
5b89978306 Spanish translation - tnztools.ts [100%] 2016-03-27 22:05:15 -03:00
Gabriel Gazzán
99a642865e Spanish translation - tnzcore.ts [100%] 2016-03-27 22:04:34 -03:00
Gabriel Gazzán
a31c6d5bd6 Spanish UI translation - [0%]
Initial commit, copied from the Italian folder.
All strings in files reverted to suggested translations.
2016-03-27 19:25:18 -03: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
Campbell Barton
1db1c004b9 Linux: frameserver memory fix 2016-03-27 11:17:15 +11:00