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

8167 Commits

Author SHA1 Message Date
Rohan Kuruvilla bb91f1eb30 Adding rudementary support for Rotation in iOS 2013-04-25 18:40:56 -07:00
Rohan Kuruvilla d8c30e0c5b Adding log redirect over the network for iOS. Also fixing Stop command crash in Android 2013-04-25 18:39:51 -07:00
Rohan Kuruvilla e6fc611346 Commiting out orientation change code. was causing gl errors with landscape games 2013-04-25 18:39:47 -07:00
Rohan Kuruvilla 9b86791eef Adding CocosPlayer for iOS 2013-04-25 18:39:43 -07:00
James Chen b648d392ba Merge pull request #2457 from dumganhar/master 
Fixing a bug in CCFileUtilsIOS::isFileExist(). Improving performance of isFileExist for all platforms.
 2013-04-25 07:09:15 -07:00
James Chen c5cb886b72 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into lua-bytecode-test 2013-04-25 22:06:43 +08:00
James Chen d1afe6cfa6 Fixing a bug in CCFileUtilsIOS::isFileExist(). 2013-04-25 22:02:20 +08:00
James Chen 93a8b60111 If file path is an empty string, return false directly in CCFileUtils::isFileExist. 2013-04-25 21:51:13 +08:00
James Chen 1ff07223de Merge pull request #2456 from dumganhar/lua-bytecode-test 
fixed #2083: Bytecode of LuaJIT can't work on android.
 2013-04-25 06:48:01 -07:00
James Chen 30cc4bb1af Merge pull request #2454 from CocosRobot/updategeneratedsubmodule_1366896612 
cocos2dxmatoMac-mini : updating submodule reference to latest autogenera...
 2013-04-25 06:36:14 -07:00
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
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
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
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
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
James Chen 2c69ce8d80 fixed #2075: Updating multi-platform template project settings. 2013-04-24 15:56:37 +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
James Chen 0c3cb27113 issue #2075: Updating TestCpp for mac. 2013-04-24 14:34:41 +08:00
James Chen 2d1172814d issue #2075: Adding spine editor support. Adding a new test 'SpineTest' in TestCpp, adding the parse code in "extensions/spine". It works only on iOS now. 2013-04-24 13:57:34 +08:00
James Chen 84ec031fcf Merge pull request #2427 from CocosRobot/updategeneratedsubmodule_1366690273 
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
 2013-04-22 23:14:03 -07:00
CocosRobot ca30ce7462 cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2013-04-23 12:11:31 +08:00
James Chen 69c1c2ff2f Merge pull request #2426 from dumganhar/master 
fix a typo in js_cocos2dx_CCTMXLayer_getTiles.
 2013-04-22 19:58:44 -07:00
James Chen e84cf9ef83 Correct log output in js_cocos2dx_CCTMXLayer_getTiles 2013-04-23 10:57:55 +08:00
James Chen 30c6915449 fix a typo. 2013-04-23 10:52:51 +08:00
James Chen c7c1415cd6 Merge pull request #2425 from dumganhar/iss2076-setResolutionScale 
fixed #2076: Adding a method CCBReader::setResolutionScale for setting resolution scale manually
 2013-04-22 19:50:20 -07:00
James Chen 685fe16e10 fixed #2076: Adding a method CCBReader::setResolutionScale for setting resolution scale manually 2013-04-23 10:39:59 +08:00
minggo f99ffcd6df Merge pull request #2424 from minggo/master 
don't include unneeded header file
 2013-04-22 19:23:01 -07:00