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

511 Commits

Author SHA1 Message Date
walzer 79be62a932 issue #1733, fix a typo in dumping usage. 2013-02-22 22:24:05 +08:00
walzer b534ff16e7 issue #1733, don't remove projects if it exists. 2013-02-22 16:33:24 +08:00
walzer 3dcee98cb8 issue #1733, use json config files instead of python modules for multi-platforms. 2013-02-22 16:32:12 +08:00
walzer 3eab5d509b issue #1733, project-creator for lua works. 2013-02-21 17:11:11 +08:00
walzer d736f38fac issue #1733, project-creator for cpp project seems ok 2013-02-21 16:51:22 +08:00
James Chen c70412d890 Merge pull request #2015 from dumganhar/iss1730-bind-scrollview 
fixed #1730: Exposed CCScrollView and CCTableView to js.
 2013-02-20 18:23:13 -08:00
James Chen cf33a4538d fixed #1730: Binds CCScrollView and CCTableView to js. 2013-02-21 10:06:22 +08:00
walzer e81c841ad6 issue #1733, improve the help description of create_project.py 2013-02-20 23:42:48 +08:00
walzer ef697781a7 issue #1733, unify package name to org.cocos2dx.hello* lower case on both android & ios. 2013-02-20 23:15:48 +08:00
walzer 4f81e704ae Merge branch 'refs/heads/master' into project-creator 2013-02-20 13:41:53 +08:00
walzer 8915b4787d fixed #1733, the python script perfectly works, tested on both osx and windows 
This pull request fixed:
- Handling the difference of line ending between osx and windows
- remove os.popen("rm -rf" + …) usage which can not cross desktop platforms, uses shutil.rmtree instead
 2013-02-20 13:26:41 +08:00
James Chen 24767349b4 Merge pull request #2008 from dumganhar/master 
fixed a bug of respond touch events in hello.lua. The event type is string now.
 2013-02-19 20:07:02 -08:00
James Chen ab00de629a Removed the definition of the touch event type . 2013-02-20 12:06:12 +08:00
James Chen 72b830ef49 fixed the failure of auto generating js binding. 2013-02-20 11:07:42 +08:00
James Chen 13ab9c0196 Merge pull request #1999 from walzer/project-creator 
issue #1733: python scripts for generating JSB projects.
 2013-02-18 22:11:37 -08:00
minggo 599f22f1e2 Merge pull request #1997 from minggo/iss1731-lua-declaration 
issue #1731:change CCSize, CCPoint and CCRect to struct in pkg files
 2013-02-18 18:19:00 -08:00
minggo 1b743b37c9 issue #1731:change CCSize, CCPoint and CCRect to struct in pkg files 2013-02-19 10:08:25 +08:00
James Chen ed49029744 Updated the submodule of cxx-generator. 2013-02-19 09:48:16 +08:00
walzer 6ebc9b7410 issue #1725, project-creator, HelloJavascript on win32 works ok 2013-02-19 00:02:42 +08:00
walzer dc7fe1af25 issue #1725, improve the project creator on android 2013-02-18 23:34:31 +08:00
walzer 0a4700e59b issue #1725 project creator script works ok for iOS and Android on Mac OSX env 2013-02-18 22:09:42 +08:00
minggo 0c5bcb3f7b issue #1702:fix a typo error 2013-02-06 18:04:40 +08:00
dualface 5904512ac6 add CCFileUtils Lua support 2013-02-04 12:41:24 +08:00
James Chen 23acb3eacd issue #1687: Updating iOS template after refactoring CCFileUtils. 2013-02-03 13:56:44 +08:00
James Chen 3a9346e6ff issue #1687: Refactoring CCFileUtils, abstracting the same implementations for all platforms. 2013-02-01 11:20:46 +08:00
minggo c071620951 set build option to -O1 for js xcode project when building with debug option 2013-01-29 20:58:34 +08:00
James Chen 31681e005e CCFileUtils::fullPathFromRelativePath -> fullPathForFilename. 2013-01-29 10:40:44 +08:00
James Chen 2694cb150b CCFileUtils::s|gSearchPath -> CCFileUtils::s\gSearchPaths. 2013-01-29 09:56:38 +08:00
James Chen c80d438110 issue #1683: Exporting `fullPathForFilename` to Lua. 2013-01-27 20:26:04 +08:00
James Chen 119115502d issue #1683: Making some api of CCFileUtils more c++ friendly by using std::vector rather than CCArray. 2013-01-26 22:31:57 +08:00
James Chen 294509c4c0 Merge branch 'master' of https://github.com/dumganhar/cocos2d-x into myccfileutils 2013-01-23 19:52:17 +08:00
James Chen f2303b854a Fixed a typo, and regenerated luabinding codes. 2013-01-23 15:59:13 +08:00
James Chen 219657ee1a Merge pull request #1872 from moadib/android_manifest_gles20 
fixed #1673: Added <uses-feature android:glEsVersion="0x00020000"/> to AndroidManifest.
 2013-01-21 23:52:32 -08:00
James Chen 5a41e1fc86 fixed compilation errors for lua project. Rebuild LuaCocos2d.cpp. 2013-01-22 14:40:54 +08:00
moadib e39829269d Added <uses-feature android:glEsVersion="0x00020000" /> to AndroidManifest.xml 2013-01-21 13:03:55 +04:00
James Chen 0a42829428 issue #1667: Adding file name lookup support for iOS and Android, TBD: Other platform supports. 2013-01-18 18:05:32 +08:00
James Chen 8a4d7cfe12 fixed #1653: Updated the configuration files of jsbinding. 2013-01-15 10:17:01 +08:00
James Chen 121519b7cd Merge pull request #1831 from dumganhar/iss1653-jsb-int 
fixed #1653: Handling correctly when parsing int value in JSB.
 2013-01-14 17:49:57 -08:00
johnangel a1155f52e6 Merge remote branch 'upstream/gles20' into gles20 2013-01-11 21:48:47 +01:00
James Chen 1a659bdacb issue #1653: Updated the submodule of cxx-generator. 2013-01-11 21:46:45 +08:00
James Chen 273ffcc571 issue #1653: Updated the submodule of cxx-generator. 2013-01-11 13:55:36 +08:00
johnangel 16269d952d Detect VS2012 Update 1 2013-01-10 11:55:30 +01:00
James Chen a4ea453ade fixed #1645: Excluded proj.win32. 2013-01-08 15:15:44 +08:00
johnangel 674bb8e728 Setting PlatformToolSet to v110_xp instead of default v110 in Visual Studio 2012 for Windows XP support, leaving default v100 in Visual Studio 2010. 2013-01-07 11:51:05 +01:00
James Chen bf0cc23336 Update tools/tojs/README.mdown 2013-01-06 18:31:35 +08:00
James Chen b712a9349a fixed #1642: Updated tools/tojs/README.mdown. 2013-01-06 18:24:02 +08:00
James Chen b5b1df6a07 Added tools/tojs/README.mdown. 2013-01-06 18:10:43 +08:00
James Chen be1be2771b fixed #1642: Adding tools for generating jsbinding codes on windows. 2013-01-06 18:01:44 +08:00
James Chen 0ee9cf027b Merge pull request #1803 from dumganhar/iss1627-vs2012 
fixed #1627: VS version check in project file.
 2012-12-28 22:54:04 -08:00
James Chen 9bd302e35b fixed #1627: VS version check in project file. 2012-12-29 13:54:46 +08:00
dualface d1e39a9c00 [luabinding] add CCDirector::setDisplayStats() 2012-12-29 11:16:07 +08:00
James Chen f2f3aa55bf Merge branch 'gles20' of https://github.com/johnangel/cocos2d-x into iss-vs2012 
Conflicts:
	samples/Cpp/HelloCpp/proj.win32/HelloCpp.vcxproj
	samples/Cpp/TestCpp/proj.win32/TestCpp.vcxproj
	samples/Javascript/CocosDragonJS/proj.win32/CocosDragonJS.vcxproj
	samples/Javascript/MoonWarriors/proj.win32/MoonWarriors.vcxproj
	samples/Javascript/TestJavascript/proj.win32/TestJavascript.vcxproj
	samples/Javascript/WatermelonWithMe/proj.win32/WatermelonWithMe.vcxproj
	samples/Lua/HelloLua/proj.win32/HelloLua.vcxproj
	samples/Lua/TestLua/proj.win32/TestLua.win32.vcxproj
	scripting/javascript/bindings/generated
	scripting/lua/proj.win32/liblua.vcxproj
 2012-12-29 09:48:22 +08:00
James Chen df5c6aae04 Binded more actions to js. 2012-12-27 13:38:48 +08:00
James Chen f07987418c Merge pull request #1794 from dumganhar/sync 
fixed #1625: Added stackable action support. Exchanged the order of parameter for 3d actions.
 2012-12-26 20:50:32 -08:00
James Chen d1c33960b2 issue #1625: Updated lua pkg files. 2012-12-27 11:47:49 +08:00
minggo c5e62206e0 Merge pull request #1791 from minggo/gles20 
issue #1603:delete space when setting language
 2012-12-25 18:44:08 -08:00
minggo d94e4c30b8 issue #1603:delete space when setting language 2012-12-26 10:42:35 +08:00
minggo 8b522c326c Merge pull request #1790 from minggo/gles20 
issue #1603:modify android resource path
 2012-12-24 22:21:31 -08:00
minggo e7ca426b3d issue #1603:modify android resource path 2012-12-25 14:20:35 +08:00
minggo c47553ece9 Merge pull request #1789 from minggo/gles20 
issue #1603:modify windows auto-build script
 2012-12-24 21:02:35 -08:00
minggo 79530616ea issue #1603:modify windows auto-build script 2012-12-25 12:57:24 +08:00
minggo fb0a9d9058 Merge pull request #1787 from minggo/gles20 
issue #1603:modify auto-building script
 2012-12-24 19:12:40 -08:00
minggo c3e44f0e26 issue #1603:modify auto-building script 2012-12-25 11:11:44 +08:00
James Chen e301b9af1e Updated cocos2dx.ini. Only skip CCNode::setPosition and CCSprite::setPosition. 2012-12-25 09:52:30 +08:00
johnangel 08cd9e37fc Setting PlatformToolSet to v110_xp for Visual Studio 2012 only. 2012-12-24 10:27:56 +01:00
minggo fab196dcbe issue #1603:modify some auto-building script 2012-12-24 14:26:57 +08:00
minggo 380cadebce issue #1603:modify some path for auto building 2012-12-21 18:06:36 +08:00
minggo b0e752eac3 issue #1603:modify path of cocos2d-x 2012-12-21 17:40:54 +08:00
minggo 9beac15305 issue #1603: modify some pathes 2012-12-21 15:05:22 +08:00
minggo 7b81217c3c issue #1603:modify pathes for auto test 2012-12-21 14:06:20 +08:00
unknown adb68ddbb6 Enable Windows XP support in Visual Studio 2012 Update 1. 
Not tested with Visual Studio 2010, not sure will it work with PlatformToolset v110_xp.
 2012-12-19 19:28:25 +01:00
James Chen 190e6c1de5 Merge branch 'linux-lua' of https://github.com/dumganhar/cocos2d-x into lua-linux 
Conflicts:
	scripting/lua/cocos2dx_support/LuaCocos2d.cpp
 2012-12-10 17:25:23 +08:00
dualface f815cdc423 merge gles20 2012-12-10 17:00:16 +08:00
James Chen 65d81b0de7 fixed #1608: Updated tools/tolua++/CCAction.pkg. 2012-12-10 16:50:02 +08:00
dualface 268aa45d2c rename CCNode:scheduleUpdateScriptHandlerWithPriority() to CCNode::scheduleUpdateWhitPriorityLua() 
remove unused functions
 2012-12-10 16:09:23 +08:00
dualface 77d4da6e22 [lua] remove va_list 2012-12-10 14:28:26 +08:00
dualface b6e605b9ae [lua] fix CCSequence export 2012-12-10 14:19:18 +08:00
dualface 0662ceac9d [lua] update export 2012-12-10 14:07:24 +08:00
dualface 86f6473270 [lua] fix invalid export 2012-12-10 14:04:56 +08:00
dualface c8753f72ef [scripting] add CCNode::scheduleUpdateScriptHandlerWithPriority() 2012-12-10 13:48:27 +08:00
minggo d5533fcf15 fix a type information in CCBAnimationManager 2012-12-10 11:30:07 +08:00
minggo 48783d2224 Merge pull request #1662 from guanqun/fix-group-type 
when user specified 'group' parameter, it should be parsed as an 'int'
 2012-12-06 18:02:09 -08:00
James Chen cf25a8033a Updated the submodule reference of cxx-generator. 2012-12-06 17:20:08 +08:00
James Chen b044a89d6f Merge branch 'gles20' of https://github.com/ivzave/cocos2d-x into linux-lua 
Conflicts:
	scripting/lua/cocos2dx_support/LuaCocos2d.cpp
 2012-12-06 14:55:18 +08:00
fape 320d532e15 add Hungarian language support 2012-12-05 11:31:05 +01:00
minggo a256d35a5b fix some confilcs 2012-12-05 14:01:05 +08:00
dualface 0e65257bc2 [luabinding] remove duplicate ccLanguageType 2012-12-02 16:17:17 +08:00
dualface 5bc95780c0 update luabinding 2012-12-02 15:48:15 +08:00
James Chen 15d02e4db8 Merge branch 'iss1581-fix-jsbinding-bugs' of https://github.com/dumganhar/cocos2d-x into iss1583-js-tests 
Conflicts:
	scripting/javascript/bindings/cocos2d_specifics.cpp
 2012-11-30 21:43:44 +08:00
James Chen 344fc5ca6f issue #1583: Updated tools/tojs/cocos2dx.ini. 2012-11-30 21:16:34 +08:00
James Chen a814066601 issue #1581: JSBinding bug fixes. 
Some fixes of JSBinding codes:
[1] Check whether the proxy was already added in JS_NEW_PROXY
[2] In struct schedFunc_proxy_t, JSScheduleWrapper* --> CCArray*
Reason: One js function may correspond to many targets. To debug this, you could refer to JSScheduleWrapper::dump function. It will prove that i'm right. :)
[3] In ScriptingCore::cleanupSchedulesAndActions function, we must invoke unschedule for all targets and remove the proxy both in _schedFunc_target_ht and _schedTarget_native_ht, otherwise the hash tables will grow bigger and bigger, so I added a new function JSScheduleWrapper::removeAllTargetsForNatiaveNode to make this things easier.
[4] To easily find out the bugs of binding codes, I add JS_SetGCZeal in ScriptingCore::createGlobalContext, it only works in DEBUG mode.
[5] In js_cocos2dx_CCNode_getChildren, we should add the generated array to root to avoid gc happen when invoking JS_SetElement.
[6] The JSCallFuncWrapper isn't needed since an action will be run by a cc.Node and it will be released at the CCNode::cleanup.
[7] Some improvements of JSScheduleWrapper class.
[8] Added a new function JSScheduleWrapper::setTarget, it's for js_CCNode_unschedule to find out which target need to be unscheduled.
[9] Commented JS_SetReservedSlot in js_CCNode_scheduleOnce and js_CCNode_schedule.
Reason:
For js_CCNode_scheduleOnce: Don't add the callback function to the reserved slot of this js object.Since the class of js object may be inherited from cocos class(e.g. cc.Sprite). The subclass will not contain reserved slots. It will crash if invoking this.
For js_CCNode_schedule: Don't add js callback function to the reserved slot of scheduler js object. Since the scheduler is an object always rooted.
So the callback function might not be released when gc comes.I looked inside the implementation of cc.Node.schedule, and it doesn't use JS_SetReservedSlot there.
 2012-11-28 22:04:55 +08:00
Taro Kobayashi a37e034e61 added support for Japanese language 2012-11-28 17:53:10 +09:00
James Chen 95ccf17739 Bind some functions for js: 
void runAnimationsForSequenceNamedTweenDuration(const char *pName, float fTweenDuration);
    void runAnimationsForSequenceNamed(const char *pName);
    void runAnimationsForSequenceIdTweenDuration(int nSeqId, float fTweenDuraiton);
 2012-11-28 11:49:20 +08:00
Lu Guanqun f64774ec6c when user specified 'group' parameter, it should be parsed as an 'int' 
Otherwise, when we do slicing, it would report type error.
 2012-11-27 15:11:43 +08:00
minggo bd025c94c3 use macro CC_TARGET_OS_IPHONE instead of TARGET_OS_IPHONE and make xcode template work ok 2012-11-26 15:08:40 +08:00
James Chen a1ebfd9ed8 Don't add CCNode::removeChild to skip field. 2012-11-23 15:12:42 +08:00
Rohan Kuruvilla 36bbd80b68 Adding changes to CCBreader 2012-11-23 15:08:55 +08:00
minggo 91b370e0f0 Merge pull request #1639 from minggo/gles20 
make lua work
 2012-11-22 18:38:44 -08:00
minggo 542c407346 make lua work 2012-11-23 10:36:26 +08:00
James Chen f701248e58 issue #1564: Updated tools/tojs/cocos2dx.ini. 2012-11-22 17:19:15 +08:00
James Chen 1a3891970f Updated tools/tojs/cocos2dx.ini. 2012-11-22 15:35:42 +08:00
James Chen b4c1d60e5c Updated the submodule reference of cocos2d-js-tests and cxx-generator. 2012-11-21 21:26:18 +08:00
minggo 635fda446f Merge pull request #1600 from folecr/jsbindingsfix 
Don't generate JS bindings for CCTimer::getSelector
 2012-11-20 22:25:44 -08:00
minggo 33529afc07 Merge pull request #1592 from fape/luaCocos2d 
fix compile: rename kOrientation to kCCTransitionOrientation
 2012-11-19 17:36:25 -08:00
folecr f111602adf Don't generate JS bindings for CCTimer::getSelector 2012-11-19 15:56:11 -08:00
ivzave 28ca22bfde added lua support for linux platform 2012-11-19 14:56:02 +04:00
James Chen 776567726f Merge pull request #1578 from thbourlove/patch-1 
fixed #1566 :Tolua++ will regard the 'cocos2d-2' as package name, but which you want is 'Cocos2d'(input file root name).
 2012-11-18 23:00:51 -08:00
James Chen f2e0df4de3 issue #1565: Removed VS2008 support. 2012-11-19 14:42:27 +08:00
fape 355d8df79e fix compile: rename kOrientation to kCCTransitionOrientation 2012-11-17 19:02:04 +01: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
thbourlove 5f1476df36 Update tools/tolua++/build.php 
If you run this:
	
	tolua++ -o LuaCocos2d.cpp /path_to_cocos2d/cocos2d-2.0.3/tools/tolua++/Cocos2d.pkg
	
tolua++ will regard the 'cocos2d-2' as package name, but which you want is 'Cocos2d'(input file root name).
 2012-11-15 19:25:08 +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
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