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

467 Commits

Author SHA1 Message Date
minggo 180bd8b3a7 issue #1583:TestJavascript work ok on iOS 2012-12-03 11:07:22 +08:00
minggo 2cf49da2bc Merge branch 'gles20' of https://github.com/dumganhar/cocos2d-x into iss1583-update-js 2012-12-03 10:31:22 +08:00
minggo b805c31dc2 add execute permission of build_native.sh 2012-12-03 10:30:48 +08:00
James Chen 987e898807 issue #1583: Updated the project configurations of TestJavascript for android and win32. Updated the submodule reference of cocos2d-js-tests. 2012-12-03 10:28:44 +08:00
James Chen 005bc31499 Made WatermelonWithMe works on iOS. 2012-12-02 16:13:22 +08:00
James Chen 071f8cdbb4 issue #1583: Updated the submodule reference of cocos2d-js-tests. 2012-12-02 15:18:50 +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
Rohan Kuruvilla 4b1d5edbc6 Updating CocosDragonJS Android view settings to look like iPhone 2012-11-30 16:08:19 -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
minggo 9ac3a356d5 issue #1583:CocosDragonJS MoonWarriors and TestJavascript work ok on android 2012-11-30 18:27:08 +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
James Chen 0f1232ab9f issue #1583: TestJavascript works ok on win32. 2012-11-30 14:01:35 +08:00
James Chen da8cf18d24 Merge branch 'gles20' into iss1583-js-tests 2012-11-30 13:40:52 +08:00
James Chen 6e33d31a63 Updated the submodule cocos2d-js-tests. 2012-11-30 13:07:32 +08:00
James Chen 23629b8187 Made all projects compiled ok on Blackberry port. 2012-11-30 12:40:47 +08:00
James Chen c53cfe88a7 Merge pull request #1674 from fape/helloCPP_marmalade 
Add missing AppMacros.h to HelloCpp marmalade project file
 2012-11-29 02:21:34 -08:00
James Chen bd95b198fe Merge pull request #1675 from dumganhar/gles20 
Fixed some warning and make TestCpp (win32 release version) compiled ok.
 2012-11-29 02:20:52 -08:00
fape 834934fd15 add missing AppMacros.h to HelloCpp marmalade projekt file 2012-11-29 11:06:03 +01:00
James Chen d27ab38be9 fixed some warning and make win32 release version compiled ok. 2012-11-29 18:04:33 +08:00
minggo b6dab85611 add Texture2DTest cases 2012-11-29 17:57:33 +08:00
James Chen 788b478b3c Make sure HelloCpp can be full screen. 2012-11-29 16:31:29 +08:00
James Chen 494806167b Temporary commit. 2012-11-29 15:26:24 +08:00
James Chen 208132895e issue #1583: Moved the common js codes to scripting/javascript/bindings/js folder. Deleted the old js sample resources. 2012-11-29 11:27:39 +08:00
James Chen 358e47e981 issue #1583: Updated the submodule reference of cocos2d-js-tests. 2012-11-29 11:27:16 +08:00
minggo 33647ccebb Merge pull request #1660 from minggo/gles20 
make CocosGragon work on iOS devices with debug mode
 2012-11-26 19:57:37 -08:00
minggo 09344d55be make CocosGragon work on iOS devices with debug mode 2012-11-27 11:55:59 +08:00
James Chen 342c7bc724 Merge pull request #1657 from fape/cocos_extensions_marmalade 
fixed #1578: Create cocos2dx-ext marmalade project.
 2012-11-26 19:15:06 -08:00
James Chen 9bd3014137 Fixed CocosBuilderTest/AnimationTest crash, fixed some memory leaks in CCBReader.cpp. 2012-11-27 10:26:40 +08:00
fape 1843d576d8 create cocos2dx-ext marmalade project 2012-11-26 20:14:10 +01:00
James Chen e248d9d472 fixed #1576: Updated CocosBuilderTest. 2012-11-26 22:00:25 +08:00
James Chen e0948a4817 fixed #1576: Sync CCBReader to latest version, CCString* --> std::string, CocosBuilderTest crash fixes. 2012-11-26 21:51:05 +08:00
minggo 8063b9b9fb give a guide information to run Box2dTest 2012-11-26 17:23:36 +08:00
minggo 6bb11d8d71 Merge branch 'gles20' of https://github.com/minggo/cocos2d-x into gles20 2012-11-26 15:09:34 +08:00
minggo bd025c94c3 use macro CC_TARGET_OS_IPHONE instead of TARGET_OS_IPHONE and make xcode template work ok 2012-11-26 15:08:40 +08:00
minggo 1b9a38e195 issue #1564:work ok on linux 2012-11-26 11:46:37 +08:00
fape 3cc5920aac Update samples/TestCpp to compatible with marmalade 2012-11-24 20:14:01 +01:00
minggo 1cf237d296 Merge pull request #1643 from minggo/gles20 
issue #1564:make iOS test work ok
 2012-11-23 00:31:06 -08:00
minggo a423317abc issue #1564:make iOS test work ok 2012-11-23 16:30:09 +08:00
James Chen 48d77fedc1 issue #1573: Reverted GameScene.js and MainMenuScene.js. 2012-11-23 15:09:04 +08:00
James Chen 7c1e860d78 issue #1573: Added CocosDragonJS. Made it compiled ok on iOS,android and win32. 2012-11-23 15:09:03 +08:00
James Chen 6af0188295 First commit CocosDragonJS. 2012-11-23 15:09:02 +08:00
Rohan Kuruvilla cfb59529a8 Adding CocosDragonJS project 2012-11-23 15:08:58 +08:00
minggo 3980a710a3 Merge pull request #1641 from minggo/gles20 
issue #1564: make tests run on mac osx
 2012-11-22 22:24:25 -08:00
minggo 96ecb05ca9 issue #1564: make tests run on mac osx 2012-11-23 14:22:50 +08:00
minggo f82e800695 Merge pull request #1640 from minggo/gles20 
modify lua project setting
 2012-11-22 18:42:45 -08:00
minggo 226b10a9e2 modify lua project setting 2012-11-23 10:41:41 +08:00
James Chen 971d948132 issue #1572: WatermelonWithMe works on iOS now. 2012-11-22 19:05:38 +08:00