Commit Graph

30 Commits

Author SHA1 Message Date
minggo 1042b18999 Merge pull request #15936 from mogemimi/use-nullptr-instead
Use nullptr instead of 0 or NULL whenever possible
2016-06-24 09:54:15 +08:00
mogemimi cbc0612306 Use nullptr instead of 0 or NULL 2016-06-23 12:39:23 +09:00
mogemimi f0028e5459 Fix unused variable warnings when compiling release mode 2016-06-20 09:23:42 +09:00
TheCodez 7885f55ce5 Cache bas64 images 2016-06-06 16:32:50 +02:00
mogemimi bbbb7e498d Prevent variable shadowing warnings 2016-05-08 12:32:36 +09:00
halx99 fc9880ab49 Add captureNode for cocos2d::utils (#15558)
* Add captureNode for cocos2d::utils

Add captureNode for cocos2d::utils and fix CC_DLL syntax.

* Add test case for utils::captureNode

Add test case for utils::captureNode.

* Store captured image to disk with RGB.

* Trigger jenkins check
2016-05-07 22:10:53 +08:00
halx99 9ff61f915c Add findChild for cocos2d::utils (#15548)
* Add searchNode for cocos2d::utils

Add searchNode for cocos2d::utils

* fix compile error on win32_bak

* convert line terminates to unix sytle.

* Rename searchNode to findChild, and etc.

* fix compile error.
2016-05-04 09:46:00 +08:00
Wenhai Lin 4fa58602a8 Adds `std::nothrow` to the `new` statements 2015-12-16 14:02:55 +08:00
Neo Kim 76acb91861 Move `createSpriteFromBase64()` from `UIScrollViewBar.cpp` to `ccUtils.h` in order to use it in other places. 2015-10-28 16:56:35 +09:00
Martin Taylor 62e36e8006 fix typos and syntax error. A thorough check by tool VSSpellChecker. 2015-09-22 16:08:23 +08:00
Vincent Yang 7a105ce1e1 fixed #11310 : multiple camera case utils::captureScreen bug. 2015-07-15 12:09:08 +08:00
子龙山人 3adecedcee Merge pull request #12776 from fusijie/refine_capture
CaptureScreen save in thread.
2015-07-10 17:03:18 +08:00
Jacky 9eb5a1833b fix malloc failed need to call afterCaptured callback. 2015-07-10 11:21:03 +08:00
Neo Kim a01f31c75c Change NULL to nullptr 2015-07-06 15:54:28 +09:00
andyque 30d2129f0c improve indent and getTime function 2015-06-29 11:52:53 +08:00
Vladimir Perminov d2b58dd39b CaptureScreen save file in thread
Check already working
Start save file in AsyncTaskPool::TaskType::TASK_IO
2015-05-17 20:48:49 +03:00
Dale Stammen 351a898a70 removed CC_PLATFORM_WP8 2015-05-08 09:19:13 -07:00
SunLightJuly f9fbb1b789 call getCascadeBoundingBox() properly 2014-09-18 15:40:28 +08:00
SunLightJuly 855d8d7a72 moved getCascadeBoundingBox() to utils 2014-09-18 15:27:11 +08:00
zii e151795c43 Update ccUtils.cpp 2014-08-04 15:18:01 +08:00
zii 825209dd04 Update ccUtils.cpp 2014-08-04 11:48:23 +08:00
zii 97f06306e3 Update ccUtils.cpp
希望加入一个简单获得绝对时间的方法, 包装了gettimeofday.
2014-08-04 11:45:50 +08:00
huangshiwu ef69faf3ba GLView Hook 2014-07-31 00:53:04 +08:00
boyu0 7fd0ca217c Implement utils::atof() 2014-07-14 20:42:08 +08:00
Dhilan007 584e90c097 Rotate the frame buffer for WP8 during the snapshot 2014-07-01 14:48:43 +08:00
minggo 2917596d5e add utils::findChildren() 2014-06-26 14:05:30 +08:00
vision e81db73b0a adding comments for the new utility. 2014-05-27 14:29:52 +08:00
vision 363fd8dc2a move the capturen screen interface from Director to ccUtils 2014-05-27 10:44:23 +08:00
vision c72ae9e3c5 merge from the latest v3 2014-05-26 20:18:11 +08:00
Ricardo Quesada 0f67247325 Squashed commit of the following:
commit a794d107ad85667e3d754f0b6251fc864dfbf288
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 14:33:49 2014 -0700

    Yeah... everything compiles on win32 and wp8

commit 4740be6e4a0d16f742c27996e7ab2c100adc76af
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 13:58:38 2014 -0700

    CCIME moved to base

    and compiles on Android

commit ff3e1bf1eb27a01019f4e1b56d1aebbe2d385f72
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 13:02:57 2014 -0700

    compiles Ok for Windows Phone 8

commit 8160a4eb2ecdc61b5bd1cf56b90d2da6f11e3ebd
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 12:25:31 2014 -0700

    fixes for Windows Phone 8

commit 418197649efc93032aee0adc205e502101cdb53d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 11:15:13 2014 -0700

    Compiles on Win32

commit 08813ed7cf8ac1079ffadeb1ce78ea9e833e1a33
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 10:08:31 2014 -0700

    Compiles on linux!

commit 118896521e5b335a5257090b6863f1fb2a2002fe
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 09:30:42 2014 -0700

    moves cocos/2d/platform -> cocos/platform

commit 4fe9319d7717b0c1bccb2db0156eeb86255a89e0
Merge: bd68ec2 511295e
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 08:24:41 2014 -0700

    Merge remote-tracking branch 'cocos2d/v3' into files

commit bd68ec2f0e3a826d8b2f4b60564ba65ce766bc56
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu May 15 19:36:23 2014 -0700

    files in the correct directory
2014-05-16 14:36:00 -07:00