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

6761 Commits

Author SHA1 Message Date
fape bbccab8f6b TestLua marmalade project 2012-12-02 15:30:22 +01:00
fape aac98975da update lua marmalade project 2012-12-02 15:29:10 +01:00
fape ec72d16276 ignore marmalade vs10 project directories 2012-12-02 15:10:38 +01:00
dualface 0e65257bc2 [luabinding] remove duplicate ccLanguageType 2012-12-02 16:17:17 +08:00
James Chen 2bd693467c Merge pull request #1691 from dumganhar/gles20 
issue #1583: Made WatermelonWithMe works all platforms(iOS,android and win32). Updated the submodule reference of cocos2d-js-tests.
 2012-12-02 00:15:19 -08:00
James Chen 005bc31499 Made WatermelonWithMe works on iOS. 2012-12-02 16:13:22 +08:00
dualface 7db170cde4 Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20 2012-12-02 15:58:23 +08:00
dualface 5bc95780c0 update luabinding 2012-12-02 15:48:15 +08:00
dualface 308a01e629 [luabinding] add tolua.isnull() 2012-12-02 15:29:00 +08:00
James Chen 071f8cdbb4 issue #1583: Updated the submodule reference of cocos2d-js-tests. 2012-12-02 15:18:50 +08:00
dualface e0ee27cb17 [luabinding] fix CCLayer:getScriptTOuchHandlerEntry() 
[luabinding] add CCLayer keypad, accelerometer support
 2012-12-02 15:17:34 +08:00
James Chen a96b946f67 Updated the submodule reference of cocos2d-js-tests. 
Made WatermelonWithMe works on win32 and android.
 2012-12-02 15:13:40 +08:00
dualface 030f5e7079 [luabinding] cleanup script handler when release CCCallFunc 2012-12-02 15:01:12 +08:00
dualface 393ce26330 rollback commit 2012-12-02 14:56:44 +08:00
minggo c2729c4e45 Merge pull request #1686 from folecr/android_particle_quickfix 
Quick fix to resolve a crash on some Android devices
 2012-12-01 18:29:08 -08:00
dualface d929fe2893 Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20 2012-12-01 22:20:08 +08:00
dualface 058b6e9f65 fix CCCallFunc for script 2012-12-01 22:19:54 +08:00
James Chen 61990a9edc Merge pull request #1688 from dumganhar/gles20 
fixed #1586: Some fixes for jsbinding.
Invoking JS_SetGCZeal only when the macros DEBUG and JS_GC_ZEAL is defined.
Invoking removeAllRoots in ScriptingCore destructor to avoid crash when app exits.
Native object( CCPhysicsSprite and CCPhysicsDebugNode ) need to be an autorelease object.
 2012-11-30 19:47:23 -08:00
James Chen 399fb53452 fixed #1586: Native object need to be an autorelease object. 2012-12-01 11:41:51 +08:00
James Chen e3615e2fb1 fixed #1586: Invoking removeAllRoots in ScriptingCore destructor to avoid crash when app exits. 2012-12-01 11:41:50 +08:00
James Chen 36bc0ab0bb Invoking JS_SetGCZeal only when the macros DEBUG and JS_GC_ZEAL is defined. 2012-12-01 11:41:50 +08:00
James Chen 590bd336d6 Merge pull request #1687 from rohankuruvilla/gles20 
fixed #1586: Fixes for CocosDragonJS and WatermelonWithMe
 2012-11-30 19:32:17 -08:00
Rohan Kuruvilla 4b1d5edbc6 Updating CocosDragonJS Android view settings to look like iPhone 2012-11-30 16:08:19 -08:00
Rohan Kuruvilla 745392ad6c Changing chipmunk manual bindings to fix GC issues 2012-11-30 16:08:19 -08:00
folecr fc65b786ad Use the "old" particle system quad code. 2012-11-30 13:22:01 -08:00
James Chen d5b16c93e4 Merge pull request #1685 from dumganhar/gles20 
Using release version of spidermonkey for win32, otherwise jsbinding pro...
 2012-11-30 06:49:47 -08:00
James Chen 94b1d39b2c Using release version of spidermonkey for win32, otherwise jsbinding project can't be run on other machines. 2012-11-30 22:45:51 +08:00
Andres Pagliano 97efff6e46 Removed unnescessary header 2012-11-30 11:30:45 -03:00
Andres Pagliano 8adb3eb6eb Refactoring in CCSet 2012-11-30 11:23:44 -03:00
James Chen 80461725b4 Merge pull request #1683 from CocosRobot/updategeneratedsubmodule_1354285210 
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
 2012-11-30 06:23:41 -08:00
CocosRobot 3533358049 cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2012-11-30 22:20:22 +08:00
James Chen 9c8313f6c0 Merge pull request #1682 from dumganhar/iss1583-js-tests 
issue #1583: Updating cocos2d-js-tests, using the same tests and games.
 2012-11-30 06:07:42 -08:00
James Chen 07661a1e21 issue #1581: Added jsb_set_reserved_slot and jsb_get_reserved_slot, 2012-11-30 22:00:30 +08:00
Gonzalo Buteler 43cc383346 Implementation of removeAllObjects() methods in CCSet 2012-11-30 10:44:09 -03:00
James Chen 15d02e4db8 Merge branch 'iss1581-fix-jsbinding-bugs' of https://github.com/dumganhar/cocos2d-x into iss1583-js-tests 
Conflicts:
	scripting/javascript/bindings/cocos2d_specifics.cpp
 2012-11-30 21:43:44 +08:00
James Chen eaacc74ce5 issue #1583: Updated the submodule cocos2d-js-tests. 2012-11-30 21:39:58 +08:00
James Chen 95875112fa Merge branch 'iss1583-js-tests' of https://github.com/dumganhar/cocos2d-x into iss1583-js-tests 2012-11-30 21:19:19 +08:00
James Chen daf61bc3eb issue #1583: Deleted samples/WatermelonWithMe/watermelon_with_me.js. 2012-11-30 21:17:06 +08:00
James Chen 344fc5ca6f issue #1583: Updated tools/tojs/cocos2dx.ini. 2012-11-30 21:16:34 +08:00
James Chen 26790eb17a issue #1583: Added some Macros as follows: 
cc.MENU_STATE_WAITING = 0;
cc.MENU_STATE_TRACKING_TOUCH = 1;
cc.MENU_HANDLER_PRIORITY = -128;
cc.DEFAULT_PADDING = 5;
 2012-11-30 21:15:54 +08:00
James Chen 0d93f2d651 issue #1583: Bind cc.Menu.alignItemsInRows, cc.Menu.alignItemsInColums, cc.LayerMultiplex.create 2012-11-30 21:15:01 +08:00
James Chen 98045f667f issue #1583: Added CCMenu::alignItemsInColumnsWithArray, CCMenu::alignItemsInRowsWithArray, CCLayer::CCLayerMultiplex and CCLayer::initWithArray. 2012-11-30 21:13:25 +08:00
James Chen 96e2707f39 issue #1583: Added jsvals_variadic_to_ccarray function. 2012-11-30 21:12:14 +08:00
James Chen e899265fb3 Merge pull request #6 from minggo/iss1583-update-js 
CocosDragonJS MoonWarriors and TestJavascript work ok on Android
 2012-11-30 02:33:26 -08:00
minggo 9ac3a356d5 issue #1583:CocosDragonJS MoonWarriors and TestJavascript work ok on android 2012-11-30 18:27:08 +08:00
James Chen e8c5f5f38c Added CCTexture2D::setTexParameters binding. 
Fixed pass one more argument in JSCallFuncWrapper::callbackFunc if extraData is void.
 2012-11-30 18:15:29 +08:00
minggo bb6e03bd3f Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1583-update-js 2012-11-30 17:42:51 +08:00
James Chen 1867add25e Merge pull request #5 from minggo/iss1583-update-js 
issue #1583:MoonWarriors and CocosDragon work ok on iOS
 2012-11-30 01:12:02 -08:00
minggo 81077aba58 issue #1583:MoonWarriors and CocosDragon work ok on iOS 2012-11-30 15:07:11 +08:00
James Chen 7417f53ed0 Updated cocos2d-js-tests reference. 2012-11-30 14:43:56 +08:00