Commit graph

4023 commits

Author SHA1 Message Date
tomosu
5b8a0fc087 Merge pull request #172 from kogaki/fix/abs
Fix to include cmath
2016-04-13 20:04:55 +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
791cd10a98 Merge pull request #147 from ideasman42/tstroke-remove-redundant-array
Remove redundant array allocation
2016-04-13 14:58:08 +09:00
Shinya Kitaoka
02faf221f5 Merge pull request #135 from kogaki/fix/osx_build
fix OSX build
2016-04-13 14:34:48 +09:00
Shinya Kitaoka
56e1f6df66 remove freeze() 2016-04-13 14:28:07 +09:00
kogaki
9fbffc4177 Merge pull request #163 from xenogenesi/fix-sceneviewer-rightbtn
non-windows: fake mouse right release event on contextMenuEvent
2016-04-13 14:19:52 +09:00
Shinya Kitaoka
bb0ccfd485 Merge branch 'janisozaur-stringstream' into fix/remove-strstream 2016-04-13 14:19:41 +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
8c5f687a8c Merge pull request #117 from jpumc/patch-oos-build-1
Fix CMAKE_MODULE_PATH for out-of-source build
2016-04-13 14:14:56 +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
Shinya Kitaoka
bbf7b2dac8 Merge pull request #120 from ideasman42/linux-preproc-error-fix
Use #error directive instead of explicit syntax error
2016-04-13 14:12:16 +09:00
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
Shinya Kitaoka
6aada0ab29 use unique_ptr<> 2016-04-13 13:30:02 +09:00
Shinya Kitaoka
8e8a63e4a4 Merge branch 'marcab-master' into fix/motionblurfx 2016-04-13 13:17:08 +09:00
shun_iwasawa
7a9c88552b create custom menubar from xml file 2016-04-13 11:45:28 +09:00
xenogenesi
456038b5ce non-windows: fake mouse right release event 2016-04-12 18:11:03 +02:00
John Davidson
9980bf84e0 Use 'delete' on a 'new' object in motionblurfx.cpp. 2016-04-11 23:10:16 -07:00
Campbell Barton
d0e335dfee Fix include case 2016-04-12 02:58:51 +10:00
Campbell Barton
0648b484bf Use if defined(...) style 2016-04-12 02:56:45 +10:00
Campbell Barton
acc5e60836 Remove ifdef's for cstring includes
These are needed on Linux for memcpy, memmove etc... but not unique to Linux of course.
2016-04-12 02:56:45 +10:00
Campbell Barton
b66df2a0d6 Use strtok_r for Linux
Makes sense to use same logic for OSX and Linux
2016-04-12 02:56:45 +10:00
Campbell Barton
107701249b Basic edits for Linux portability 2016-04-12 02:56:45 +10:00
walkerka
0786d1117e added a "Save All" menu which saves current scene and all the levels. 2016-04-08 21:32:25 +08: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
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