samuele3hu
80a6811f9f
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ScriptHandler
2013-07-15 10:39:08 +08:00
samuele3hu
51c3ced4ba
issue #2377:Modify the ScripthandlerMgr struct and modify some lua test samples
2013-07-15 10:38:16 +08:00
minggo
34b60e99f1
Merge pull request #3140 from minggo/iss2393-mark_deprecated
...
Use Point, Rect and Size member functions instead of global functions
2013-07-12 08:59:27 -07:00
minggo
98fffdf7fc
closed #2393:revert some wrong modification when fix conflicts
2013-07-12 23:58:31 +08:00
minggo
6abe6fce78
closed #2393 : fix conflicts
2013-07-12 18:04:32 +08:00
James Chen
dda40ce9ab
Updating cocos2dx.ini, ignore "FileUtils::purgeFileUtils" for JSB.
2013-07-12 16:49:13 +08:00
James Chen
c6b0882766
issue #2397 : Updating Lua bindings.
2013-07-12 15:42:14 +08:00
James Chen
33c37f5f9d
issue #2397 : CCTextureCache:sharedTextureCache --> CCTextureCache:getInstance.
2013-07-12 14:44:24 +08:00
James Chen
4a7e884de8
issue #2397 : UserDefault::sharedUserDefault() --> UserDefault::getInstance(), UserDefault::purgeSharedUserDefault() --> UserDefault::destroyInstance();
2013-07-12 14:34:57 +08:00
James Chen
f8cd252c5c
issue #2397 : sharedNotificationCenter --> getInstance
2013-07-12 14:17:42 +08:00
James Chen
6038d69183
issue #2397 : sharedSpriteFrameCache --> getInstance, purgeSharedSpriteFrameCache --> destroyInstance.
2013-07-12 14:12:58 +08:00
James Chen
f30ae2ef31
issue #2397 : Updating CCAnimationCache.pkg
2013-07-12 13:57:05 +08:00
James Chen
41957f06c9
issue #2397 : sharedAnimationCache --> getInstance.
2013-07-12 13:54:56 +08:00
James Chen
853a503d2f
issue #2397 : Updating bindings configuration. [Lua and JS].
2013-07-12 13:48:31 +08:00
James Chen
2c1b26acf8
issue #2397 : EGLView::sharedOpenGLView() --> EGLView::getInstance()
2013-07-12 13:11:21 +08:00
James Chen
74339b6d0e
issue #2397 : Updating cocos2d.ini and CCFIleUtils.pkg.
2013-07-12 12:53:20 +08:00
James Chen
a678d12615
issue #2397 : FileUtils::sharedFileUtils --> FileUtils::getInstance() for all platforms
2013-07-12 12:03:39 +08:00
James Chen
88a28b041e
issue #2397 : Director::sharedDirector --> Director::getInstance() for all files.
2013-07-12 11:50:36 +08:00
dumganhar
9b126e79d7
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into remove-copywithzone
...
Conflicts:
scripting/lua/cocos2dx_support/LuaCocos2d.cpp
2013-07-08 23:09:48 +08:00
dumganhar
8f900d02b8
issue #2300 : Removing all 'copyWithZone' pattern.
2013-07-08 23:05:47 +08:00
minggo
87125e4b2a
issue #2129:use capital words for static const member variables
2013-07-08 18:11:32 +08:00
minggo
cf96ec079e
Merge pull request #11 from dumganhar/minggo-iss2129-remove_prefix
...
Bug fixes. Please see the commits for details.
2013-07-08 00:40:23 -07:00
James Chen
962207a48a
Adding some logs in travis script.
2013-07-08 15:27:49 +08:00
James Chen
466a64ba05
issue #2129 : Updating bindings-generator.
2013-07-08 15:25:04 +08:00
James Chen
c07eda8894
issue #2129 : Updating cocos2dx.ini.
2013-07-08 15:19:46 +08:00
minggo
b39e7e205f
issue #2129:modify pkg files
2013-07-08 11:34:31 +08:00
James Chen
e03091f934
Updating tojs/cocos2dx.ini, visit needs to be exposed to JS since it's used for RenderTexture.
2013-07-05 15:18:04 +08:00
James Chen
9d2152b513
sudo apt-get update before install new packages
2013-07-05 13:45:37 +08:00
James Chen
a67ac821f7
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2371-add-lua-ios-mac
...
Conflicts:
scripting/lua/cocos2dx_support/LuaCocos2d.cpp
2013-07-04 17:15:09 +08:00
James Chen
62879c3789
issue #2371 : Updating CCTexture2D.pkg.
2013-07-04 17:09:23 +08:00
minggo
22e5d12503
Merge pull request #3071 from keirantai/develop
...
Regenerated xcode4 templates plist files
2013-07-03 23:27:50 -07:00
minggo
c327bc7906
issue #2373:add const in pkg files
2013-07-04 12:50:17 +08:00
Keiran Tai
dde6250159
Regenerated xcode4 templates plist files due to missing few important files and causes compile error
2013-07-04 11:13:15 +08:00
James Chen
28b3028646
Updating bindings-generator.
2013-07-02 18:24:31 +08:00
James Chen
d446f90016
close #2285 : Updating tools/tojs/cocos2d-x.ini.
2013-07-02 17:48:06 +08:00
James Chen
34871d47af
close #2347 : Updating tools/tojs/cocos2dx.ini.
2013-07-01 22:34:57 +08:00
James Chen
e20356a32d
Merge pull request #3037 from boyu0/refactor_2339
...
change the useage text
2013-06-30 23:37:12 -07:00
James Chen
c872666650
Merge pull request #3025 from boyu0/refactor_2339
...
closed #2339 : Refactor checkParams() in create_project.py, use OptionParser to parse the params
2013-06-30 23:19:08 -07:00
boyu0
1156ae4f60
change the useage text
2013-07-01 14:10:14 +08:00
boyu0
2625847a74
closed #2339 refactor checkParams() in create_project.py, use OptionParser to parse the params
2013-07-01 01:04:01 +08:00
boyu0
2cccadeaab
closed #2339 refactor checkParams() in create_project.py, use OptionParser to parse the params
2013-06-28 10:12:55 +08:00
James Chen
5ce150a10c
issue #2340 : Updating submodule of cocos2d-console.
2013-06-27 17:19:22 +08:00
minggo
d2940bf4c7
Merge pull request #3008 from minggo/ccx_filesystem
...
remove unneeded codes when using assets manager
2013-06-26 18:53:34 -07:00
minggo
7e26a86e2e
issue #2329:not bind CCFileUtils private function
2013-06-26 17:36:31 +08:00
James Chen
cde809951a
Fixing travis errors for generating JSB glue codes.
2013-06-26 16:57:08 +08:00
James Chen
14208cfda9
Only skip ^visit$
2013-06-26 16:35:41 +08:00
James Chen
e1b1eee46d
issue #2313 : Ignores `visit` and exposes ClippingNode to JS. [Not finished]
2013-06-26 16:29:45 +08:00
Sam Clegg
f9ae701a4b
Fix emscripten build on linux
...
Remove the dependacy of the emscripten build on /Library/Fonts
(a darwin-only folder). On non-darwin platforms we use the
ariel.tff that is part of TestCpp.
2013-06-25 11:47:52 -07:00
Sam Clegg
cb2f42d0c6
Share top level Makefile between emscripten, linux and nacl.
...
Remove the custom top level Makefile.emscripten and instead
add build-emscripten.sh which can be used like build-linux.sh
and build-nacl.sh.
Also, use the top level lib folder to store emscripten libs.
This brings it in line with the other make-based builds.
2013-06-25 11:45:01 -07:00
Sam Clegg
58c3faf209
Cleanup travis build scripts.
...
before-install.sh and run-script.sh now both given an error if
no PLATFORM was not specified correctly.
Environment variables are now set as part of run-script.sh. This
makes the travis output simpler and makes it possible to run
run-script.sh outside of travis.
javascript binding generation will not exit early if GH_USER
etc are not set. This allows the travis scripts to be run in
cloned repos which were otherwise erroring out trying to go
the JS bindings commit.
When generating javascript bindgings, don't username and email
with '--global'. It should be sufficient to set this only for
the binding repo.
2013-06-24 22:55:15 -07:00
James Chen
e96c807087
clang+llvm-3.1 --> clang+llvm-3.3
2013-06-21 21:49:23 +08:00
James Chen
e69838ff27
[Travis CI] Removing space for before-install.sh.
2013-06-21 21:40:21 +08:00
James Chen
3cf482bebd
Updating bindings-generator.
2013-06-21 21:27:59 +08:00
James Chen
992ea78f53
Using llvm 3.3 and android cxx-stl 4.7.
2013-06-21 21:27:45 +08:00
James Chen
9a7bb8fa84
Removing unused files [tools/lua_project_generator]. [ci skip].
2013-06-21 11:17:14 +08:00
Sam Clegg
40766006bd
[NaCl] Fix NaCl build which had been disabled.
...
Since switching to C++11 the NaCL build was disabled.
This re-enables the ARM configuration which uses a
more recent version of gcc. This means that that NaCl
code paths will at least be test until we can find a way
to re-enable the X86 build.
2013-06-20 12:56:12 -07:00
James Chen
1b66a98390
Bug fixes for the tool to generate luabindings.
2013-06-20 19:00:23 +08:00
James Chen
b37fbfdcc8
Merge pull request #2939 from growingdever/patch-3
...
Update create_project.py
2013-06-20 01:45:23 -07:00
James Chen
150394d648
issue #2129 : Compatible with old class name exported to LUA, I mean keeping CC prefix for luabinding.
2013-06-20 15:10:14 +08:00
James Chen
14b07af56c
issue #2129 : CC_Reader --> _Reader.
2013-06-20 15:08:22 +08:00
James Chen
da6af26cd8
issue #2129 : Updating cocos2dx.ini.
2013-06-20 14:58:01 +08:00
James Chen
73c167d1b2
issue #2129 : Updating submodule of bindings-generator.
2013-06-20 14:56:33 +08:00
James Chen
c7456af00e
issue #2129 : Updating tojs/cocos2d.ini and tojs/cocos2dx_extension.ini.
2013-06-20 14:24:36 +08:00
growingdever
60c84a50a1
Update create_project.py
...
'Sample 1' way is not okay. If not input language, script doesn't generate project. (Must input language, but 'Sample 1' way said that you don't need to input language.)
2013-06-20 13:14:27 +09:00
James Chen
fa21674f6c
issue #2301 : Updating travis-scripts for emscripten.
2013-06-19 13:15:29 +08:00
James Chen
504a9e714e
issue #2300 : copy --> clone for luabinding.
2013-06-19 12:08:26 +08:00
James Chen
2c0cc603d1
Merge branch 'master' into develop
...
Conflicts:
extensions/cocos-ext.h
2013-06-18 10:46:25 +08:00
James Chen
ccb67cbcb4
Template fix for iOS Template.
2013-06-17 15:54:12 +08:00
James Chen
c0d44cb2e4
fixed #2129 : Rename m_iVar to _var, remove CC prefixes.
2013-06-15 14:03:30 +08:00
James Chen
c7c7189d90
Fix emscripten bugs.
2013-06-15 12:07:19 +08:00
James Chen
8c671bd0e9
Adding EMCC_DEBUG=1 to debug
2013-06-15 11:52:46 +08:00
James Chen
cec360df38
Reverting run-script.sh
2013-06-15 11:43:43 +08:00
James Chen
aeb331d3c4
issue #2284 : Don't use multiple process to build emscripten since it'll generate errors.
2013-06-15 11:28:31 +08:00
James Chen
82cd7bb01f
Merge branch 'iss2284-merge-master' of https://github.com/minggo/cocos2d-x into minggo-iss2284-merge-master
2013-06-14 15:41:01 +08:00
James Chen
6e8b390094
Updating submodule of bindings-generator(Don't generate jsbinding glue codes for copy constructor.).
2013-06-14 14:15:04 +08:00
minggo
cd5bcb87af
issue #2284 : merge master and fixed some conflicts
2013-06-13 17:54:05 +08:00
James Chen
0d7b7819c2
[travis-ci] Speed up android build.
2013-06-11 11:31:24 +08:00
James Chen
15f5538835
Adding travis-ci build for emscripten port.
2013-06-10 21:57:26 +08:00
James Chen
5d5a5be71c
Don't generate js binding glue code for CCMenuItem.*::initWithCallback.
2013-06-06 16:21:27 +08:00
James Chen
cda02af1e7
Using CC_DEPRECATED_ATTRIBUTE to mark functions as deprecated. Don't bind CCMenuItem::setCallback automatically.
2013-06-05 17:35:19 +08:00
James Chen
e4a8cad3c2
Updating cocos2dx_extension.ini
2013-06-05 14:56:06 +08:00
James Chen
418354df76
Update cocos2dx_extension.ini
2013-06-05 14:53:53 +08:00
minggo
d71e07db4e
fixed conflict
2013-06-05 13:48:31 +08:00
minggo
6491ff75cf
issue #2257 : make ios template work
2013-06-05 11:21:04 +08:00
James Chen
13308b492e
Update generate-jsbindings.sh [ci skip], push to an unique branch.
2013-06-04 14:17:28 +08:00
James Chen
43791a5e2a
Update generate-jsbindings.sh [ci skip], push to an unique branch.
2013-06-04 15:15:50 +09:00
James Chen
64dec0df56
fixed #2247 : Using functions instead of macros to speeding up building for JSB project.
2013-06-04 13:01:50 +08:00
James Chen
0587631926
Merge pull request #2725 from dumganhar/iss2247-refactor-jsb-proxy-develop
...
fixed #2247 : Using functions instead of macros to speeding up building for JSB project.
2013-06-03 19:49:31 -07:00
James Chen
de6a531115
Update cocos2dx.ini, don't genergate bindings for CCCallFunc::initWithFunction
2013-06-04 10:13:27 +08:00
Ricardo Quesada
fb566426b9
enable C++11 in tojs
2013-06-03 13:09:49 -07:00
James Chen
bba2d2bbdc
fixed #2247 : Using functions instead of macros to speeding up building for JSB project.
2013-06-03 22:31:24 +08:00
James Chen
86af06c909
fixed #2244 : cc.Camera.getEyeXYZ, cc.Camera.getCenterXYZ, cc.Camera.getUpXYZ return bad values.
2013-06-03 15:32:07 +08:00
James Chen
7cf2f88c3b
fixed #2244 : cc.Camera.getEyeXYZ, cc.Camera.getCenterXYZ, cc.Camera.getUpXYZ return bad values.
2013-06-03 15:22:28 +08:00
James Chen
c7fd3a3483
Adding submodule of cocos2d-console to 'tools' folder.
2013-06-02 10:53:46 +08:00
James Chen
89b397f1d1
Delete tools/jsbcc since it was moved to https://github.com/cocos2d/cocos2d-console .
2013-06-02 10:53:34 +08:00
James Chen
1b455e452e
Adding submodule of cocos2d-console to 'tools' folder.
2013-06-02 10:51:19 +08:00
James Chen
8b9e198372
Delete tools/jsbcc since it was moved to https://github.com/cocos2d/cocos2d-console .
2013-06-02 10:46:27 +08:00
Jaroslaw Lewandowski
3f7c506638
Ability to save/retrieve CCData into/from CCUserDefault
2013-05-29 01:06:41 +01:00
James Chen
74a39d9bf3
Merge pull request #2634 from samuele3hu/issue2103_testlua
...
modify some skip function name to tools/tojs/cocos2dx_extenson.ini
2013-05-24 02:26:15 -07:00
James Chen
ca050cc084
Update generate-jsbindings.sh [ci skip], send pull request to the branch which is being built.
2013-05-24 16:54:18 +08:00
James Chen
3bb1fe0cc7
Update generate-jsbindings.sh [ci skip], send pull request to the branch which is being built.
2013-05-24 16:53:42 +08:00
samuele3hu
26267aee56
issue #2103 modify some skip function name to tools/tojs/cocos2dx_extension.ini
2013-05-24 16:27:03 +08:00
samuele3hu
a1ef0db7b7
issue #2103 add some skip function name to tools/tojs/cocos2dx_extension.ini
2013-05-24 15:40:02 +08:00
samuele3hu
0a1c12a2d3
issue #2103 add some overlapping file and delete some comment line
2013-05-24 13:45:06 +08:00
samuele3hu
01399f9d5e
issue #2103 add more test lua
2013-05-24 11:46:07 +08:00
samuele3hu
338c7c8d67
issue #2103 add more test lua
2013-05-24 11:42:27 +08:00
samuele3
93dd778e08
issue #2103 add a newline to CCInterger.pkg
2013-05-23 15:49:06 +08:00
samuele3
24a34e50bf
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into MenuTest
2013-05-23 15:40:48 +08:00
samuele3
5da5407efe
issue #2103 add menu test lua sample
2013-05-23 15:39:41 +08:00
James Chen
12ee71545b
Update run-script.sh, adding travis-ci build of TestCpp,AssetsMangerTest and Testlua for android.
2013-05-23 09:48:11 +08:00
James Chen
ff616a1d29
Updating cocos2dx.ini. CCTMXLayer::positionAt --> getPositionAt
2013-05-21 18:20:49 +08:00
James Chen
21f435fdd6
[Travis] Adding Real email info for git. [ci skip]
2013-05-21 18:03:17 +08:00
James Chen
13f50b2072
[Travis CI] Using linux by default. [ci skip]
2013-05-21 17:29:23 +08:00
James Chen
0891e0bde9
Updating generate-jsbindings.sh, android is built on linux host.
2013-05-21 16:48:49 +08:00
James Chen
aa49b7555d
Android is built on Ubuntu host.
2013-05-21 16:39:26 +08:00
James Chen
8d2dcfe4be
Android build uses linux as host. And a fix in generate-jsbindings.sh.
2013-05-21 16:25:54 +08:00
James Chen
6ac72da487
Updating file mode. +x
2013-05-21 16:17:58 +08:00
James Chen
19ede723f2
Adding iOS travis support, not finished.
2013-05-21 16:13:47 +08:00
James Chen
1128f9dfc6
Merge pull request #2564 from folecr/jsdb
...
fixed #2187 : JavaScript debugger improved and bugfixed.
2013-05-21 00:31:51 -07:00
James Chen
361004d4d3
Update cocos2dx.ini, don't generate binding for CCSet::acceptVisitor.
2013-05-21 14:52:54 +08:00
James Chen
f3b4182b9e
Update generate-jsbindings.sh
2013-05-21 14:23:34 +08:00
James Chen
71512ae491
Update generate-jsbindings.sh
2013-05-21 13:45:56 +08:00
folecr
b727f36995
Update to latest bindings-generator with updated documentation for using the debugger.
2013-05-20 15:24:55 -07:00
James Chen
e57fdf87f0
Update generate-jsbindings.sh [ci skip]
2013-05-20 23:27:40 +08:00
James Chen
78000c70fc
[iOS] Template fix.
2013-05-19 18:12:14 +08:00
carlo morgantini
315999edad
new "manual" conversion for ccFontDefinition in JS and also updated LabelTest.js using this new way of passing parameters to CCLabelTTF through ccFontDefinition
2013-05-15 16:37:08 -07:00
carlo morgantini
ef1a123b42
no more bingins for ccTextDefinition
2013-05-15 16:37:08 -07:00
carlo morgantini
934c8f5115
bindings for CCTextDefinition
2013-05-15 16:35:24 -07:00
James Chen
1aad7e927d
fixed #2105 : Refactoring travis build script.
2013-05-13 20:43:28 +08:00
James Chen
f35e96a9f8
fixed #2105 : Adding Travis build support. Moving script to 'tools/travis-script'.
2013-05-13 15:18:18 +08:00
sunzhuoshi
4a25684292
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into cocos2d-master
...
Conflicts:
tools/jsbcc/src/main.cpp
2013-05-08 18:22:18 +08:00
sunzhuoshi
2b3d126b48
Updated README
2013-05-08 17:59:18 +08:00
sunzhuoshi
8850262640
Merge branch 'master' of https://github.com/sunzhuoshi/cocos2d-x
2013-05-08 17:46:19 +08:00
sunzhuoshi
7c4d72239b
Added win32 support
2013-05-08 17:22:58 +08:00
James Chen
800952a17a
fixed #2106 : Fixing wrong display of non-ascii characters. The compiler needs to setUTF8 for compile option.
2013-05-07 13:07:40 +08:00
sunzhuoshi
a1011cecbc
Fixed issue when non-ascii string used in script
2013-05-07 12:15:22 +08:00
sunzhuoshi
cbb7824941
Modified jsbcc to use "-p" option to turn on pipe mode
2013-05-06 16:20:13 +08:00
sunzhuoshi
de27f1137a
Changed byte code file ext to ".jsc"
...
Modified loading logic to load js file first
2013-05-06 11:32:23 +08:00
sunzhuoshi
29d37ad4ec
Fixed issue when used via pipe
2013-04-30 17:18:23 +08:00
sunzhuoshi
17f16e16fc
Added README
2013-04-30 14:03:54 +08:00
sunzhuoshi
d4832e3f46
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into cocos2d-master
...
Conflicts:
scripting/javascript/bindings/ScriptingCore.cpp
2013-04-30 03:51:07 +08:00
sunzhuoshi
163c19fac2
Added support for javascript byte code
2013-04-30 03:29:56 +08:00
James Chen
5337234e22
Android also uses executeScript to load lua source file or byte code file. So unused codes need to be deleted.
2013-04-25 21:31:52 +08:00
James Chen
acaff0a208
Updating bindings-generator.
2013-04-25 21:10:10 +08:00
James Chen
a9f3ae0e33
Updating tools/tojs/cocos2dx.ini, adding CCReuseGrid and CCStopGrid bindings.
2013-04-25 14:32:52 +08:00
James Chen
dee0f37983
issue #2071 : Updating cocos2dx.ini, skipping auto-generating cc.TMXLayer.getTiles(), it needs be bound manually .
2013-04-19 17:23:39 +08:00
James Chen
4d9d9a6cdd
fixed #2064 : Updating the submodule reference of bindings-generator.
2013-04-18 13:55:11 +08:00
James Chen
5f478e1e0a
issue #2064 : Updating tools/tojs/cocos2dx.ini.
2013-04-18 13:53:43 +08:00
James Chen
d4c40c7f37
fixed #1847 : Updating template for iOS.
2013-04-17 12:44:55 +08:00
James Chen
0ecf9da3a6
Adding Box2D and chipmunk dependence for TestLua. Removing the definition of GL_RGB565 in CCTexture2D.pkg.
2013-04-12 14:27:29 +08:00
James Chen
a2c71f8e89
Exposing CCApplication to js.
2013-04-09 14:42:12 +08:00
James Chen
6d57d691f5
Updating bindings-generator.
2013-04-09 13:56:45 +08:00
James Chen
0d5d2e54fd
cxx-generator ~> bindings-generator.
2013-04-09 13:47:12 +08:00
James Chen
d29ff33df1
Updating genbindings.sh, cxx-generator ~> bindings-generator.
2013-04-09 11:03:39 +08:00
James Chen
cb4eb733c6
Renaming tools/cxx-generator to tools/bindings-generator.
2013-04-09 10:32:18 +08:00
James Chen
0bab4609ab
fixed #1592 : Removing some marco definitions in CCTexture2D.pkg.
2013-04-08 14:14:35 +08:00
James Chen
1a44f776f8
fixed #2005 : Adding CurrentLanguageTest for Testlua.
2013-04-07 16:34:07 +08:00
James Chen
bf84fb565d
Updating cxx-generator reference.
2013-04-07 11:07:16 +08:00
James Chen
684c659ba7
Merge pull request #2311 from dumganhar/iss2002-more-luatest
...
fixed #2002 : Adding Texture2dTest, RenderTexture, ZwoptexTest, FontTest, CocosDenshionTest and EffectsAdvancedTest for TestLua
2013-04-06 19:45:28 -07:00
walzer
799e36d3a9
improve obfuscate.py to be more reliable.
2013-04-06 22:00:52 +08:00
James Chen
85b0fd306a
Adding CocosDenshionTest.
2013-04-06 14:32:46 +08:00
James Chen
e754909c5f
Adding RenderTexture test for TestLua.
2013-04-05 17:13:46 +08:00
James Chen
2bff6d6480
Adding Texture2dTest. And format some lua codes.
2013-04-05 16:13:04 +08:00
James Chen
818a570b7f
fixed #1998 : Adding SceneTest.lua for TestLua.
2013-04-03 18:14:03 +08:00
James Chen
2d9f8ca8de
fixed #1814 : MenuTest for Testlua is ok.
2013-04-03 16:29:16 +08:00
James Chen
a73395507c
fixed #1942 : LayerTest for TestLua is ok.
2013-04-02 17:52:08 +08:00
James Chen
5fd2acca47
Updating CCLabelBMFont.pkg, CCLabelTTF.pkg, and updating luabinding.
2013-04-01 17:39:26 +08:00
Rohan Kuruvilla
f945f4efd6
Adding the generator config file. Includes CCGLProgram, CCShaderCache classes
2013-03-27 23:59:30 -07:00
walzer
6f41b7c4ea
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into jsb_obfuscate
2013-03-21 17:37:28 +08:00
James Chen
4a9e426d2d
Renaming function: initWithFile ~> init for CCSprite, CCSpriteBatchNode.
2013-03-20 18:34:28 +08:00
James Chen
196ff7228d
Updating CCLabelBMFont.pkg.
2013-03-20 16:05:45 +08:00
folecr
e3adab15dd
Clearer description of command line options
2013-03-19 16:08:38 -07:00
folecr
3c317dce53
update doc
2013-03-19 16:04:47 -07:00
folecr
d0f6a618a4
Readme with instructions on running the emulator correctly for developing cocos2d-x
2013-03-19 16:00:07 -07:00
walzer
582e35014f
issue #1841 , improve tools/closure-compiler/obfuscate.py to general usage, with input params
2013-03-19 23:53:01 +08:00
walzer
0d73934f5c
issue #1841 , TestJavascript-ios is obfuscated successfully
2013-03-19 17:21:01 +08:00
Rohan Kuruvilla
f53b3633be
Updating generator for CCBAnimationManager bindings
2013-03-18 16:06:48 -07:00
James Chen
f52e56be20
Merge pull request #2184 from dumganhar/iss1837-jsb-schedule
...
fixed #1837 : Refactoring schedule binding codes.
1) We need bind cc.Node.scheduleUpdate and cc.Scheduler.scheduleUpdate manually since schedules need to be associated with _schedFunc_target_ht and _schedObj_target_ht.
2) Bind cc.Scheduler.unscheduleCallbackForTarget.
2013-03-18 00:35:33 -07:00
James Chen
f57a751a48
fixed #1837 : Refactoring schedule binding codes.
...
* 1) We need bind cc.Node.scheduleUpdate and cc.Scheduler.scheduleUpdate manually since `schedules` need to be associated with _schedFunc_target_ht and _schedObj_target_ht
* 2) Bind cc.Scheduler.unscheduleCallbackForTarget.
2013-03-18 15:29:53 +08:00
minggo
19cf6665c4
Merge pull request #2176 from folecr/easierandroidbuild
...
Improvements to android build setup and samples' build scripts
2013-03-17 18:58:11 -07:00
James Chen
3ffd531648
Fixing bugs of genbindings-win32.bat on windows xp.
2013-03-17 14:48:00 +08:00
James Chen
77469346cf
fixed #1642 : Renaming `extra_flag` to `extra_flags`.
2013-03-17 14:11:15 +08:00
James Chen
5c30675455
fixed #1642 : Updating genbindings.sh, adding empty variable `extra_flags`.
2013-03-17 14:10:20 +08:00
James Chen
6bc5c3b0a8
fixed #1642 : Cxx-generator now works ok on windows, it uses the same config file as unix. For details, please refer to README file.
2013-03-17 14:07:41 +08:00
folecr
ef9de9286c
Setup user environment for building Android port.
2013-03-15 16:44:09 -07:00
James Chen
92d0e1c983
Uncommenting jsb_CCEditBox_prototype, updating the submodule of cxx-generator to the latest one.
2013-03-15 11:53:56 +08:00
James Chen
d783715c18
Merge pull request #2164 from dumganhar/iss1824-editbox-js
...
fixed #1824 : Exposed cc.EditBox to js and refactored ScriptingCore::executeFunctionWithOwner
2013-03-14 03:19:45 -07:00
minggo
ee846c3248
Merge https://github.com/cocos2d/cocos2d-x into iss1803-spritetest-lua
2013-03-14 18:14:57 +08:00
James Chen
3e33868a63
fixed #1824 : Exposed cc.EditBox to js.
2013-03-14 18:14:16 +08:00
minggo
815733e0b7
issue #1803:add SpriteOffsetAnchorRotationalSkewScale
2013-03-14 15:11:55 +08:00
James Chen
29aa62d923
fixed #1830 : Using JS::CompileOptions::setUTF8(true) to compile script.
2013-03-13 18:10:54 +08:00
James Chen
3aaf5cabdb
Updating cocos2dx.ini(adding CCScheduler to 'abstract_class' section) and adding ScriptingCore::getGlobalObject method.
2013-03-12 22:03:37 +08:00
James Chen
69b2b13325
fixed #1748 : Generating jsb_cocos2dx_extension_auto.hpp/.cpp. It was separated from original `cocos2dx.hpp/cpp`.
...
Developer could remove redundant jsbinding codes now.
2013-03-11 16:39:28 +08:00
James Chen
db943ddb90
Deleting all files in 'scripting/javascript/bindings/generated' except '.git' and 'README'.
2013-03-10 16:10:16 +08:00
James Chen
fc5f7547a3
fixed #1808 : Adding config section 'script_control_cpp' and set it to 'no'.
2013-03-10 14:00:30 +08:00
James Chen
1a42e85219
fixed #1808 : Updated the submodule of cxx-generator and fixed some compilation errors after that.
2013-03-10 13:55:29 +08:00
Sam Clegg
c0b150c859
Cleanup the tolua++ bindings build system.
...
Update basic.lua to do all the required patching of
the output file without helper scripts such as
build.xml or build.php.
Update README file with current instructions.
Re-generate output file using new build system.
Add build.sh and build.bat for building on POSIX and
win32 respectively.
2013-03-08 11:09:10 -08:00
minggo
dd8681b18b
Merge pull request #2113 from minggo/refactor-ccuserdefault
...
Refactor ccuserdefault
2013-03-06 23:05:50 -08:00
wangshuai
d5cdba484e
Merge branch 'master' into feature_1802
...
Conflicts:
scripting/lua/cocos2dx_support/LuaCocos2d.cpp
2013-03-07 14:32:31 +08:00
wangshuai
6914c9d902
feature #1802:add touches lua test
2013-03-07 11:55:57 +08:00
minggo
3cb4ab8f31
issue #1529:update xcode template
2013-03-07 10:41:45 +08:00
wangshuai
3aaa18f7f4
Merge branch 'master' into iss1425-lua
...
Conflicts:
scripting/lua/cocos2dx_support/LuaCocos2d.cpp
2013-03-06 20:39:01 +08:00
wangshuai
bdbdbc27f5
issue #1425:exist lua test case is ok!
...
1.add some lua test case
2.add ccset.pkg
3.fixed ParticleSystem error in lua test case
2013-03-05 14:46:18 +08:00
Sam Clegg
dcb591eadb
Add missing ccGLServerState to CCNode.pkg.
...
Without this missing enum the resuling cpp file would generate
an unused function warning.
Also, remove the duplication between build_macosx.xml and build.xml.
They only differed in single property. Instead use build.sh, which
should work on all UNIXs, no just maxosx.
2013-03-02 11:28:04 -08:00
minggo
f7802a0794
Merge pull request #2072 from yuezang/iss1425-luatest
...
issue #1425 : exist lua test case is ok.
2013-03-01 01:17:15 -08:00
wangshuai
8867766241
issue #1425 : exist lua test case is ok.
...
1.fixed some bugs in some lua test case;
2.modify touch event and node event type;
3.fixed some bugs in CCParticleSystem.pkg
2013-03-01 17:09:42 +08:00
James Chen
e4b5ee97b0
Updated cocos2dx.ini.
2013-03-01 10:58:16 +08:00
James Chen
501a2612cb
tab ~> 4 spaces .
2013-03-01 10:45:07 +08:00
James Chen
7093807f3f
CCNodeRGA isn't a pure abstract class anymore. Updated tools/tojs/cocos2d.ini.
2013-03-01 10:41:06 +08:00
wangshuai
b4e13af460
issue #1425 :
1.fixed some bugs in .lua file. like this:local b = a:copy():autorelease()
...
2.fixed bug of CCShakyTiles3D's create() in CCActionTilesGrid.pkg
3.delete method copyWithZone in .pkg files
2013-02-28 10:23:30 +08:00
James Chen
8f58f082f3
Updated the submodule reference of cxx-generator.
2013-02-27 15:17:19 +08:00
minggo
32c9e0379a
fixed #1731:change struct to class
2013-02-25 10:22:03 +08:00
James Chen
634a98d19a
Merge pull request #2030 from giginet/cocos2dx-pull-request
...
fixed #1745 : Fix CCRepeat#create is recieved bad argument on Lua binding.
2013-02-22 18:33:14 -08:00
giginet
750918d058
Fix CCRepeat#create argument
2013-02-23 09:03:28 +09:00
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