James Chen
59f5353f89
issue #2483 : Updating cocos2d-console.
2013-08-07 18:06:31 +08:00
minggo
910215fa89
Merge pull request #3377 from boyu0/iss2345_refactor_ccimage
...
issue #2345 refactor CCImage and CCTexture2D
2013-08-06 23:29:38 -07:00
James Chen
c2c1bb45d8
Updating Bindings-generator.
2013-08-07 14:19:36 +08:00
성낙호
1c91e73a8c
added jsb support for AssetsMAnager
2013-08-07 14:07:01 +09:00
samuele3hu
1175f2034a
Merge branch 'iss2433-lua-bindings-generator' of git://github.com/dumganhar/cocos2d-x into iss2433-lua-bindings-generator
2013-08-07 10:39:07 +08:00
samuele3hu
200c5de83f
issue #2433:lua binding generator
2013-08-07 10:37:20 +08:00
James Chen
0c4910ee95
Adding tools/tolua .
2013-08-07 10:12:45 +08:00
minggo
f447398211
Merge pull request #3376 from folecr/android_redesign_update_template
...
Update templates to match newer, mostly-NDK Android port
2013-08-06 19:11:00 -07:00
James Chen
4f740809dd
The target needs to be set to 'spidermonkey' when generating jsbindings since we has added 'lua' target yet.
2013-08-07 10:08:00 +08:00
James Chen
710b895aaa
Updating bindings-generator to the latest version.
2013-08-07 10:02:20 +08:00
boyu0
dc6503f7d4
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2345_refactor_ccimage
2013-08-06 13:37:38 +08:00
boyu0
94f9921d5e
issue #2345 : edit linux command to link the libpng12-dev.lib instead of use ourselves. Move ccTexParams into CCTexture2D
2013-08-06 11:34:48 +08:00
folecr
3176dddc83
Update Android JSON config files and project creation script
2013-08-05 19:29:08 -07:00
James Chen
81fc0069cc
Updating travis-script/run-script.sh, don't build template projects for android.
2013-08-06 09:54:23 +08:00
James Chen
77a9c91b3d
We has to pass the target to bindings-generator since we have add lua target.
2013-08-05 18:33:13 +08:00
James Chen
ec49e7568f
Updating bindings-generator, adding lua target. It's not finished.
2013-08-05 18:31:20 +08:00
James Chen
904f85e0a8
Adding tools/tolua .
2013-08-05 18:30:36 +08:00
Éloi Rivard
9dcb6fb80e
Multi-resolution emscripten html template.
...
Default emscripten html template update.
Minor emscripten warnings.
2013-08-05 09:24:47 +02:00
James Chen
e08b319726
issue #2170 : [JSB] Label is abstract class now.
2013-08-05 12:49:57 +08:00
James Chen
85661c976c
Merge pull request #3346 from nakosung/develop
...
closed 2465: Wrong logic when pass an empty std::vector to WebSocket::init.
2013-08-01 19:41:11 -07:00
성낙호
0883723c71
added cc.RemoveSelf
2013-08-02 10:59:16 +09:00
James Chen
f61f4e58fd
Merge pull request #3094 from sergey-shambir/linux_sdl
...
closed 2458: Linux: added SDL backend as alternative to GLFW.
2013-07-31 01:55:37 -07:00
minggo
0530109a9f
Merge pull request #3178 from boyu0/2345
...
Refactor CCImage and CCTexture2D
2013-07-31 01:21:18 -07:00
Sergey Shambir
7385db5a34
Linux: added SDL2 to travis scripts and install-deps-linux.sh
2013-07-30 23:20:18 +04:00
samuele3hu
3499aafd27
issue #2435:Lua template supports mac port
2013-07-30 09:51:15 +08:00
boyu0
41cac18ae2
edit for lua
2013-07-29 14:04:51 +08:00
boyu0
304d636deb
Closed #2345 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into 2345
2013-07-29 11:40:18 +08:00
James Chen
bb3ee262b8
Updating README.mdown for the reason of bindings-generator doesn't support windows.
2013-07-29 08:33:10 +08:00
James Chen
d4dcf44380
[Win32] Removing bindings-generator support, since the clang3.3 of windows can't work with c++11 well, I don't know why, so disable win32 support temporary.
2013-07-29 08:27:59 +08:00
Timothy Qiu
d9020ae80c
Use absolute path for json config files.
2013-07-28 22:59:37 +08:00
boyu0
cecfc13bc4
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into 2345
2013-07-27 22:06:30 +08:00
James Chen
2a65fdf2f4
Merge pull request #3294 from dumganhar/develop
...
Updating bindings-generator reference.Supports the default argument whos...
2013-07-26 21:33:07 -07:00
James Chen
732c2ee49d
Updating bindings-generator reference.Supports the default argument whose value is a reference, for example:
...
class AAA
{
public:
static const BBBB = 100;
void foo(int arg1 = BBBB); // Support this default argument which is not integer argument like 'int arg1 = 100; '
}
2013-07-27 12:32:08 +08:00
samuele3hu
faa0b46f57
issue #2426:Add Drawprimitives and DrawNode lua binding and modify releated test sample
2013-07-27 10:42:22 +08:00
samuele3hu
a6e514f3d5
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into DrawNode
2013-07-27 00:36:20 +08:00
samuele3hu
016593bd0e
issue #2426:Add Drawprimitives.lua and Drawprimitives lua test sample
2013-07-27 00:28:06 +08:00
James Chen
19d9c08c79
issue #2430 : Fixing compilation errors for lua and js bindings.
2013-07-26 22:15:30 +08:00
James Chen
3bc45e665c
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into constants-refactor
...
Conflicts:
scripting/lua/cocos2dx_support/LuaCocos2d.cpp
2013-07-26 19:56:04 +08:00
James Chen
ad1d8b667d
enum class for LanguageType, Application::Platform
2013-07-26 17:29:06 +08:00
samuele3hu
6b9c7d4ade
issue #2404:modify a function name to isSwallowsTouches()
2013-07-26 15:21:19 +08:00
James Chen
7839f769f2
Merge pull request #3265 from dumganhar/constants_fixes
...
Merge PR https://github.com/cocos2d/cocos2d-x/pull/3261 and updating bindings-generator. It supports 'enum class' type now.
2013-07-25 23:21:29 -07:00
James Chen
241cf022a4
Fixing Luabinding errors.
2013-07-26 13:50:10 +08:00
James Chen
cda727843a
Updating bindings-generator. It supports 'enum class' type now.
2013-07-26 11:14:48 +08:00
minggo
5479dbe0b9
remove xcode template
2013-07-26 10:54:20 +08:00
minggo
c79f4b8595
add creating project script in root
2013-07-26 10:50:37 +08:00
minggo
10a8c3f23b
tools/project-creator -> tools/project_creator
2013-07-26 10:46:18 +08:00
samuele3hu
456a26d7ab
issue #2404:Modify tab to spaces
2013-07-25 20:03:58 +08:00
samuele3hu
11d7c9c653
issue #2404:Add more functions to Deprecated.lua and modify some .pkg files
2013-07-25 19:58:59 +08:00
James Chen
653c1f7f8f
Merge branch 'releasing' of https://github.com/minggo/cocos2d-x into minggo-releasing
2013-07-25 16:00:45 +08:00
Éloi Rivard
682a1238fa
Use of a single emscripten HTML template file.
2013-07-24 17:59:21 +02:00
minggo
a76863dd7f
add execution permission
2013-07-24 17:50:39 +08:00
minggo
99949331b1
fix error and compilings error in templates
2013-07-24 17:27:29 +08:00
minggo
019246fd51
travis build template too
2013-07-24 17:26:45 +08:00
Jerry Zhang
749e8f96eb
typo; more Pythonic
2013-07-23 13:37:17 +08:00
minggo
8660543d77
Merge pull request #3198 from samuele3hu/deprecatedfunc
...
issue #2404:Move deprecated functions in Lua
2013-07-22 00:27:06 -07:00
James Chen
c154d66bf0
Updating Bindings-generator.
2013-07-22 13:44:30 +08:00
samuele3hu
510a5912fd
issue #2404:Add many functions to Deprecated.lua
2013-07-22 13:42:58 +08:00
samuele3hu
eed0297c59
Merge branch 'deprecatedfunc' of https://github.com/samuele3hu/cocos2d-x ; branch 'develop' of https://github.com/cocos2d/cocos2d-x into deprecatedfunc
2013-07-22 09:39:57 +08:00
samuele3hu
4eb6d7aea4
issue #2404:Modify a comment
2013-07-19 15:38:17 +08:00
samuele3hu
18fa6f2fbd
issue #2404:Modify a comment
2013-07-19 15:29:36 +08:00
James Chen
7c7d21dd03
issue #2407 : more best practices fixes, more getter and const..
2013-07-19 14:57:54 +08:00
samuele3hu
90af254fac
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into deprecatedfunc
2013-07-19 14:57:38 +08:00
samuele3hu
3b97353e14
issue #2404:Modify Deprecated.lua and set platform config
2013-07-19 14:57:02 +08:00
James Chen
6ffac07a81
More getter functions: e.g. MenuItemFont::fontSize --> MenuItemFont::getFontSize
2013-07-19 11:08:47 +08:00
samuele3hu
236b675e21
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into deprecatedfunc
2013-07-18 23:29:41 +08:00
samuele3hu
78cd3e561e
issue #2404:Move deprecated functions to Deprecated.lua
2013-07-18 23:27:07 +08:00
boyu0
76e05ee802
Merge https://github.com/cocos2d/cocos2d-x into 2345
2013-07-18 17:47:43 +08:00
James Chen
d58a7fcce2
closed #2414 : Bindings-generator could bind std::function argument now.
2013-07-17 18:09:49 +08:00
James Chen
a9eea0a887
issue #2407 : Updating jsb_deprecated.js and cocos2dx.ini.
2013-07-17 17:38:03 +08:00
boyu0
70140bb4cb
refactor CCImage and CCTexture2D
2013-07-17 17:12:04 +08:00
James Chen
7e4e34d992
[ci skip]Update cocos2dx.ini, don't genergate bindings for DrawNode::listenBackToForeground.
2013-07-17 14:36:10 +08:00
samuele3hu
596eb9df3e
issue #2377:Modify tojs/cocos2dx.ini and a function name
2013-07-16 16:45:57 +08:00
samuele3hu
1761669832
issue #2377:Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ScriptHandlerMgr
2013-07-16 12:47:40 +08:00
James Chen
72d1a074df
Updating travis-script/before-install.sh, install gcc4.7 when build linux port.
2013-07-16 11:58:08 +08:00
James Chen
de4b231264
closed #2405 : Updating bindings-generator, Bindings-generator should not bind deprecated methods.
2013-07-16 10:04:03 +08:00
James Chen
ebf382b02f
issue #2405 : Removing deprecated methods in 'skip' section in cocos2dx.ini since bindings-generator will not bind deprecated methods now.
2013-07-16 10:03:25 +08:00
samuele3hu
c955a559bf
issue #2377:Del register/unregister function in .cpp and .h files
2013-07-16 09:55:06 +08:00
James Chen
759831c1d8
issue #2397 : Application::sharedApplication --> Application::getInstance.
2013-07-15 16:24:42 +08:00
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