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

6766 Commits

Author SHA1 Message Date
James Chen 8d55abd432 fix touch event lost on Win32, the reason is that: 
Cocos2d-x is using touch event callback for all platforms, it's different from cocos2d-iphone which uses mouse event for Mac port. So we just need to touch event by using kCCBPlatformIOS.
 2012-11-27 11:03:12 +08:00
James Chen 8dffd457db Merge pull request #1658 from dumganhar/gles20 
fixed #1576: Fixed CocosBuilderTest/AnimationTest crash, fixed some memory leaks in CCBReader.cpp.
 2012-11-26 18:28:46 -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 277fefd386 Merge pull request #1656 from dumganhar/gles20 
fixed #1576: CCNode::setUserObject needs to be retained.
 2012-11-26 06:12:47 -08:00
James Chen d7ebd681ec fix a warning in CCRenderTexture. 2012-11-26 22:11:56 +08:00
James Chen be914811fb fixed #1576: CCNode::setUserObject needs to be retained. 2012-11-26 22:11:04 +08:00
James Chen f9b8e846b1 Merge pull request #1655 from dumganhar/gles20 
fixed #1576: Updated CocosBuilderTest.
 2012-11-26 06:01:04 -08:00
James Chen e248d9d472 fixed #1576: Updated CocosBuilderTest. 2012-11-26 22:00:25 +08:00
James Chen ebc20e02b3 Merge pull request #1654 from dumganhar/gles20 
fixed #1576: Sync CCBReader to latest version, CCString* --> std::string, CocosBuilderTest crash fixes.
 2012-11-26 05:54:27 -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 900fdb53e8 Merge pull request #1653 from minggo/gles20 
give a guide information to run Box2dTest
 2012-11-26 01:27:34 -08:00
minggo 8063b9b9fb give a guide information to run Box2dTest 2012-11-26 17:23:36 +08:00
minggo 69f6b3970a Merge pull request #1647 from guanqun/fix-doxygen 
Fix doxygen related errors and warnings
 2012-11-25 23:26:48 -08:00
minggo 418bb788d6 Merge pull request #1652 from minggo/gles20 
Gles20
 2012-11-25 23:25:22 -08:00
minggo 735815240a Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-11-26 15:18:44 +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
walzer de08a29c3a Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-11-26 12:02:33 +08:00
minggo 832f9180b6 Merge pull request #1651 from minggo/gles20 
issue #1564:work ok on linux
 2012-11-25 19:50:36 -08:00
minggo 1b9a38e195 issue #1564:work ok on linux 2012-11-26 11:46:37 +08:00
walzer d4cd9dbf0a Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-11-26 10:44:08 +08:00
CocosRobot 0ec7f873fe cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2012-11-26 10:40:03 +08:00
James Chen a730f8866f Merge pull request #1644 from fape/testcpp_marmalade 
fixed #1575: Update samples/TestCpp to compatible with marmalade
 2012-11-25 17:51:32 -08:00
James Chen 79cfe38d40 Merge pull request #1645 from fape/marmalade_language 
fixed #1574: Update marmalade languages.
 2012-11-25 17:48:48 -08:00
Lu Guanqun 0f2d8f8c6b fix the doxygen warnings 
cocos2d-x.git/extensions/network/HttpClient.h:64: warning: The following parameters of cocos2d::extension::CCHttpClient::setTimeoutForConnect(int value) are not documented:
  parameter 'value'
cocos2d-x.git/extensions/network/HttpClient.h:79: warning: argument 'timeout' of command @param is not found in the argument list of CCHttpClient::setTimeoutForRead(int value)
cocos2d-x.git/extensions/network/HttpClient.h:79: warning: The following parameters of cocos2d::extension::CCHttpClient::setTimeoutForRead(int value) are not documented:
  parameter 'value'
 2012-11-25 23:27:29 +08:00
Lu Guanqun 64bec838c0 fix doxygen rendering output of CCLayerGradient 
Otherwise, the first line of CCLayerGradient is rendered with a box in
doxygen's output.
 2012-11-25 23:27:29 +08:00
fape e259467873 update marmalade languages 2012-11-25 12:13:30 +01: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 14ac15ebda Merge pull request #1642 from dumganhar/iss1573-cocosdragonjs 
issue #1573: Adding CocosDragonJS project, crash wasn't fixed. :(
 2012-11-22 23:16:07 -08:00
James Chen a1ebfd9ed8 Don't add CCNode::removeChild to skip field. 2012-11-23 15:12:42 +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
Rohan Kuruvilla 36bbd80b68 Adding changes to CCBreader 2012-11-23 15:08:55 +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
minggo 91b370e0f0 Merge pull request #1639 from minggo/gles20 
make lua work
 2012-11-22 18:38:44 -08:00
minggo 542c407346 make lua work 2012-11-23 10:36:26 +08:00
James Chen 00ad0689ec Merge pull request #1620 from fape/remove_physics_nodes 
remove physics_nodes from marmalade
 2012-11-22 03:43:24 -08:00
James Chen 7d5f974817 Merge pull request #1638 from dumganhar/iss1572-game 
fixed #1572: Adding WatermelonWithMe project.
 2012-11-22 03:09:07 -08:00
James Chen 971d948132 issue #1572: WatermelonWithMe works on iOS now. 2012-11-22 19:05:38 +08:00
James Chen c32ea4486b issue #1572: WatermelonWithMe works on Android now. 2012-11-22 18:46:30 +08:00
James Chen 7c1a3a7305 issue #1572: Modify vs2010 solution. 2012-11-22 17:54:55 +08:00
James Chen e0fd8f6284 issue #1572: Adding WatermelonWithMe project. 2012-11-22 17:54:54 +08:00