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

225 Commits

Author SHA1 Message Date
YuLei dcc8733a53 update tolua++ for mac 2012-09-04 09:56:55 +08:00
YuLei c86595ddde [Lua] remove glLineWidth() 2012-09-02 01:18:28 +08:00
YuLei 135f2fdabd remove unused files 2012-09-02 01:13:52 +08:00
YuLei 6f3833af73 Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20 2012-09-02 00:56:27 +08:00
YuLei da79992275 Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20 2012-09-02 00:38:57 +08:00
James Chen 35f6f937c9 Merge pull request #1271 from mustime/testlua 
issue #1425: add NodeTest to TestLua.
 2012-09-01 01:52:42 -07:00
James Chen 382b08a947 fixed #1455: Adding xcode template for cocos2dx-js. Thank rohankuruvilla . 2012-09-01 10:49:15 +08:00
Rohan Kuruvilla 374232ac88 Adding xcode template for cocos2dx-js 2012-08-31 12:07:58 -07:00
mustime f5506d58e1 issue #1425: update pkg files and recreate binding 2012-08-31 18:29:44 +08:00
James Chen 4c3c032ec5 issue #1404: Updated authority for .sh files. Made them can be executable. 2012-08-31 14:54:10 +08:00
Caidongyang 59934dbb6a issue #1404: Add ios and mac os test scripts,update python and shell scripts. 2012-08-31 13:37:54 +08:00
YuLei 748d64ecc0 Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20 2012-08-31 09:47:03 +08:00
James Chen e584b94728 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into js 
Conflicts:
	scripting/javascript/bindings/cocos2d_generated.cpp
 2012-08-30 20:16:54 +08:00
mustime 55a9444186 Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into testlua 2012-08-30 16:45:40 +08:00
mustime 5ed3ec14e9 issue #1425: update pkg and recreate LuaCococs2d.cpp 2012-08-30 15:33:54 +08:00
folecr 5b89e8d410 Update cxx-generator to latest version 2012-08-29 14:44:07 -07:00
minggo af79357549 Merge pull request #1258 from John-cdy/gles20 
issue #1404:Update android script files,and make more notes
 2012-08-29 07:49:22 -07:00
Caidongyang 56e784701c issue #1404:Update android script files,and make more notes 2012-08-29 18:23:46 +08:00
YuLei 64c8ed3398 [Lua] update CCNode:isVisible() and CCNode:setVisible() 2012-08-29 17:51:42 +08:00
YuLei 66b221dc79 [Lua] update luabinding 2012-08-29 17:32:47 +08:00
mustime c15c96ac28 Merge https://github.com/cocos2d/cocos2d-x into testlua 2012-08-29 17:29:33 +08:00
mustime df25d56cc3 issue #1425: update pkg for tolua++ binding 2012-08-29 17:10:06 +08:00
YuLei 8a680c4c06 [Lua] add CCFileUtils:setResourceDirectory() 2012-08-28 18:14:00 +08:00
YuLei d7881b7c3a [Lua] update luabinding 2012-08-28 15:54:19 +08:00
YuLei f6a17f69f7 update tolua++ pkg files 
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20
 2012-08-28 14:53:52 +08:00
minggo f7993b9954 Merge pull request #1250 from mustime/testlua 
issue #1425: remove endToLua interface in CCDirector.h, use renaming feature in tolua++ instead.
 2012-08-27 23:35:55 -07:00
mustime 69679ff545 issue #1425: remove endToLua interface in CCDirector.h, use renaming 
feature in tolua++ instead.
 2012-08-28 14:28:33 +08:00
minggo 76410f4b5b Merge pull request #1248 from mustime/testlua 
Testlua
 2012-08-27 23:18:22 -07:00
mustime 60a64d0eca issue #1425: remove the scheduleScriptHandler interface from CCNode 2012-08-28 12:49:43 +08:00
mustime 91b9949e4b issue #1425: update pkg file 2012-08-28 11:52:22 +08:00
mustime fbf90e2c2c issue #1425: fix a error when using ccp in lua 2012-08-28 11:51:45 +08:00
Rolando Abarca a4f35d4b5c updates cxx-generator 2012-08-27 08:43:40 -07:00
Rolando Abarca e98049fd76 adds cxx-generator as a submodule 2012-08-27 08:43:39 -07:00
minggo d1f92b8da4 Merge pull request #1239 from mustime/testlua 
Testlua
 2012-08-27 02:45:29 -07:00
Caidongyang 3196b2aa11 issue #1404:Modify monkeyrunner python script. 2012-08-27 15:12:55 +08:00
mustime be116f5352 issue #1425: update TestLua project 2012-08-27 11:43:47 +08:00
minggo b3b00a5ccd Merge pull request #1230 from John-cdy/gles20 
issue #1404:Modify some parameters in script files for windows.
 2012-08-26 20:04:51 -07:00
Caidongyang 3c9b8cacd4 issue #1404:Modify some parameters in script files for windows. 2012-08-24 10:23:00 +08:00
minggo 83606d7691 Merge pull request #1212 from mustime/testlua 
Testlua
 2012-08-23 03:08:25 -07: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 ceb5e41ab0 issue #1425: fixed the problem when using ccBezierConfig to create 
CCBezierAction
 2012-08-23 13:52:12 +08:00
Caidongyang 6ed075f09a issue #1404: Add android test python script files and modify android compile script files. 2012-08-22 11:08:18 +08:00
mustime d01842a37b Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into testlua 
Conflicts:
	scripting/lua/cocos2dx_support/LuaCocos2d.cpp
 2012-08-22 09:39:21 +08:00
mustime 57659d1584 issue #1425: modifing pkg files for Lua 2012-08-21 18:42:35 +08:00
minggo 07ddd43695 issue #1437:make CCApplication::sharedApplication() return pointer 2012-08-21 15:28:43 +08:00
mustime 108c7608ec Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into testlua 2012-08-20 09:33:30 +08:00
Caidongyang 920430edf5 issue #1404:Adjust the time of some testcases. 2012-08-17 14:01:13 +08:00
mustime 12fb19c2d9 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into testlua 2012-08-17 10:42:52 +08:00
Caidongyang 117facdede issue 1404: Fixed some errors in qtp script. 2012-08-16 18:27:25 +08:00
Caidongyang 7bde427b56 issue #1404 Add new object to qtp_ObjectRepository. 2012-08-16 15:23:25 +08:00
mustime a5a4ca9868 issue #1425: add matrix.pkg 2012-08-16 11:39:47 +08:00
Caidongyang 035480c8e0 issue #1404 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 #1404 Modify scripts.mts and build script files. 2012-08-15 15:59:46 +08:00
Caidongyang 2dca0d9945 issue #1404 Modify qtp_win32 script.mts. 2012-08-15 15:17:34 +08:00
Caidongyang 8ce66142a0 issue #1404 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 #1425: 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 #1425: reconstruct some interfaces in .pkg files 2012-08-09 12:51:59 +08:00
mustime 0f29640310 issue #1425: 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 #1404 Add shell scripts 2012-07-31 13:39:36 +08:00
Caidongyang 5dc604ebfc Issue #1404 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 #1369: Invoking CCLabelTTF:setPosition(x,y) in lua script causes crash. 2012-06-28 00:05:45 +08:00
James Chen a901b0bb12 fixed #1367: Refactor "createWith***" to "create". 2012-06-27 14:21:29 +08:00
James Chen 95a2696b6b fixed #1365: 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 #1343: make xcode template work ok 2012-06-22 12:00:27 +08:00
James Chen 411ae21cee fixed #1336: Updated lua bindings. 2012-06-20 11:59:35 +08:00
minggo 6d0608d0f1 fixed #1333: add CCScrollView for iOS 2012-06-18 19:24:47 +08:00
James Chen 1d0fa4a9aa fixed #1292: Updated lua bindings. 2012-06-15 17:26:11 +08:00
James Chen bc150ea5a9 fixed #1327: Exported 'create' method for lua bindings. 2012-06-15 11:46:51 +08:00
James Chen 4c1ca36aa8 fixed #1326: 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 #948 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 #1191: update xcode template 2012-05-31 09:52:39 +08:00
James Chen 4864640816 fixed #1270: Re-generated LuaCocos2d.cpp. 2012-05-29 17:25:18 +08:00
James Chen 19c96632b5 fixed #1176: Changed linebreak symbol to UNIX format ('\n'),replaced 'tab' with four spaces. 2012-05-29 16:21:23 +08:00
James Chen 22b2f722b5 fixed #1220: Using CCString::stringWithContentsOfFile to get string from lua script files. 2012-05-04 14:31:56 +08:00
James Chen 5fc72581cb issue #1204: Removed CCApplication::initInstance. 2012-05-02 17:50:26 +08:00
James Chen 5c7e7f6563 issue #1194: Updated ios template. 2012-05-02 12:01:53 +08:00
James Chen 6f62251bb6 fixed #1190: Updated some .pkg files. 2012-04-26 14:32:17 +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 230b8a386b issue #1176: 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
Phenix Yu a05757f741 update for msvc2010 2012-04-09 00:10:12 +08:00
minggo c98dd0cf2d fixed #948: remove getIndexOfObject() 2012-02-14 10:49:53 +08:00
minggo bee77a7d9f issue #973: add tool for mack 2012-02-10 10:43:36 +08:00