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

4139 Commits

Author SHA1 Message Date
James Chen 63a8bbf0d9 issue #1194: Updated ios project configurations after adding CCTextureWatcher. 2012-05-02 10:39:39 +08:00
Walzer 2addd06f21 fixed #1203, remove CCFileUtils::setResource & SimpleAudioEngine::setResource, these 2 methods were created for wophone. 2012-05-02 10:39:17 +08:00
James Chen de35aaa101 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1194_tex_wat 2012-05-02 09:49:12 +08:00
Rolando Abarca 7e28c97bc6 Merge branch 'master' into testjs-ricardo 2012-05-01 16:45:36 -07:00
Rolando Abarca ff9022998a fixes reverse for actions 2012-05-01 16:45:18 -07:00
Rolando Abarca 2b5fbafa31 more bindings 2012-05-01 15:19:52 -07:00
Ricardo Quesada ec1ad7a06c Added particle tests 2012-04-30 19:58:45 -07:00
Ricardo Quesada be825be880 Added more verbose ease action test 2012-04-30 19:19:59 -07:00
Rolando Abarca c888a8c778 more bindings 2012-04-30 11:13:38 -07:00
Rolando Abarca fa91461b2c adds more actions 2012-04-30 11:13:28 -07:00
Rolando Abarca 88e5763328 simple easeIn test 2012-04-30 11:13:19 -07:00
minggo 2223cbcd69 Merge pull request #876 from minggo/gles20 
optimize CCTextureCache::removeUnusedCache()
 2012-04-27 20:44:47 -07:00
minggo cbfe1e0d0c optimize CCTextureCache::removeUnusedCache() 2012-04-28 11:34:13 +08:00
minggo 53733091d3 Merge pull request #874 from minggo/iss931_refactor_ccimage_texture2d 
Iss931 refactor ccimage texture2d
 2012-04-27 18:48:11 -07:00
Rolando Abarca 159f5134df updates bindings 2012-04-27 11:51:23 -07:00
Rolando Abarca 4b94b31a80 adds comments to the dpath 2012-04-27 11:51:16 -07:00
James Chen 9886f281ee issue #1191: Updated win32 project files. 2012-04-27 18:50:55 +08:00
James Chen c5f7f15090 issue #1194: Added extension namespace, all extension classes are in cocos2d::extension namespace, added CCTextureWatcher and CCListView. 2012-04-27 18:47:49 +08:00
minggo a4e8c9ad17 fixed #931: refactor CCImage and CCTexture2D 2012-04-27 18:37:11 +08:00
minggo a1570e931f issue #931:make convert to rgb565 and A8 correct 2012-04-27 15:53:29 +08:00
James Chen fd08f9852b issue #1194: Added some files refer to TextureWatcher. 2012-04-27 12:00:54 +08:00
James Chen 36c9ab18a8 issue #1191: Updated default.js. 2012-04-27 11:36:38 +08:00
James Chen 6305de4ff6 issue #1191: Updated win32 template. 2012-04-27 11:35:09 +08:00
Rolando Abarca 731b05faa3 updates readme 2012-04-26 11:15:46 -07:00
Rolando Abarca c61d025924 updates readme 2012-04-26 11:13:24 -07:00
Rolando Abarca 4201ec10de updates spidermonkey 2012-04-26 11:11:18 -07:00
Rolando Abarca 9f4f7febb8 landscape orientation 2012-04-26 11:04:37 -07:00
Rolando Abarca 20043abb6c defaults to test actions 2012-04-26 11:04:27 -07:00
Rolando Abarca 91eefa815d new bindings 2012-04-26 11:04:19 -07:00
Rolando Abarca c82e45d190 updates old tests 2012-04-26 11:04:11 -07:00
Rolando Abarca 2161ccd0ef adds more resources 2012-04-26 11:03:55 -07:00
Rolando Abarca b0d185ff39 updates readme 2012-04-26 11:03:30 -07:00
James Chen 8af448f1ba Merge pull request #873 from dumganhar/iss931_minggo 
issue #931: refactor CCImage and CCTexture2D
 2012-04-26 03:21:37 -07:00
James Chen 2bffd3a565 issue #931: dynamically allocate array(row_pointers) in CCImage::_initWithPngData. 2012-04-26 18:17:57 +08:00
James Chen 1b2bba06c5 Merge branch 'gles20' of https://github.com/minggo/cocos2d-x into gles20_minggo 2012-04-26 17:57:23 +08:00
minggo 602d34ec78 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-04-26 17:36:59 +08:00
minggo 7ecbd8ea6c issue #931: refactor CCImage and CCTexture2D 2012-04-26 17:36:32 +08:00
James Chen a771f47a1a issue #1191: Updated win32 template. 2012-04-26 15:57:05 +08:00
James Chen 13098df90e issue #1191: Removed some unused files. 2012-04-26 15:05:19 +08:00
James Chen 7bf2067942 issue #1191: Removed some unused files in template folder. 2012-04-26 15:03:44 +08:00
James Chen 7d8fc95297 Merge pull request #871 from dumganhar/iss1190_gles20_lua 
fixed #1190: Updated lua bindings to 2.0 api.
 2012-04-25 23:40:01 -07:00
James Chen ceb5b122b0 fixed #1190: closed CC_LUA_ENGINE_DEBUG by default. 2012-04-26 14:37:28 +08:00
James Chen 6f62251bb6 fixed #1190: Updated some .pkg files. 2012-04-26 14:32:17 +08:00
James Chen f5ffe8249e issue #1190: Updated ios lua project. 2012-04-26 13:05:05 +08:00
James Chen 394622f538 issue #1190: Updated HelloLua.java and Cocos2dxGLSurfaceView.java, make HelloLua app support opengles2.0. 2012-04-26 12:06:51 +08:00
James Chen 8d63e9f1bd issue #1190: Updated some files for android port. 2012-04-26 11:52:21 +08:00
James Chen b21944e1d3 issue #1190: Updated main.cpp and Android.mk for HelloLua project of android. 2012-04-26 11:45:22 +08:00
James Chen edfb8c1f9c issue #1190: used std::string as key of CCDictionary. Updated CCString.pkg, CCArray.pkg, CCDictionary.pkg. 2012-04-26 11:39:49 +08:00
James Chen 96a177bd37 issue #1190: updated some pkg files for lua binding. 2012-04-26 09:34:42 +08:00
James Chen f54d9b4184 Merge pull request #870 from dumganhar/iss_1186_gles20_bmf 
fixed #1189: syn 1.0 branch: CCLabelBMFont updateLabel() optimizations and fixes
 2012-04-25 03:19:39 -07:00