CocosRobot
daccbdb2bf
[AUTO]: updating luabinding automatically
2014-04-14 06:55:48 +00:00
minggo
26494c000b
Merge pull request #6257 from dumganhar/group-command-manager-not-singleton
...
GroupCommandManager should not be a singleton, it should be managed by Renderer.
2014-04-14 14:52:39 +08:00
minggo
45b2a7b2a5
[ci skip]
2014-04-14 14:52:01 +08:00
minggo
bb15d0ecf9
Merge pull request #6267 from dabingnn/develop_add_culling_enabled_option
...
Add interface setCullingEnabled(), culling is disabled by default
2014-04-14 14:50:11 +08:00
Huabing.Xu
3601fe9297
android can work
2014-04-14 14:30:17 +08:00
Huabing.Xu
c3bf78494a
remove CCFrustum.cpp, we will use new instead
2014-04-14 14:18:32 +08:00
James Chen
eb651a6ae4
Merge pull request #6272 from Dhilan007/develop
...
LabelTTF:fixed display incorrect if create by FontDefinition.
2014-04-14 14:09:50 +08:00
Huabing.Xu
ec5398e7c6
Merge branch 'develop' into develop_migrate_math_lib_merge
...
Conflicts:
tests/cpp-tests/Classes/RenderTextureTest/RenderTextureTest.h
2014-04-14 14:08:19 +08:00
andyque
87b437dd3a
closed #4783 . replace deprecated function call
2014-04-14 13:48:17 +08:00
Dhilan007
aef2767d23
change variable name.
2014-04-14 13:42:37 +08:00
James Chen
71015184c3
Merge pull request #6271 from shujunqiao/autotest-close
...
[ci skip], add close app in autotest.py
2014-04-14 13:38:54 +08:00
andyque
10cca8674a
closed #4783 . remove unused comments in shader file
2014-04-14 12:06:42 +08:00
andyque
00d2bd833f
closed #4783 . finish the shading effects
2014-04-14 12:03:37 +08:00
shujunqiao
884974f5e4
[ci skip], add close app in autotest.py
2014-04-14 11:55:11 +08:00
andyque
2c1f5da69c
issue #4783 , add outline shader files
2014-04-14 11:52:17 +08:00
minggo
b073e65cf4
Merge pull request #6269 from natural-law/develop
...
Solve the problem of setup.py on windows.
2014-04-14 11:51:49 +08:00
zhangbin
7e807f3ea9
closed #4784 , Solve the problem of setup.py on windows.
2014-04-14 11:48:48 +08:00
zhangbin
17fe267644
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2014-04-14 11:47:54 +08:00
Huabing.Xu
d2dd57d412
change indention to space and remove comment code
2014-04-14 11:45:06 +08:00
Dhilan007
6fe64b83f8
LabelTTF:fixed display incorrect if create by FontDefinition.
2014-04-14 11:33:46 +08:00
Huabing.Xu
9935e8ddfb
setCullingEnabled set to public access
...
changed renderer->culling test case
2014-04-14 11:33:40 +08:00
James Chen
2ee06a3533
Update AUTHORS [ci skip]
2014-04-14 11:15:54 +08:00
James Chen
81171910b3
Merge pull request #6259 from iSevenDays/patch-7
...
Fix incompatible pointer conversion
2014-04-14 11:14:29 +08:00
minggo
09911b712b
[ci skip]
2014-04-14 10:50:32 +08:00
minggo
4faa1c9651
Merge pull request #6243 from koowolf/wp8_audio
...
closed #4762 : fix some problems in cocosdension in wp8
2014-04-14 10:47:45 +08:00
minggo
9f9a87f09d
Merge pull request #6254 from dumganhar/clippingnode-leak
...
Memory leak fix for ClippingNode
2014-04-14 10:17:37 +08:00
minggo
4669e7fa39
Merge pull request #6255 from dumganhar/cocostudio-leak
...
Memory leak fix in macro IMPLEMENT_CLASS_INFO
2014-04-14 10:13:52 +08:00
James Chen
44a01be0f5
Merge pull request #6266 from dumganhar/develop
...
Const love: std::function<void(Texture2D*)> -> const std::function<void(Texture2D*)>&
2014-04-14 10:04:44 +08:00
zhangbin
c2b7e9798a
Merge branch 'develop' of https://github.com/natural-law/cocos2d-x ; branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2014-04-14 10:01:18 +08:00
James Chen
5000873778
Const love: std::function<void(Texture2D*)> -> const
...
std::function<void(Texture2D*)>&
2014-04-14 10:01:17 +08:00
Huabing.Xu
37bfeff8f0
Add interface setCullingEnabled(), culling is disabled by default
2014-04-14 09:56:01 +08:00
minggo
1e4f43d75d
Merge pull request #6256 from dumganhar/scheudlertest-leak
...
Memory leak fix in SchedulerTest
2014-04-14 09:55:04 +08:00
minggo
c99f503a10
[ci skip]
2014-04-14 09:52:15 +08:00
minggo
6ab462ccf0
Merge pull request #6265 from sachingarg05/AndroidJavaActivityOrientation
...
Fix Orientation Change Support for Android Java Activity
2014-04-14 09:50:15 +08:00
Huabing.Xu
80f96398b3
1. changed comment message in CCNode.cpp
...
2. changed Director projection to Matrix
2014-04-14 09:30:51 +08:00
Sachin Garg
69223549f3
Add support for orientation change callback (applicationScreenSizeChanged) in Android Java activity.
2014-04-14 05:46:30 +05:30
Anton Sokolchenko
503d270f8f
Fix loosing precision
...
I had a warning on building for iPhone 64 bit.
As you can see above variable "rc" has a type of size_t too( void Console::commandUpload(int fd) );
2014-04-13 01:55:43 +03:00
Anton Sokolchenko
65cf2e1256
Update CCImage.cpp
2014-04-13 01:13:58 +03:00
Mazyad Alabduljaleel
40e6288ac7
[NEW]: update HTTPClient to use C++11 callbacks
...
[NEW]: updated tests to use the new API
[DEP]: deprecated old target/selector API
2014-04-13 01:06:04 +04:00
Mazyad Alabduljaleel
8919931a50
small indentation fix
2014-04-13 00:26:38 +04:00
Mazyad Alabduljaleel
b369c24f01
+ [NEW]: setting the font for Editbox text
...
+ [NEW]: setting the font for Editbox placeholder
+ [NEW]: setting the color for Editbox placeholder
+ [NEW]: updated test cases to show the new functionality
2014-04-13 00:19:14 +04:00
Anton Sokolchenko
a9ccb812ed
Fix memory leak
2014-04-12 18:47:00 +03:00
Anton Sokolchenko
973c8efb8b
Fix possible memory leak
2014-04-12 18:34:11 +03:00
Anton Sokolchenko
d778a947f5
Fix incompatible pointer conversion
2014-04-12 18:29:50 +03:00
Sergey
436285accd
isActivityVisible method
2014-04-12 12:38:01 +04:00
James Chen
b276c42ae6
GroupCommandManager should not be a singleton, it should be managed by Renderer.
2014-04-12 13:01:42 +08:00
James Chen
043f86cd6b
Memory leak fix in SchedulerTest
2014-04-12 12:59:28 +08:00
James Chen
b715a87791
Memory leak fix in macro IMPLEMENT_CLASS_INFO
2014-04-12 12:58:00 +08:00
James Chen
922b399ef2
Memory leak fix for ClippingNode
2014-04-12 12:56:36 +08:00
James Chen
6feef5fa55
Merge pull request #6251 from dumganhar/develop
...
Small fix in Lua test.
2014-04-11 20:57:12 +08:00