Commit Graph

217 Commits

Author SHA1 Message Date
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