Commit Graph

371 Commits

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