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

252 Commits

Author SHA1 Message Date
James Chen f2e0df4de3 issue #1565: Removed VS2008 support. 2012-11-19 14:42:27 +08:00
James Chen b95ff53747 Updated cocos2dx.ini. 2012-11-16 16:00:25 +08:00
James Chen 682faa5870 issue #1530: Don't export CCUserDefault to js since it has a private constructor. Do it in the future. 2012-11-16 15:58:21 +08:00
James Chen bb6df91749 issue #1530: Exported CCUserDefault to js. 2012-11-16 15:58:18 +08:00
Rohan Kuruvilla 39a4e6a19e Fixing bindings bug for CCScheduler. Also adding custom bindings for TMXLayer. Also updating ini 2012-11-16 15:56:27 +08:00
James Chen 26af535521 issue #1549: Updated cocos2dx.ini. Renamed some functions. 2012-11-06 14:19:27 +08:00
James Chen 0f3e0daeab Updated the submodule reference of "tools/cxx-generator". 2012-11-06 10:08:48 +08:00
James Chen 4a6d922ea4 issue #1549: Updated tools/tojs/cocos2dx.ini. 2012-11-05 18:45:39 +08:00
James Chen f88aa5058d Merge branch 'gles20' of https://github.com/rohankuruvilla/cocos2d-x into rohan-ccb 
Conflicts:
	scripting/javascript/bindings/cocos2d_specifics.cpp
	scripting/javascript/bindings/cocos2d_specifics.hpp
	tools/tojs/cocos2dx.ini
 2012-11-02 18:15:25 +08:00
James Chen 05b1b7c2c3 Updated cocos2dx.ini. Renamed some methods exported to js. 2012-11-02 15:13:12 +08:00
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