Commit Graph

5079 Commits

Author SHA1 Message Date
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
Donald Alan Morrison 3c7846e32f Fixed VS2010 Warning: C4018: '<' : signed/unsigned mismatch 2012-08-23 23:35:25 -07: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
Donald Alan Morrison 7ebcf82a2e Added *.opensdf to (dot)gitignore file for Visual Studio. 2012-08-23 22:57:07 -07:00
Donald Alan Morrison 3ee17b1a23 Merge with c9674e85e8. The diff revealed
there was no actual conflict, so only a dot was added to the comment so
git would accept the commit (otherwise "nothing to commit"); and thus the
history is preserved.
2012-08-23 22:32:33 -07:00
Donald Alan Morrison 5612e35487 Added ipch/ to (dot)gitignore for Visual Studio generated pre-compiled headers. 2012-08-23 21:27:20 -07:00
Donald Alan Morrison 82bb62f8e3 MSVC++2010 doesn't accept C99-style named-initialization like clang. 2012-08-23 20:58:25 -07: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
mustime 4c7ad0d0d1 issue #1425: testlua project 2012-08-24 10:23:23 +08:00
Caidongyang 3c9b8cacd4 issue #1404:Modify some parameters in script files for windows. 2012-08-24 10:23:00 +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
James Chen 06038163ca iss1429: Finished using Dialog to implement CCEditBox for android port.
Next step:
	Using Java codes to implement Cocos2dxEditBox. Don't use style.xml, color.xml and keyboard.xml.
2012-08-23 15:34:57 +08:00
minggo 23bd0268cf Merge pull request #1217 from zeaster/gles20
fixed #1298: double firing CCCallFunc action in CCSequence
2012-08-23 00:34:06 -07:00
minggo 7a6f5cd872 Merge pull request #1219 from minggo/iss1441_testcpp_resources
fixed #1441: put hd and ipad resources into separate directory
2012-08-22 23:28:42 -07:00
minggo 0c5cec0056 fixed #1441:fix a logical error in CCFileUtils::fullPathFromRelativePath() 2012-08-23 14:26:39 +08:00
minggo d83cdbda09 fixed #1441: put hd and ipad resources into separate directory 2012-08-23 14:20:32 +08:00
mustime be3a02c7f3 issue #1425: fixed the problem when using ccBezierConfig to create
CCBezierAction
2012-08-23 13:54:23 +08:00
mustime ceb5e41ab0 issue #1425: fixed the problem when using ccBezierConfig to create
CCBezierAction
2012-08-23 13:52:12 +08:00
James Chen a437099779 issue #1429: Use activity to implement CCEditBox for android. Next step: use dialog to implement CCEditBox. 2012-08-23 09:42:28 +08:00