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

9259 Commits

Author SHA1 Message Date
James Chen 5337234e22 Android also uses executeScript to load lua source file or byte code file. So unused codes need to be deleted. 2013-04-25 21:31:52 +08:00
Ed Bartley c7222c2b14 CCScrollView should set the TouchPriority from the CCLayer, thus allowing the developer to set a custom TouchPriority with a call to setTouchPriority(…); 2013-04-25 09:30:24 -04:00
CocosRobot c501a73a54 cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2013-04-25 21:30:20 +08:00
James Chen 862ce85c7a fixed #2083: Bytecode of LuaJIT can't work on android. 2013-04-25 21:29:31 +08:00
James Chen bd4f2b51a2 Merge pull request #2452 from dumganhar/update-bindings-generator 
Updating bindings-generator.
 2013-04-25 06:11:54 -07:00
James Chen acaff0a208 Updating bindings-generator. 2013-04-25 21:10:10 +08:00
James Chen 7fc038c688 Merge pull request #2451 from dumganhar/master 
Synchronizing some JSB changes in cocos2d-iphone. Fix a bug of "Too much recursion" in loop.
 2013-04-25 05:58:38 -07:00
James Chen 5572990e5d Synchronizing some JSB changes in cocos2d-iphone. Fix a bug of "Too much recursion" in loop. 2013-04-25 20:56:27 +08:00
zhangbin 73f0b6df04 Add licenses in source code files. 2013-04-25 20:43:58 +08:00
minggo b6c8e78149 remove js files from compiling 2013-04-25 18:37:27 +08:00
zhangbin 2b5238c64b 1. Change the implementation of callback in Social plugins. 
2. Add licenses in source code files.
 2013-04-25 18:25:48 +08:00
zhangbin 4611027d47 1. Change the implementation of callback in IAP plugins. 
2. Add licenses in source code files.
 2013-04-25 17:33:42 +08:00
minggo 3f72473aba Merge https://github.com/cocos2d/cocos2d-x 2013-04-25 16:25:55 +08:00
James Chen 31a61072a4 Merge pull request #2449 from dumganhar/master 
Updating cocos2d-js-tests.
 2013-04-25 01:19:39 -07:00
James Chen 7bd1d8cde1 Updating cocos2d-js-tests. 2013-04-25 16:16:39 +08:00
James Chen f25ce0c256 Merge pull request #2448 from CocosRobot/updategeneratedsubmodule_1366871707 
cocos2dxmatoMac-mini : updating submodule reference to latest autogenera...
 2013-04-25 00:50:34 -07:00
CocosRobot 1e4370f43b cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2013-04-25 14:35:16 +08:00
James Chen 1d7986cf59 Merge pull request #2446 from dumganhar/master 
Updating TestJavascript project configuration.Updating tools/tojs/cocos2dx.ini, adding CCReuseGrid and CCStopGrid bindings.
 2013-04-24 23:34:14 -07:00
James Chen a9f3ae0e33 Updating tools/tojs/cocos2dx.ini, adding CCReuseGrid and CCStopGrid bindings. 2013-04-25 14:32:52 +08:00
James Chen 9913358dde Updating TestJavascript project configuration. 2013-04-25 14:31:11 +08:00
minggo 9881012459 Merge https://github.com/cocos2d/cocos2d-x 2013-04-25 12:01:59 +08:00
James Chen e4a8d4ba91 Merge pull request #2445 from dumganhar/master 
Updating project configuration for iOS.
 2013-04-24 20:33:08 -07:00
James Chen 631b08e984 Updating project configuration for iOS. 2013-04-25 11:30:35 +08:00
James Chen ec26e52278 Update AUTHORS 2013-04-25 10:37:36 +08:00
James Chen 805285ab47 Merge pull request #2444 from dumganhar/iss2080-realOpacity 
fixed #2080: _realOpacity isn't assigned in CCLayerColor::initWithColor.
 2013-04-24 19:34:11 -07:00
Ed Bartley b2b10ba5f7 CCLayerColor::_realOpacity is not set in ::initWithColor(…) causing unexpected behavior if a ::runAction(CCFadeTo::create(…)) applied to the LayerColor. 2013-04-25 10:32:03 +08:00
Andrew Goulding d2ca2a4d10 Optmization to ccArrayGetIndexOfObject 
Optimized loop of ccArrayGetIndexOfObject to remove the overhead of 3
pointer dereferences per iteration, and pre-increment the int for
speed. If this function is called a lot, and with a large list, this
will result in a good performance win.

This can probably be done with just pointers, but I haven't taken the
time to validate all function calls to make sure it would be
appropriate. Though I can guarantee that if this worked fine before, it
will work fine with this change.
 2013-04-25 12:18:40 +10:00
James Gregory a6bf5a9e77 Add myself to authors so folks know who to blame :) 2013-04-24 13:00:07 -07:00
James Gregory fc52b246e1 Interval test working now also -- update TODO. 2013-04-24 12:12:38 -07:00
James Gregory 9ea2396884 Add missing fonts to TestCpp makefile, fixing layertest. 2013-04-24 12:11:10 -07:00
zhangbin f30aaed426 Modify the permission of plugin twitter. 2013-04-24 17:23:35 +08:00
minggo fb7851b429 define checkAnim() before using it 2013-04-24 17:06:59 +08:00
zhangbin f7e07188b2 Adjust the implementation of ProtocolSocial & plugin twitter. 2013-04-24 16:53:02 +08:00
zhangbin 98bd3f79ed Merge branch 'master' of https://github.com/natural-law/cocos2d-x 2013-04-24 16:46:35 +08:00
minggo 93ed85903f Merge pull request #2437 from dumganhar/iss2075-spine-support 
fixed #2075: Adding spine editor support.
 2013-04-24 01:12:23 -07:00
Bin Zhang d657524859 Merge pull request #1 from lihex/master 
Add twitter social share plugin
 2013-04-24 01:03:23 -07:00
lihex 661977645e Add HelloSocial sample 2013-04-24 16:00:36 +08:00
lihex ae7dab15b6 Submit twitter share plugin implement 2013-04-24 15:59:54 +08:00
lihex 4e24ce40ea Submit protocol of social share plugin 2013-04-24 15:58:57 +08:00
James Chen 2c69ce8d80 fixed #2075: Updating multi-platform template project settings. 2013-04-24 15:56:37 +08:00
zhangbin 1af72075bc Merge branch 'master' of https://github.com/natural-law/cocos2d-x 2013-04-24 15:43:53 +08:00
James Chen abacdc9921 tabify for makefile. 2013-04-24 15:15:25 +08:00
James Chen 8e5610fc58 issue #2075: Updating Makefile of TestCpp for native client port. 2013-04-24 15:00:53 +08:00
James Chen 6c1890f8ab issue #2075: Updating TestCpp project setting for marmalade and linux. 2013-04-24 14:58:11 +08:00
minggo c0582d9d40 Merge pull request #2435 from minggo/master 
fix memory leak in FontTest
 2013-04-23 23:53:13 -07:00
minggo c6dfee706c fix memory leak in FontTest 2013-04-24 14:49:52 +08:00
James Chen 7b138c6be9 issue #2075: Adding spinetest in TestCpp for win32. 2013-04-24 14:48:39 +08:00
James Chen 6b4420e7ec issue #2075: Updating extensions project for linux, native client and marmalade. 2013-04-24 14:37:22 +08:00
James Chen f7947d25bc fixed #2075: Updating iOS template. 2013-04-24 14:36:32 +08:00
James Chen 7755b025ee Adding spine/spine-cocos2dx.h to cocos-ext.h. 2013-04-24 14:36:11 +08:00