Commit Graph

128 Commits

Author SHA1 Message Date
minggo 07ddd43695 issue #1437:make CCApplication::sharedApplication() return pointer 2012-08-21 15:28:43 +08:00
Caidongyang 920430edf5 issue #1404:Adjust the time of some testcases. 2012-08-17 14:01:13 +08:00
Caidongyang 117facdede issue 1404: Fixed some errors in qtp script. 2012-08-16 18:27:25 +08:00
Caidongyang 7bde427b56 issue Add new object to qtp_ObjectRepository. 2012-08-16 15:23:25 +08:00
Caidongyang 035480c8e0 issue Now i change the mail recipient to me,and when the test is stable,i will change it back. 2012-08-15 16:25:00 +08:00
Caidongyang 6e19e1b592 issue Modify scripts.mts and build script files. 2012-08-15 15:59:46 +08:00
Caidongyang 2dca0d9945 issue Modify qtp_win32 script.mts. 2012-08-15 15:17:34 +08:00
Caidongyang 8ce66142a0 issue Delete snapshots's files 2012-08-14 16:30:45 +08:00
Caidongyang 361b8516c7 issue #1404:Add win32Test project and rename some script files 2012-08-14 15:48:38 +08:00
mustime 42208f93aa issue : change the interfaces in .pkg files to satisfy the current
version
2012-08-10 18:14:04 +08:00
mustime 67add089d8 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into testlua 2012-08-10 14:20:21 +08:00
mustime 3a758794d7 issue : reconstruct some interfaces in .pkg files 2012-08-09 12:51:59 +08:00
mustime 0f29640310 issue : reconstruct some interfaces in .pkg files 2012-08-09 12:46:45 +08:00
mustime e6e43029e5 testlua: modified some pkg files 2012-08-06 16:02:49 +08:00
Caidongyang 37d84ba6bb issue #1404:Add new files 2012-08-06 11:59:37 +08:00
Caidongyang 3fce97e62e issue #1404:Modify directory structure 2012-08-06 11:55:05 +08:00
Caidongyang 71ada5b0a5 issue 1404:Fixed the problem of rootconfig.sh to modify build_native.sh 2012-08-03 10:42:39 +08:00
Caidongyang f578fc8a90 Issue1404 Modify *.sh files and add xcode4 (debug and release) build scripts,include ios and mac 2012-08-02 14:31:07 +08:00
Caidongyang e8d82c3e77 Modify *.bat files error for android(win32) 2012-07-31 18:01:57 +08:00
Caidongyang 935b0bc944 Issue 1404 Modify *.bat files for android(win32) 2012-07-31 17:16:58 +08:00
Caidongyang d831e6feaa #Issus1404 Modify *.bat scripts for android 2012-07-31 17:13:14 +08:00
Caidongyang 24efe50c6e Issue Add shell scripts 2012-07-31 13:39:36 +08:00
Caidongyang 5dc604ebfc Issue Add automatic testing tools 2012-07-26 16:25:54 +08:00
minggo 59db9f0c6f issue #1399:lua building works ok after adjusting directory structure 2012-07-23 17:14:18 +08:00
minggo 4eb59cd3d0 issue #1399:xcode template works ok after adjusting directory structure 2012-07-23 17:10:56 +08:00
James Chen aba33b5bda Reverted build_native.sh. 2012-06-28 16:58:32 +08:00
James Chen edca0871a6 fixed : Invoking CCLabelTTF:setPosition(x,y) in lua script causes crash. 2012-06-28 00:05:45 +08:00
James Chen a901b0bb12 fixed : Refactor "createWith***" to "create". 2012-06-27 14:21:29 +08:00
James Chen 95a2696b6b fixed : Some files of Resources folder which is copied by build_native.sh will lost authority in cygwin. 2012-06-26 12:09:23 +08:00
minggo 55eca9f516 fixed : make xcode template work ok 2012-06-22 12:00:27 +08:00
James Chen 411ae21cee fixed : Updated lua bindings. 2012-06-20 11:59:35 +08:00
minggo 6d0608d0f1 fixed : add CCScrollView for iOS 2012-06-18 19:24:47 +08:00
James Chen 1d0fa4a9aa fixed : Updated lua bindings. 2012-06-15 17:26:11 +08:00
James Chen bc150ea5a9 fixed : Exported 'create' method for lua bindings. 2012-06-15 11:46:51 +08:00
James Chen 4c1ca36aa8 fixed : The compilation of Hellolua and testjs project was broken after synchronizing to rc2. 2012-06-15 10:51:53 +08:00
James Chen 37aa196c73 Removed some unused codes. 2012-06-06 14:31:49 +08:00
James Chen c596257a6d Merge pull request from dumganhar/gles20
Updated main.cpp for each project of android.
2012-05-30 19:14:41 -07:00
James Chen 9be586e4ec Updated main.cpp for each project of android. 2012-05-31 10:13:05 +08:00
minggo a283bfed4f fixed : update xcode template 2012-05-31 09:52:39 +08:00
James Chen 4864640816 fixed : Re-generated LuaCocos2d.cpp. 2012-05-29 17:25:18 +08:00
James Chen 19c96632b5 fixed : Changed linebreak symbol to UNIX format ('\n'),replaced 'tab' with four spaces. 2012-05-29 16:21:23 +08:00
James Chen 22b2f722b5 fixed : Using CCString::stringWithContentsOfFile to get string from lua script files. 2012-05-04 14:31:56 +08:00
James Chen 5fc72581cb issue : Removed CCApplication::initInstance. 2012-05-02 17:50:26 +08:00
James Chen 5c7e7f6563 issue : Updated ios template. 2012-05-02 12:01:53 +08:00
James Chen 6f62251bb6 fixed : Updated some .pkg files. 2012-04-26 14:32:17 +08:00
James Chen edfb8c1f9c issue : 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 : updated some pkg files for lua binding. 2012-04-26 09:34:42 +08:00
James Chen 230b8a386b issue : Changed linebreak symbol to UNIX format ('\n'),replaced 'tab'
with four spaces. Also,
1. Used macro NS_CC_BEGIN instead of namespace cocos2d {, NS_CC_END instead
of }.
2. Removed some unused files.
3. Renamed the name of some folders, for example,
"test.android"-->"proj.android" .
2012-04-19 14:35:52 +08:00
James Chen 783b2fe79b Removed some unused codes regard to WOPHONE. 2012-04-19 10:46:37 +08:00
Phenix Yu e623cd6357 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
Conflicts:
	cocos2dx/include/CCTexture2D.h
	cocos2dx/include/ccMacros.h
	cocos2dx/textures/CCTexture2D.cpp
	lua/cocos2dx_support/LuaCocos2d.cpp
2012-04-15 15:46:01 +08:00