Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
10,934 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

10934 Commits

Author SHA1 Message Date
James Chen f414803e92 Minor fix of PR 3128. 2013-07-11 15:36:00 +08:00
James Chen 103b184be0 Merge pull request #3129 from dumganhar/iss2395-s9sprite-test 
closed 2395: Adding Scale9SpriteTest for TestCpp
 2013-07-11 00:30:20 -07:00
James Chen 227afc37b9 Merge branch 'iss2395-s9sprite-test' of https://github.com/dumganhar/cocos2d-x into iss2395-s9sprite-test 2013-07-11 15:10:27 +08:00
James Chen 1527c1b4c3 issue #2395: Updating TestCpp/Android.mk 2013-07-11 15:09:13 +08:00
James Chen ab4e9749b6 issue #2395: [Win32] Updating TestCpp project configuration 2013-07-11 14:17:43 +08:00
James Chen 9946bc4f00 issue #2395: Adding Scale9SpriteTest for other platforms. 2013-07-11 14:13:01 +08:00
James Chen ad95ba4894 closed #2395: Adding Scale9SpriteTest for TestCpp 2013-07-11 14:07:14 +08:00
James Chen 2e9d727466 issue #2395: Removing unused codes in ActionTest.h. 2013-07-11 14:00:26 +08:00
James Chen 5727d7099b issue #2395: Scale9Sprite's default anchor point is center now. 2013-07-11 13:59:57 +08:00
samuele3hu ff29d2b5d4 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ScriptHandler 2013-07-11 13:40:16 +08:00
samuele3hu 9007b9feee issue #2377:Replace the CallFunc script Handler and repair Testlua Bug 2013-07-11 13:38:25 +08:00
James Chen b2c0d17aeb Merge pull request #3122 from dumganhar/iss2389-http-cookie 
closed 2389: Adding cookie support for HttpClient
 2013-07-10 18:37:29 -07:00
minggo 4a8f45bb83 Merge pull request #3128 from ricardoquesada/copy_deprecated 
re adds copy() as a deprecated method
 2013-07-10 18:36:20 -07:00
Ricardo Quesada 48b1ed9f8f re adds copy() as a deprecated method 
...in order to make easier the port to v3.0
 2013-07-10 18:11:37 -07:00
zhangbin ae9dbd26ce issue #2390, Resolve the bug in file plugin/tools/toolsForGame/modifyClassPath.py. 2013-07-10 16:21:16 +08:00
minggo 9262af69f2 [ci skip] 2013-07-10 16:01:39 +08:00
minggo bbaa938cf7 Merge pull request #3121 from tks2shimizu/develop 
Add append function for String class.
 2013-07-10 00:58:43 -07:00
minggo df53e5235c Merge pull request #3125 from dabingnn/Iss2386-ClippingNode-AsChild-Bug 
closed issue #2386 : ClippingNode works wrongly when being set as a child
 2013-07-10 00:54:44 -07:00
minggo 630937aa3d Merge pull request #3124 from dumganhar/rename-method 
issue #2300: A fix of missing invoking 'initXXX' in clone method.(FadeOut, DelayTime).
 2013-07-10 00:49:58 -07:00
James Chen 3af6f6fe58 enableCookies is static method now 2013-07-10 15:46:01 +08:00
zhangbin 80e6480dc7 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-07-10 15:35:36 +08:00
James Chen 9b887e64a8 Update .travis.yml 2013-07-10 15:34:29 +08:00
zhangbin 54995745cf closed #2390, Resolve the bug plugin/tools/config.sh. 2013-07-10 15:34:29 +08:00
Huabing.Xu 010a33c009 closed issue #2386 : Fix bug : add a new method to clear the stencil buffer bit used by ClippingNode 2013-07-10 15:33:43 +08:00
James Chen 146914b288 Merge pull request #3123 from pyrasis/tizen_2.2 
Support Tizen 2.2 SDK
 2013-07-10 00:15:31 -07:00
samuele3hu 31d0e492c2 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ScriptHandler 2013-07-10 15:05:02 +08:00
samuele3hu cf1cbe1bd6 issue #2377:add scriptHandlerMgr and modify ActionManager.lua 2013-07-10 15:04:00 +08:00
James Chen d830bb5f96 'tile' --> 'getTile', 'orignalTile' --> 'getOrignalTile' 2013-07-10 14:17:42 +08:00
James Chen a6db6db334 issue #2300: A fix of missing invoking 'initXXX' in clone method.(FadeOut, DelayTime). 2013-07-10 14:16:42 +08:00
Lee, Jae-Hong 9322e5594b Support Tizen 2.2 SDK. 
- Update project files.
- based on develop branch.
- HelloCpp, SimpleGame, HelloLua, TestLua available to build.
 2013-07-10 13:04:08 +09:00
minggo 91fc0b2a45 Merge pull request #3114 from dumganhar/iss2388-default-texture 
closed #2388: Creating a default texture for CCSprite if setTexture(nullptr) is invoked.
 2013-07-09 21:03:20 -07:00
James Chen 86b6f26cee issue #2388: Fixing a bug in FadeIn::clone. 2013-07-10 11:58:07 +08:00
James Chen 7594136985 issue #2388: Updating comments for cc_2x2_white_image variable. 2013-07-10 11:57:35 +08:00
James Chen 3f57275848 issue #2389: Adding cookie support for HttpClient 2013-07-10 11:37:39 +08:00
zhangbin 8071226087 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-07-10 10:41:22 +08:00
zhangbin 571aeaed7e closed #2390, Resolve the bug in modify game projects tools. 2013-07-10 10:40:42 +08:00
James Chen ad8a3ac1b5 issue #2388: One more static_cast. 2013-07-10 10:08:07 +08:00
James Chen f6e0b6ca0b issue #2388: Checking whether the texture exists. 2013-07-10 10:07:45 +08:00
Tomoaki Shimizu eca7db6a50 Add append function for String class. 
The append function is useful when adding a string.
So, I added it to String class.
 2013-07-10 10:50:13 +09:00
James Chen c545f6d56c Merge pull request #3116 from lgb/small_fix 
no more VC2010
 2013-07-09 18:35:08 -07:00
Jaroslaw Lewandowski 1fcd6883f1 fixing Linux build 2013-07-09 23:32:10 +01:00
Jaroslaw Lewandowski f1023232db Now opacity option for shadow in CCLabelTTF works. 2013-07-09 23:23:41 +01:00
Jaroslaw Lewandowski 626ba2686f Solving 'black screen' on android 2013-07-09 21:21:43 +01:00
Oleg Baluk b0401a78be no more VC2010 2013-07-10 00:18:23 +04:00
James Chen 502896b3a6 Merge pull request #3115 from azmeuk/linux 
Linux Eclipse Projects
 2013-07-09 07:39:05 -07:00
Éloi Rivard 05ae6f8518 Fixed some warnings 2013-07-09 16:33:21 +02:00
Éloi Rivard e6354bbf0a Various linux eclipse projects compilation fixes 2013-07-09 15:23:19 +02:00
Éloi Rivard e5db95d2b9 Added deprecated functions ignoring in libcocos2d eclipse project 2013-07-09 15:23:19 +02:00
Éloi Rivard d0c34cd2ae Removed warnings from external projects (libbox2D & liblua) 2013-07-09 15:23:19 +02:00
Éloi Rivard b8242cfe97 Removed unused include in eclipse HelloLua project 2013-07-09 15:23:19 +02:00