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

4887 Commits

Author SHA1 Message Date
YuLei bf3ce7cf76 [Lua] update Lua to 5.1.5 2012-08-25 14:32:06 +08:00
James Chen 66ecdbfe6b Merge pull request #1237 from dumganhar/gles20 
Updated vs2010 project configuration for TestLua.
 2012-08-24 03:43:03 -07:00
James Chen 1a5dd4fbb0 Updated vs2010 project configuration for TestLua. 2012-08-24 18:42:03 +08:00
James Chen b2df641305 Merge pull request #1236 from dumganhar/gles20 
Added vs2008 project for TestLua.
 2012-08-24 03:28:53 -07:00
James Chen 86d1d457a1 Added vs2008 project for TestLua. 2012-08-24 18:27:47 +08:00
James Chen 3f1884935f Merge pull request #1235 from dumganhar/gles20 
[WIN32] Enabled retina. Updated the implementation of fullPathFromRelativePath.
 2012-08-24 03:04:52 -07:00
James Chen 6c4bdc238f Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-08-24 18:02:34 +08:00
James Chen 2eeca6f000 Merge branch 'gles20' of https://github.com/dumganhar/cocos2d-x into gles20 2012-08-24 18:02:00 +08:00
James Chen 369eb3daa3 [WIN32] Enabled retina. Updated the implementation of fullPathFromRelativePath. 2012-08-24 18:01:16 +08:00
minggo cb93713433 Merge pull request #1234 from minggo/gles20 
use absolute path in CCFileUtils
 2012-08-24 02:58:33 -07:00
minggo bcd691ad9f use absolute path in CCFileUtils 2012-08-24 17:55:29 +08:00
James Chen bf2cd46a16 Merge pull request #1233 from dumganhar/gles20 
Updated create-qnx-project.sh.
 2012-08-24 01:46:34 -07:00
James Chen e07e0214f0 Updated create-qnx-project.sh. 2012-08-24 16:43:30 +08:00
James Chen 8d55bae974 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-08-24 16:12:03 +08:00
minggo cf1d61f3de Merge pull request #1232 from minggo/gles20 
fix compiling error of linux
 2012-08-24 01:09:37 -07:00
James Chen 087341b316 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-08-24 16:03:14 +08:00
mingo ba4d75a60e issue #1445: fix compiling error of linux 2012-08-24 15:53:26 +08:00
James Chen a8e4cbe3b5 Merge pull request #1218 from dumganhar/dale_lua 
fixed #1112: Lua support for blackberry port, added blackberry template files and fixed some bugs.
 2012-08-24 00:01:49 -07:00
James Chen 8e67592df2 Updated project configures of blackberry port. 2012-08-24 14:57:44 +08:00
James Chen e011be88d8 fixed a bug in CCFileUtils.cpp of blackberry port. 2012-08-24 14:35:51 +08:00
James Chen 5e5b71a396 fixed a bug in CCEGLView.cpp. 2012-08-24 14:35:24 +08:00
James Chen 4eff148f96 Added blackberry template files. 2012-08-24 14:29:51 +08:00
James Chen 85304b9441 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into dale_lua 2012-08-24 10:27:20 +08:00
minggo 083c0b8e0d Merge pull request #1229 from mustime/testlua 
issue #1425: add android proj on TestLua
 2012-08-23 19:22:15 -07:00
mustime f55aedb5e9 issue #1425: add android proj on TestLua 2012-08-24 10:18:59 +08:00
minggo b40d125501 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-08-24 10:16:08 +08:00
minggo f8df93c59c Merge pull request #1228 from mustime/testlua 
Testlua
 2012-08-23 19:15:50 -07:00
minggo fe1854ee9d Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-08-24 10:13:06 +08:00
minggo fa0dbb7c65 Merge pull request #1226 from Squallium/gles20 
Wrong access to CCApplication::sharedApplication() pointer
 2012-08-23 19:11:07 -07:00
mustime c9674e85e8 fixed a compile error on WIN32 2012-08-24 10:10:14 +08:00
mustime f67b513d08 issue #1425: add android proj on TestLua 2012-08-24 10:07:15 +08:00
James Chen 998cb276ba Merge pull request #1224 from dumganhar/android_editbox 
issue #1429: CCEditBox for android port
 2012-08-23 18:53:24 -07:00
minggo de372042ba Merge branch 'gles20' of https://github.com/donaldalanmorrison/cocos2d-x into gles20 2012-08-24 09:46:33 +08:00
minggo 56ce6869d6 Merge pull request #1227 from donaldalanmorrison/gles20 
Gles20
 2012-08-23 18:32:39 -07:00
Squallium bd09615a26 Wrong access to CCApplication::sharedApplication() pointer 2012-08-23 22:53:16 +02:00
Donald Alan Morrison e3094d80d0 Silenced LLVM SA Warning/Error regarding static singleton pattern. Added dealloc method. 2012-08-23 13:41:54 -07:00
James Chen 26a31b21b3 issue #1429: Removed mGLView variable in HelloCpp/HelloLua/TestJavascript class. 2012-08-24 00:24:04 +08:00
James Chen ee3e68014b Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into android_editbox 2012-08-24 00:16:11 +08:00
James Chen 1685e5c497 issue #1429: Used java code to implement keyboard layout. 2012-08-24 00:15:15 +08:00
James Chen 7f2c9f6fb4 issue #1429: Removed some used codes. 2012-08-23 23:09:12 +08:00
minggo 5fb9563c63 Merge pull request #1222 from minggo/gles20 
fix some bug of xcode template & remove unneeded files
 2012-08-23 03:37:00 -07:00
minggo 3d3e5b3a93 fix some bug of xcode template & remove unneeded files 2012-08-23 18:36:08 +08:00
minggo 83606d7691 Merge pull request #1212 from mustime/testlua 
Testlua
 2012-08-23 03:08:25 -07:00
minggo 7bf0f09b95 Merge pull request #1221 from minggo/gles20 
fix some bugs while testing
 2012-08-23 03:05:05 -07:00
minggo 1a814ec492 Merge pull request #1220 from John-cdy/gles20 
issue #1404: Add android automated testing scripts for Mac OS and fixed ...
 2012-08-23 03:03:26 -07:00
minggo 37cb691600 fix some bugs while testing 2012-08-23 18:01:28 +08:00
Caidongyang b5483bf6f7 issue #1404: Add android automated testing scripts for Mac OS and fixed some errors in previous scripts. 2012-08-23 17:21:11 +08:00
mustime b815504d69 issue #1425: change the design of CCCallFunc::create(int nHandler) 2012-08-23 16:27:22 +08:00
mustime 96e621bae8 issue #1425: recreate LuaCocos2d.cpp for .pkg files' changes 2012-08-23 16:13:08 +08:00
mustime 36a99a099e issue #1425: add TestLua project 2012-08-23 16:10:50 +08:00