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

1142 Commits

Author SHA1 Message Date
Rohan Kuruvilla ea92936c1f Adding bindings for CCBReader and other improvements. 
1. Added additional CCBReader bindings, including callback support for animationCompleted
2. Improved design for JS CallbackWrappers
3. Added bindings for pDistance
4. Updating cocos2dx.ini
 2012-11-01 00:08:01 -07:00
Rohan Kuruvilla 2fbb748b7c Adding sections for CCBReader bindings generation as well as renaming other bindings 2012-11-01 00:06:24 -07:00
James Chen 1538ad4e78 Updated jenkins_scripts/mac/android/generate-js-cxx-bindings.sh. 
The local repo needs to be updated in Jenkins command before executing this script.
So commented some codes.
 2012-10-30 17:54:48 +08:00
James Chen 8ed7d63309 Updated LuaBindings codes since CCEGLViewProtocol::getSize has been renamed to CCEGLViewProtocol::getDesignResolutionSize. 2012-10-30 10:35:19 +08:00
CocosRobot bf255f6162 Updated jenkins script for auto-gen jsbinding codes. 2012-10-29 18:47:03 +08:00
James Chen 132d927f18 Updated the submodule of tools/cxx-generator. 2012-10-26 09:57:01 +08:00
Rolando Abarca ee6e139316 updates cxx-generator 2012-10-18 17:46:10 -07:00
folecr a22c84d3d1 Update examples and documentation 2012-10-15 16:30:03 -07:00
folecr b109c75cef cd to submodule directory for git operations on submodule 
* instead of using the --git-dir and --git-worktree options
 * cd-ing to the submodule directory seems to behave differently
 * ... and more reliably
 2012-10-15 16:26:01 -07:00
folecr ae90c09666 Fix order of git operations 2012-10-15 15:58:44 -07:00
folecr 689ceec780 Generate pull requests 
* Commit changes to generated branch of cocos2d-x repo instead of gles20
 * Generate pull request from the generated branch to the specified base
 2012-10-15 15:58:31 -07:00
folecr 93b5667ffe Exit on error except in the one case where a non-zero return value is expected 2012-10-15 14:27:54 -07:00
folecr 5780f0aabd Diff with origin/master 
* rather than the default - HEAD
 2012-10-15 13:23:44 -07:00
minggo 2ded8ea034 Merge pull request #1442 from dumganhar/iss1486-multi-res 
Multiresolution support
 2012-10-15 02:15:21 -07:00
folecr d2ed5567b7 Test for diffs in existing files 
* before proceeding with committing and pushing changes
 * remove "set -e" so that above test makes sense
 * verbose git operations where possible
 2012-10-14 22:23:31 -07:00
folecr 4955c14928 Fix --git-dir parameter for git submodule operations 2012-10-14 22:12:24 -07:00
James Chen 99a7dcefa4 issue #1486: Updated lua bindings. 2012-10-12 16:04:26 +08:00
Rohan Kuruvilla e7ac758b9f Updating bindings to match cocos2d-html5 2012-10-11 18:45:22 -07:00
folecr 57e8c4b304 Updated script behaviour 
* Auto generated bindings are always pushed to remote repo.
 * If a remote repository is not given, exit with failure.
 * Updating the submodule reference is not done unless
 * ... remote cocos2dx repo is set.
 2012-10-10 08:37:54 -07:00
James Chen 26a5f31f0e Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1469-moonwarriors 2012-10-10 15:25:49 +08:00
James Chen bb135e49d1 issue #1469: Ignored 'getBlendFunc' and 'setBlendFunc' for CCSpriteBatchNode,CCMotionStreak,CCAtlasNode,CCParticleBatchNode,CCLayerColor,CCParticleSystem. 2012-10-10 15:23:13 +08:00
folecr e6622eebd0 Allow partial run of script when cocos2dx remote repository is not set. 
* Also fix some comments.
 2012-10-09 21:36:32 -07:00
minggo e7fea0449f Merge pull request #1433 from rohankuruvilla/gles20 
Adding CCSchedule bindings. Also adding CCOrbitCamera bindings and modif...
 2012-10-09 18:34:36 -07:00
folecr 66d843ce38 Jenkins script for auto-generating and committing JS bindings. 2012-10-09 15:12:15 -07:00
Rohan Kuruvilla 12292afee6 Adding CCSchedule bindings. Also adding CCOrbitCamera bindings and modifying cocos2dx.ini 2012-10-09 15:03:14 -07:00
walzer 418fa5301a add iOS 5.0, 6.0 build targets to jenkins_scripts 2012-09-28 12:00:03 +08:00
folecr d57842bec5 Generate bindings for CocosDenshion's SimpleAudioEngine 
* Bindings configured to rename SimpleAudioEngine to AudioEngine
 2012-09-27 13:39:49 -07:00
minggo c3c1022fb4 Merge pull request #1380 from dualface/gles20 
[Lua] fix CCActionInterval, CCFiniteTimeAction, CCAction declare
 2012-09-25 19:30:04 -07:00
folecr 53889c5b3c Fix comment. No functional changes. 2012-09-25 13:55:06 -07:00
dualface 8d104b8244 [Lua] add CCApplication:getTargetPaltform() 2012-09-25 16:43:36 +08:00
dualface a2b468f2b3 [Lua] fix CCActionInterval, CCFiniteTimeAction, CCAction declare 2012-09-25 16:27:54 +08:00
folecr b5cfc3034b Jenkins script to generate JS bindings 2012-09-24 21:48:12 -07:00
folecr d01b6093d8 gendbings.sh generates userconf.ini 
* ... and reads userconf.ini from current working directory
 * ... also specify that this script is run by /bin/bash
 2012-09-24 21:48:12 -07:00
folecr 1a6581383c Spidermonkey headers are not used for generation 2012-09-24 21:48:11 -07:00
minggo 74b9e2539b fix auto building error 2012-09-25 12:13:06 +08:00
Walzer 5c5544f823 Merge pull request #1363 from walzer/gles20 
fix ios6 orientation error, which is caused by ios6 api change.
 2012-09-23 21:00:30 -07:00
walzer 5dfeb46235 move cxx-generator submodule pointer from db61f83 to 40ad793 as Rolando committed. 2012-09-24 11:58:29 +08:00
minggo 2ed7b9febe Merge pull request #1365 from dualface/luafix 
luabinding bugfix
 2012-09-23 20:17:23 -07:00
walzer 5b3bb2a087 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 
Conflicts fixed:
	cocos2dx/platform/ios/FontLabel/FontLabel.m
	cocos2dx/platform/ios/FontLabel/FontLabelStringDrawing.m
	template/xcode4/lib_js.xctemplate/TemplateInfo.plist
 2012-09-24 11:03:26 +08:00
Walzer 8d51c0ed19 fixed #1482, deal with ios6 orientation in templates/xcode4, with a little refactoring. 
1. I think you guys haven't tested Xcode templates before 2.0.2 release. The templates are ALL BROKEN because CCHttpClient requires libcurl, which is excluded by xcode4_template_generator/run_generator.sh. It means developers on 2.0.2 would create a new project with compilation error, damn!

2. ios/AppController.*, ios/RootViewController.*, ios/main.m are moved from cocos2dx_*.xctemplate folder to base_ios.xctemplate folder. I don't want to modify tons of RootViewController clones any more.
 2012-09-23 22:11:29 +08:00
folecr cbade952f6 Update to latest cxx-generator 2012-09-21 12:07:30 -07:00
folecr 5ff4d73688 Use new directives for renaming functions and classes 2012-09-21 11:41:08 -07:00
folecr 901146e2ee Synchronize cocos2dx.ini 2012-09-21 11:41:08 -07:00
Rohan Kuruvilla bc35e73179 Updating cocos2dx.ini including, 
1. Adding key "rename_classes"
2. Renaming key "rename" to "rename_functions"
3. Adding CCParticleSystemQuad specific stuff
 2012-09-20 18:02:17 -07:00
Rohan Kuruvilla 9e1e64509b Copying changes previously made into cxx-generator/targets/spidermonkey/common 
1. Fixed memory leak while removing proxy objects
2. Fixed JS Context restart
3. Added JS conversion for CCArray
4. Updated generated bindings with some more classes
 2012-09-20 18:02:17 -07:00
dualface 46a8eb5491 [Lua] add ccTexParams, add new luabinding build script, update luabinding 2012-09-20 23:37:23 +08:00
minggo 31c6f46b6a Merge pull request #1329 from dualface/gles20 
update luabinding for overloaded functions, fix mac CCLuaLog crash ...
 2012-09-20 01:11:36 -07:00
dualface 93b669b936 Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20 2012-09-20 09:27:45 +08:00
folecr a9305fd4df Update tools/cxx-generator 2012-09-19 14:00:38 -07:00
folecr 92ce4d4783 Update cocos2dx.ini so that the generated bindings and the TestJavascript app compile. 2012-09-19 13:21:26 -07:00
folecr 2c1c58eeb9 Update path calculation. 2012-09-18 17:02:21 -07:00
folecr 4c1fad1c6c chmod u+x genbindings.sh 2012-09-18 17:02:21 -07:00
folecr 8a688ef424 Script and config file for generating bindings 2012-09-18 17:02:21 -07:00
dualface ded6e3edcf Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20 2012-09-17 17:55:41 +08:00
dualface eba97a9b1e [Lua] fix luabinding overloaded functions 2012-09-17 14:40:42 +08:00
Walzer c1ab4eab48 fixed #1404, modify "ant release" to "ant debug" in mac-android-4.x-debug.sh 2012-09-16 16:13:54 +08:00
dualface 515ec3c482 ccDrawCircle() add scaleX and scaleY 2012-09-14 18:00:11 +08:00
Walzer 7c744e785a fixed #1404, tweak back to lower case :) 2012-09-14 16:42:44 +08:00
Walzer bbb37a4d7c issue #1404, case insensitive, oops 2012-09-14 16:41:41 +08:00
Walzer 6fbeacf750 issue #1404, add scripts for ci 2012-09-14 16:33:54 +08:00
Walzer 47f51bf7af Update tools/jenkins_scripts/mac/ios/build-ios-all.sh 2012-09-13 14:11:09 +08:00
Walzer de7969afdf update jenkins_scripts for build android-ant on windows cygwin 2012-09-13 11:28:12 +08:00
Walzer 63e279e484 Merge pull request #1308 from walzer/gles20 
updage tools/jenkins_scripts
 2012-09-12 03:29:12 -07:00
Walzer ba5f0996ad update tools/jenkins_scripts/ 2012-09-12 18:27:57 +08:00
Walzer 7d13516056 rename JenkinsScript to more comfortable 2012-09-12 16:00:36 +08:00
YuLei a22122d0ed [Lua] fix: CCCallFunc : public CCActionInstant declare typo error 2012-09-07 19:19:50 +08:00
YuLei 9d2b0b04f2 [Lua] update luabinding for CCPoint, CCSize, CCRect 2012-09-05 14:49:26 +08:00
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
YuLei Liao 7a96d13fb6 rename all FuncID to Handler 2012-02-07 11:43:29 +08:00
YuLei Liao 69a7e2a2e3 * change unsigned int CCObject::m_uLuaID -> int CCObject::m_nLuaID, because LUA_INTEGER is int. 2012-02-04 11:34:17 +08:00
dumganhar 6fbf2f1d09 move SelectorProtocol to CCObject 2012-02-03 15:05:29 +08:00
YuLei Liao 279e915b55 * update tolua++ packages 2012-01-21 01:29:30 +08:00
YuLei Liao 26ab000906 * tmp 2012-01-21 01:15:05 +08:00
YuLei Liao 9660bcd165 * merge upstream/master to master 2012-01-20 19:08:21 +08:00
Krystian Szczesny fecd429044 Fixed missing "using namespace cocos2d;" in LuaCocos2d.cpp when using tolua++ 
Added tolua++ for Mac, which was posted on Cocos2d-x forums by Haseeb Yousaf
 2012-01-14 11:31:49 +01:00
minggo 75216ac9ca make CCTouchDelegate::touchDelegateRetain() and touchDelegateRelease as pure virtual function 2012-01-11 16:54:14 +08:00
minggo 8a05363b05 generate new LuaCocos2d.cpp for new codes 2012-01-04 13:52:58 +08:00
YuLei Liao bc52b0dd73 * fix CCAction class 2011-12-25 11:48:37 +08:00
YuLei Liao bbad5a4392 * merge upstream/master to master 2011-12-25 11:48:03 +08:00
minggo 333342afe2 fixed #892: update pkg and LuaCocos2d.cpp 2011-12-23 11:10:36 +08:00
YuLei Liao 318a4c5ba8 merge upstream/master to master 2011-12-17 12:02:24 +08:00
minggo 3bf11dba7e issue #892: modify pkg for lua 2011-12-07 15:24:03 +08:00
YuLei Liao 010a386338 * add CCApplication, CCFileUtils to Lua support 2011-12-05 13:57:43 +08:00
YuLei Liao 442e06e62e * add CCNode:getPositionLua(), return CCPoint 2011-12-04 11:35:55 +08:00
YuLei Liao ffe54c4ce5 * add more Lua property for CCNode, CCSprite 2011-12-04 10:57:20 +08:00
YuLei Liao f0e5cd9896 * add Lua property support for CCNode 2011-12-04 10:28:20 +08:00
YuLei Liao cf12806558 merge luafix-0.9.2 2011-12-01 22:02:16 +08:00
YuLei Liao f860edc744 Merge remote-tracking branch 'refs/remotes/upstream/master' 2011-12-01 22:00:21 +08:00
Walzer 21af60ee9c update xcode4 templates 2011-12-01 17:00:30 +08:00
YuLei Liao fe7f810096 * make CCEase* working for CCNode:runAction() 2011-12-01 16:55:21 +08:00
YuLei Liao 2d9e8f065b * add CCNode:getPositionX(), CCNode:getPositionY(), CCNode:setPositionX(), CCNode:setPositionY() 2011-12-01 14:58:39 +08:00
YuLei Liao 45fe3b3090 * merge luafix-0.9.2 2011-11-30 21:42:18 +08:00
YuLei Liao 216ad9b9cb * merge upstream/master to master 2011-11-30 21:38:20 +08:00
YuLei Liao 31285fea17 * add Touch & MultiTouches lua support 2011-11-30 21:27:50 +08:00
minggo f693a5a10e fix type error according the change of CCSprite 2011-11-30 17:49:52 +08:00
YuLei Liao ebd381af26 * merge luafix-0.9.2 to master 2011-11-29 19:20:49 +08:00
YuLei Liao 07a468cec9 * merge LuaSimpleAudioEngine to LuaCocos2d 2011-11-29 17:39:47 +08:00
YuLei Liao 757f840b47 * update tolua++ .pkg files, add CCScene::registerScriptEventsHandler(), CCScene::unregisterScriptEventsHandler() 2011-11-29 17:12:08 +08:00
YuLei Liao c7ee84ccd4 * update tolua++ .pkg files 2011-11-29 15:45:20 +08:00
YuLei Liao 153774b46d * merge CCTransitionPageTurn.pkg, CCTransitionRadial.pkg to CCTransition.pkg 2011-11-28 11:27:24 +08:00
YuLei Liao 7a6253d9aa * merge cocos2d-1.0.1-x-0.9.2-luafix to master 2011-11-21 16:38:00 +08:00
YuLei Liao 396568a22e * merge upstream master -> master 2011-11-21 12:12:13 +08:00
YuLei Liao 5b696828dc * update tolua++ .pkg files 2011-11-21 00:30:55 +08:00
YuLei Liao ca111e2937 * update tolua++ .pkg files 2011-11-18 20:34:39 +08:00
minggo d48da20b0f synchrolize to master 2011-11-18 18:53:53 +08:00
Phenix Yu 255293119d add tolua_usertype(tolua_S,"void*") to fix CCCallFuncND 2011-11-15 17:01:07 +08:00
Phenix Yu 786feb6a8d Merge remote-tracking branch 'remotes/upstream/master' 
Conflicts:
	HelloLua/Classes/AppDelegate.cpp
	HelloLua/Resource/hello.lua
	HelloLua/ios/HelloLua.xcodeproj/project.pbxproj
	HelloLua/win32/HelloLua.win32.vcproj
	HelloLua/win32/HelloLua.win32.vcxproj.filters
	cocos2dx/include/ccMacros.h
	cocos2dx/platform/ios/AccelerometerDelegateWrapper.mm
	lua/cocos2dx_support/LuaCocos2d.cpp
	lua/cocos2dx_support/LuaEngineImpl.cpp
	template/xcode3/cocos2d-x_lua_app/___PROJECTNAME___.xcodeproj/project.pbxproj
	template/xcode4/cocos2dx_lua.xctemplate/Resources/hello.lua
	template/xcode4/cocos2dx_lua.xctemplate/TemplateInfo.plist
	tests/test.win32/test.win32.vcxproj.filters
 2011-11-15 14:43:55 +08:00
Phenix Yu 441f8e6da9 Merge branch 'master' of https://github.com/jbyu/cocos2d-x 
Conflicts:
	cocos2dx/CCScheduler.cpp
	lua/cocos2dx_support/LuaEngine.cpp
	lua/cocos2dx_support/LuaEngine.h
 2011-11-15 14:00:52 +08:00
YuLei Liao 0f93cbf219 * update tolua++ .pkg files 
+ add bulid_macosx.xml
+ add basic.lua
 2011-11-09 23:23:47 +08:00
YuLei Liao 4b8e39e77b - delete unused tolua++ .pkg files 2011-11-09 23:18:32 +08:00
YuLei Liao ce0b17adec Merge remote-tracking branch 'upstream/master' 2011-10-31 23:16:28 +08:00
dumganhar da794c1613 Merge branch 'master' into bada 2011-10-21 09:28:29 +08:00
Walzer 00669cc5ad update xcode4 templates generator & xcode4 template for lua. 2011-10-19 23:11:17 +08:00
YuLei Liao 40da58c153 * add lua function object interface 2011-10-02 07:43:14 +08:00
YuLei Liao 1c18a114b1 + add tolua build config for macosx 2011-10-01 22:42:25 +08:00
dumganhar db4d51496e Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into bada 
Conflicts:
	cocos2dx/platform/CCAccelerometer_platform.h
	cocos2dx/platform/CCApplication_platform.h
	cocos2dx/platform/CCArchOptimalParticleSystem.h
	cocos2dx/platform/CCEGLView_platform.h
	cocos2dx/platform/CCPlatformConfig.h
	cocos2dx/platform/CCSAXParser.h
	cocos2dx/platform/CCStdC.h
	tests/AppDelegate.cpp
	tests/tests/Box2DTestBed/Tests/EdgeShapes.h
 2011-09-29 16:03:37 +08:00
ciaranj d1f031d2de Add support for particleWithFile for both Quad & Point Particle Systems 2011-09-27 23:15:54 +01:00
minggo 8f1208368b Merge pull request #515 from ciaranj/lua_project_generator 
Initial example working version of a lua project generator
 2011-09-20 01:50:12 -07:00
ciaranj 0296027335 Supplying README file 2011-09-20 08:03:52 +01:00
ciaranj 209214008e Adding in Particle Systems to Lua Bindings (inc. the example systems.) 2011-09-20 07:58:04 +01:00
ciaranj 2662af753a Initial example working version of a lua project generator 2011-09-19 23:42:22 +01:00
ciaranj d91c728a52 Updating README file as requested 2011-09-19 07:47:17 +01:00
ciaranj 11f03e9c8c Adding a build file that correctly generates LuaCocos2d.cpp 2011-09-18 18:29:17 +01:00
ciaranj 75edaccac9 Updating AccelerometerDelegate related classes 
The checked in .pkg files seemed to be generating lua-bindings for
cocos2d methods that don't exist.  This seems strange, so have fixed it
for now.
 2011-09-18 18:18:02 +01:00
minggo d42336df56 remove functions of AccelerometerKeep & AccelerometerDestroy declation 2011-08-31 11:34:45 +08:00
sunzhuoshi 9a9cb02405 Added CocsDenshion lua support and tested with HelloLua on iOS 
The test music and sound effect come from "tests" project
 2011-08-16 23:56:41 +08:00
minggo c6cb8f4980 make HelloLua work ok on win32 2011-08-15 16:23:23 +08:00
minggo 6892787afa fixed #653: add CCScheduler::unscheduleScriptFunc() 2011-08-03 14:15:35 +08:00
minggo 792204e908 fixed #645: update pkg file to v1.0.1 2011-08-02 16:21:23 +08:00
minggo 914706735f update LuaCocos2d.cpp and pkg files 2011-07-18 17:04:15 +08:00
minggo d97fcbf752 fixed #612: export some CCNode methods to lua 2011-07-18 10:28:25 +08:00
minggo a3e9679578 fixed #611: add some functions for lua 2011-07-18 10:18:36 +08:00
RongHong 9328991cbd to update lua support 2011-07-12 15:18:14 +08:00
RongHong 41049ec0be Merge https://github.com/flyingpacer/cocos2d-x 2011-07-11 14:02:34 +08:00
RongHong 30166ad023 to commit the rest pkg files 2011-07-11 14:00:55 +08:00
unknown 54242d709e commit some pkg files 2011-07-08 22:32:54 +08:00
RongHong 1a869e7c3a to commit some pkg files 2011-07-08 18:31:02 +08:00
minggo 39a3b715cd fixed #589 2011-07-08 15:28:13 +08:00
Walzer bf99245dbb hide the xcode4 template generator script into tools folder 2011-06-25 14:20:10 +08:00
Walzer e606027b59 fixed #528, Lua can get the CCTouch array in callback function; Add CCNode parent for CCLayer in LuaCocos2d.cpp, HelloLua can move the farm layer now. 2011-06-24 21:03:33 +08:00
Walzer 3498a91710 [ios] issue #528, add script_support into xcode4 template 2011-06-23 10:01:57 +08:00
minggo 022e2b9998 issue #528: refactor ok on win32 2011-06-20 17:31:38 +08:00
minggo 9c49e27bf1 add extensions & tools directory 2011-06-14 14:31:25 +08:00