lm
38e7f01ee8
decode 'payload' to utf-8 and ignore invalid bytes
2014-01-17 17:13:33 +08:00
James Chen
31199183b2
Merge commit 'refs/pull/5086/head' of git://github.com/cocos2d/cocos2d-x into new-label-atlas
2014-01-17 11:10:04 +08:00
samuele3hu
508d786fa7
issue #3626:Update the submodule
2014-01-17 10:19:58 +08:00
samuele3hu
d086f7a259
issue #3626:Add the deprecated support for the tolua.cast
2014-01-17 10:19:57 +08:00
samuele3hu
de698aaea7
issue #3626:Add lua binding for ScollView and TableView classes in the cocos2d::extension namespace and the related test cases
2014-01-17 10:19:55 +08:00
Dhilan007
53be67c653
update project file.
2014-01-16 18:12:53 +08:00
heliclei
925a4f0f30
add reopen support
2014-01-16 16:22:04 +08:00
heliclei
9de4c4fa70
[jenkins]add job trigger,to update github pull request status instantly
2014-01-16 15:16:12 +08:00
James Chen
2e7516c582
Merge pull request #5041 from Dhilan007/develop_label
...
closed #3630:Uses a struct of TTF configuration for Label::createWithTTF to reduce parameters and make this interface more easily to use.
2014-01-15 18:37:40 -08:00
James Chen
f62c041886
Compilation fix: Updates cocos_files.json and removes unused in template.
2014-01-16 10:27:35 +08:00
Luis Parravicini
21c4b2c893
fixes #3720
2014-01-15 19:44:57 -03:00
Ricardo Quesada
b3f306e742
Ignore getFullPathCache() in FileUtils
2014-01-14 18:30:51 -08:00
boyu0
de30a9cfea
issue #3401 : add lua physics slide test, add more banding code, and fix some bugs.
2014-01-14 15:48:44 +08:00
James Chen
815cea3d7b
Merge pull request #5044 from Pisces000221/patch-1
...
Corrected a few mistakes in project-creator README
2014-01-13 22:52:34 -08:00
Nite Luo
37522c61c3
Make the ui look a bit better
2014-01-13 11:54:33 -08:00
Nite Luo
2e127f819b
Add Polish the labels for project creator ui
2014-01-13 11:37:44 -08:00
Dhilan007
fd481d64a0
1.update lua binding configuration for label.
...
2.recover old method[createWithTTF]
2014-01-13 16:32:35 +08:00
James Chen
5dedd085c8
Merge pull request #5032 from heliclei/develop
...
rename ghprb.py to pull-request-builder.py
2014-01-12 17:43:40 -08:00
Pisces000221
09f23c1bcb
Corrected a few mistakes in project-creator README
2014-01-12 14:38:09 +08:00
Dhilan007
b2038d14d6
update lua binding configuration for label.
2014-01-11 22:55:23 +08:00
Dhilan007
69c004108b
issue#3630:Adjust some method for more easily create and change type.
2014-01-11 22:33:07 +08:00
heliclei
b4a4b70e22
rename ghprb.py to pull-request-builder.py
2014-01-10 17:45:28 +08:00
James Chen
b454bf01e3
Merge pull request #5002 from heliclei/develop
...
support [ci skip] in commit message
2014-01-08 20:53:19 -08:00
heliclei
007a64e50e
support [ci skip] command
2014-01-09 12:47:46 +08:00
heliclei
2b7aa26308
fix create job state
2014-01-09 10:56:33 +08:00
James Chen
2de06a9655
Merge pull request #4993 from heliclei/develop
...
add auto generate bindings
2014-01-08 01:55:10 -08:00
heliclei
6cbf69306c
remove unnessesary chmod and ls command
2014-01-08 16:51:37 +08:00
heliclei
13fab57ce2
remove debug print
2014-01-08 16:27:08 +08:00
heliclei
f7a0e7da1a
add auto generate bindings
2014-01-08 16:21:11 +08:00
James Chen
b07acb6c12
[JSB] Supports cc.ScrollView.extend, cc.TableView.extend, cc.TableViewCell.
2014-01-07 22:17:22 +08:00
James Chen
e25c4b5f4d
[JSB] Armature should be able to be extended in JS.
2014-01-07 20:55:07 +08:00
James Chen
849b522924
Merge pull request #4962 from Dhilan007/develop_crash
...
update bindings-generator submodule
2014-01-07 01:41:47 -08:00
Dhilan007
3cab3e5df3
update bindings-generator submodule
2014-01-07 17:19:29 +08:00
samuele3hu
b19bda1588
Fix:Update cocos_files.json file
2014-01-07 16:49:51 +08:00
James Chen
da17c6b05b
Merge pull request #4954 from heliclei/develop
...
[Jenkins]fix symbol link create error
2014-01-07 00:35:16 -08:00
heliclei
05f6fedd1e
fix windows symbol link path error
2014-01-07 16:27:23 +08:00
James Chen
f5ae2bbacc
Merge pull request #4932 from boyu0/iss3401_physical_lua_binding
...
issue #3401 : physical lua binding
2014-01-06 23:48:47 -08:00
heliclei
5dadbce813
fix symbol link create error
2014-01-07 15:41:18 +08:00
James Chen
37b6ef99e3
Wrong dir fix for travis ci.
2014-01-06 20:04:30 -08:00
James Chen
2f7c41bd28
[travis] builds linux template now.
2014-01-06 19:42:51 -08:00
boyu0
cf146b32cf
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss3401_physical_lua_binding
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/scripting/lua/bindings/CCLuaStack.cpp
cocos/scripting/lua/script/Cocos2d.lua
cocos/scripting/lua/script/Cocos2dConstants.lua
2014-01-07 10:16:44 +08:00
heliclei
4c2fe530f9
fix post data format
2014-01-06 22:24:47 +08:00
boyu0
eaa3041a97
issue #3401 : physical lua banding script, add testlua->physics test
2014-01-06 22:19:40 +08:00
heliclei
bc5303f6f2
build all android targets
2014-01-06 20:58:00 +08:00
samuele3hu
2949ab754f
Fix:Regeneration cocos_files.json
2014-01-06 20:11:44 +08:00
samuele3hu
ac46932c06
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developNewUI
...
Conflicts:
tools/project-creator/module/cocos_files.json
2014-01-06 20:07:39 +08:00
samuele3hu
f36d4a9236
Fix:Resolve the lua android template errors
2014-01-06 19:59:31 +08:00
user
16bff3da1c
add 755
2014-01-06 01:31:36 -05:00
chuanweizhang
07e51e2c86
test template lua
2014-01-06 14:24:33 +08:00
samuele3hu
465aba951c
Fix:Remove the ScollView and TableView of extension gui lua binding
2014-01-04 18:36:33 +08:00
James Chen
7a53ec12ee
Merge pull request #4870 from heliclei/develop
...
use print_exc() instead of format_exc()
2014-01-04 00:50:13 -08:00
heliclei
6e1c508960
use print_exc() instead of format_exc()
2014-01-04 16:25:31 +08:00
cw
556a6436bd
modify 644 —>755
2014-01-04 15:27:39 +08:00
chuanweizhang
5ffc3d9726
modify create_project.py suffix
2014-01-04 14:04:39 +08:00
chuanweizhang
accdf5635f
modify print message
2014-01-04 13:54:17 +08:00
chuanweizhang
51a6e4fc35
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2014-01-04 13:25:34 +08:00
James Chen
322cf0d233
Fixing CocoStudio bindings error.
2014-01-04 12:11:10 +08:00
Dhilan007
b6e676caa4
fix warn and compiling error in jsb_cocos2dx_studio_manual.cpp.
2014-01-03 23:03:48 +08:00
Dhilan007
b4d392dc38
update js binding for studio change.
2014-01-03 21:33:48 +08:00
chuanweizhang
c22cc77c66
add cocos files list configure script
2014-01-03 19:09:13 +08:00
James Chen
ac6b72450f
Merge pull request #4816 from samuele3hu/developNewUI
...
Update the lua test cases about the GUI
2014-01-02 20:53:19 -08:00
James Chen
0b3a4c3ce5
Merge pull request #4817 from heliclei/develop
...
[Jenkins]fetch pull request and checkout to a local branch
2014-01-02 19:08:54 -08:00
heliclei
4549760f2c
fetch pull request and checkout to a local branch
2014-01-03 10:59:37 +08:00
samuele3hu
c4588722dd
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developNewUI
2014-01-03 10:41:03 +08:00
samuele3hu
07a3efb585
Update the lua test cases about the GUI
2014-01-03 10:39:19 +08:00
minggo
d345139a08
fix compiling errors
2014-01-02 21:53:18 +08:00
James Chen
d8186a1d3c
Merge pull request #4769 from heliclei/develop
...
update exception catch clause
2014-01-02 05:35:07 -08:00
heliclei
e43ca98a94
get the correct branch
2014-01-02 19:08:22 +08:00
heliclei
48579fe3ac
remove debug code
2014-01-02 17:25:29 +08:00
heliclei
8eeb32c98c
remove debug code
2014-01-02 17:22:23 +08:00
heliclei
b1714d74e5
refining exception handling
2014-01-02 17:09:49 +08:00
James Chen
3e044cf90e
Updates tools/tojs/cocos2dx_gui.ini. target_namespace from ccs to ccii.
2014-01-02 14:22:00 +08:00
boyu0
0a06d93328
issue #3401 : physical lua banding script and auto script
2014-01-02 11:45:11 +08:00
heliclei
e944dae338
update exception catch clause
2014-01-02 10:19:48 +08:00
James Chen
e5389ddb31
Merge pull request #4765 from heliclei/develop
...
Add exception handling
2014-01-01 06:00:50 -08:00
James Chen
591740253d
[GUI] Updates scripting binding configure file.
2014-01-01 21:32:54 +08:00
heliclei
1c0fc7859b
1.Add exception handling
...
2.Correct pull request action name
3.Enlarge description text
2013-12-31 18:29:32 +08:00
James Chen
7f2dc5197e
Updates travis-script, don't build template proj.
...
Since we are supporting create project anywhere, to test template projects, projects should be created firstly.Therefore, disable building template for travis-ci.
2013-12-31 16:37:05 +08:00
James Chen
75d28a3114
Adds execute permission for create_project.pyw
2013-12-31 16:10:55 +08:00
chuanweizhang
2579573b7e
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-12-31 14:58:37 +08:00
minggo
2b54e5e296
Merge pull request #3864 from dumganhar/iss2865-deprecate-ccnotification
...
closed #2865:Deprecates NotificationCenter, uses new EventDispatcher instead.
2013-12-30 19:31:34 -08:00
James Chen
cf006df9ff
closed #2865 : Deprecates CCNotificationCenter, uses EventDispatcher instead.
2013-12-31 10:54:37 +08:00
heliclei
62a0828f5b
remove other non-functional jenkins scripts
2013-12-30 22:03:22 +08:00
heliclei
7696a5f2cc
move ghprb.py to tools/jenkins-scripts/
2013-12-30 21:40:28 +08:00
cw
437c6545da
fix linux error not Tkinter
2013-12-30 18:35:08 +08:00
chuanweizhang
991db80198
reset
2013-12-30 15:21:25 +08:00
chuanweizhang
623e205256
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
...
Conflicts:
cocos/scripting/auto-generated
samples/Cpp/TestCpp/Classes/Box2DTestBed/Box2dView.cpp
samples/Cpp/TestCpp/Classes/Box2DTestBed/Box2dView.h
samples/Cpp/TestCpp/Classes/ClippingNodeTest/ClippingNodeTest.cpp
samples/Cpp/TestCpp/Classes/ClippingNodeTest/ClippingNodeTest.h
samples/Cpp/TestCpp/Classes/LabelTest/LabelTestNew.cpp
samples/Cpp/TestCpp/Classes/LabelTest/LabelTestNew.h
tools/bindings-generator
tools/tolua/cocos2dx_studio.ini
reset modify
2013-12-30 14:51:51 +08:00
chengstory
cfbbb7889b
Merge branch 'develop' into #3457
...
Conflicts:
cocos/editor-support/cocostudio/CCSGUIReader.cpp
2013-12-26 23:01:34 +08:00
chengstory
bd8f32e1a6
fixed #3457 fixes failed to build android.
2013-12-27 06:33:42 +08:00
James Chen
31188710a0
Updates Bindings-generator.
2013-12-26 22:14:48 +08:00
chengstory
d9ba53f9a9
o my god.
2013-12-26 17:55:46 +08:00
chengstory
bd46681867
fixed #3457 continue to fixes failed to build.
2013-12-26 17:37:02 +08:00
James Chen
5dfb7f321a
Compilation fixes after merge PR #4669 https://github.com/cocos2d/cocos2d-x/pull/4669
2013-12-26 16:03:30 +08:00
chuanweizhang
911c7eae10
modify license time
2013-12-26 14:49:06 +08:00
James Chen
df690e8f8b
Updates bindings config files.
2013-12-26 12:50:37 +08:00
chuanweizhang
0343f55dc7
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-12-26 10:23:00 +08:00
chuanweizhang
23192a883c
modify linux tempalte
2013-12-25 18:32:23 +08:00
chuanweizhang
02e139f1da
Reverts bindings-generator reference.
2013-12-25 18:16:59 +08:00
chuanweizhang
6e871e8803
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
...
Conflicts:
template/multi-platform-js/Classes/AppDelegate.cpp
2013-12-25 18:12:16 +08:00
samuele3hu
9cf45a292b
Delete some annotated statement about spine and add some reserve manual lua binding functions
2013-12-25 16:42:40 +08:00
chuanweizhang
017fb550b7
add README.md
2013-12-25 16:34:23 +08:00
chuanweizhang
c53537e7c2
modify create_project
2013-12-25 15:53:47 +08:00
samuele3hu
9fd64df099
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into Spine
2013-12-25 13:48:10 +08:00
samuele3hu
45cfe00ec4
Modify iOS project set and some manual lua binding
2013-12-25 13:47:22 +08:00
James Chen
538da31773
Removes CC prefix for CCSkeleton and CCSkeletonAnimation. Adds namespace `sp` for JSBindings.
2013-12-25 11:18:14 +08:00
chuanweizhang
94420563b3
ingore .git
2013-12-25 11:12:06 +08:00
chuanweizhang
2989e9b46d
adapt ui
2013-12-25 10:24:46 +08:00
James Chen
d33b2c41c7
Merge branch 'develop' into data-refactor
...
Conflicts:
tools/tolua/cocos2dx.ini
2013-12-24 16:24:17 +08:00
samuele3hu
e497f823ea
Merge branch 'lua_spine_dev' of https://github.com/edwardzhou/cocos2d-x into Spine
2013-12-24 16:14:10 +08:00
chuanweizhang
1ce75bb444
modify ui
2013-12-24 15:07:51 +08:00
James Chen
451d76f6b0
Merge pull request #4611 from dumganhar/spine-test
...
Merge PR #4572 , Spine JS test support.
2013-12-23 22:55:58 -08:00
samuele3hu
98e4e802f4
Support pass by value for setPosition\setAnchorPoint\setContentSize for lua binding
2013-12-24 13:42:32 +08:00
Edward Zhou
4082c86070
1. add Spine LUA binding with testcase; 2. CCSkeleton inherites from Node since NodeRGBA is deprecated.
2013-12-24 11:55:53 +08:00
chuanweizhang
2308e94c2f
modify template
2013-12-24 09:42:37 +08:00
James Chen
05f6a5b09b
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into spine-test
2013-12-23 22:05:20 +08:00
James Chen
44f9009a5d
Merge pull request #4610 from dumganhar/lastest-js-test
...
Updates JS-test to the latest version and some binding fixes
2013-12-23 06:04:49 -08:00
James Chen
d6850c363a
Updates Bindings-generator.
2013-12-23 22:00:11 +08:00
James Chen
3327614a99
Binds Node::setAnchorPoint manually.
2013-12-23 21:54:02 +08:00
James Chen
6b73fa570e
Merge pull request #4601 from samuele3hu/toluaerror
...
issue #3353 Lua gc mechanism will make the extended attributes of lua userdata disapper
2013-12-23 05:40:15 -08:00
James Chen
cafebe7295
Merge commit 'refs/pull/4572/head' of git://github.com/cocos2d/cocos2d-x into spine-test
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2013-12-23 20:28:51 +08:00
James Chen
b3cc7d7e68
Bindings-generator skips Node::setContentSize. Binds it manually.
2013-12-23 20:25:11 +08:00
samuele3hu
4399adc869
issue #3353:Add the DisplayLinkDirector lua binding
2013-12-23 17:31:57 +08:00
James Chen
46cc91be3b
Updates bindings-generator, skips to bind override functions.
2013-12-23 16:41:17 +08:00
James Chen
2fec81fcae
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into data-refactor
...
Conflicts:
tools/tolua/cocos2dx.ini
2013-12-23 13:52:15 +08:00
James Chen
366c4ca9fb
Updates tools/tojs(tolua)/cocos2dx.ini.
2013-12-23 11:48:22 +08:00
samuele3hu
50bcdee725
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into NewEventDispatcher
2013-12-22 22:11:17 +08:00
samuele3hu
97f26176e8
issue #3403:Add the EventDispatcher lua binding and the releated test cases
2013-12-22 22:10:21 +08:00
James Chen
55ff96df3a
closed #3463 : Potential hash collision by using typeid(T).hash_code() in JSB and LuaBinding.
...
Instead of using std::unordered_map<long, T>(long is the hash_code generated by typeid(T).hash_code()),
We needs to use std::unordered_map<std::string, T> to avoid collision since unordered_map internally processes collisions.
2013-12-20 17:13:09 +08:00
byeonggee.seo
0a30a9a604
spine simple JS binding supported
2013-12-20 16:10:15 +09:00
James Chen
755d29b0e1
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into more_container_bind
2013-12-19 20:17:54 +08:00
James Chen
f73e939b57
Supports to bind more container: std::vector<std::string>, std::vector<int>, cocos2d::Map<std::string, T>.
2013-12-19 20:17:44 +08:00
James Chen
6aa8b779f0
Updates submodule reference of Bindings-generator, it supports to bind std::vector<std::string> ,std::vector<int>, cocos2d::Map<std::string, T> now.
2013-12-19 20:16:18 +08:00
boyu0
ef54ed3c15
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into HEAD
...
Conflicts:
cocos/2d/CCLabel.cpp
cocos/2d/CCLabel.h
cocos/2d/CCLabelBMFont.cpp
cocos/2d/CCLabelBMFont.h
cocos/2d/CCLayer.cpp
cocos/2d/CCLayer.h
cocos/2d/CCNode.cpp
extensions/GUI/CCControlExtension/CCControl.cpp
extensions/GUI/CCControlExtension/CCControlButton.cpp
extensions/GUI/CCControlExtension/CCScale9Sprite.cpp
tools/tojs/cocos2dx.ini
2013-12-19 17:05:59 +08:00
James Chen
c14754b720
Updates submodule of bindings-generator.
2013-12-19 11:50:45 +08:00
samuele3hu
55830c3023
Add support for unsigned short
2013-12-18 13:47:59 +08:00
James Chen
8d086f9d02
[scripting] Ignores Director::getRenderer for bindings.
2013-12-18 10:15:42 +08:00
James Chen
37f408f2b9
Merge pull request #4506 from Dhilan007/ushort_jsb
...
add API for transform unsigned short
2013-12-17 02:20:56 -08:00
Dhilan007
0414926b52
add API for transform unsigned short
2013-12-17 18:17:04 +08:00
James Chen
8ab4537f73
issue #2171 : Binds New renderer classes, ignores NewTextureAtlas.
2013-12-17 15:41:26 +08:00
James Chen
a3cf2d8f7f
issue #2171 : Ignores Director::getFrustum.
2013-12-17 15:02:08 +08:00
James Chen
ce96725f83
Removes FileUtils::getFileData binding.
2013-12-16 14:14:12 +08:00
James Chen
464054d251
Updates Bindings-generator.
2013-12-16 13:01:20 +08:00
James Chen
e32979592a
Skips Texture2D::getPixelFormatInfoMap
2013-12-16 13:01:20 +08:00
boyu0
23af9dfd8d
issue #3162 : reset submodule
2013-12-13 18:15:59 +08:00
boyu0
b5bf9fb448
issue #3162 : change js/cocos2dx.ini
2013-12-13 14:44:44 +08:00
boyu0
c8c0e2270e
issue #3162 : deprecated RGBAProtocol, NodeRGBA and LayerRGBA
2013-12-13 10:10:49 +08:00
boyu0
d7106d49be
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect
2013-12-12 17:04:21 +08:00
samuele3hu
cc2323b636
issue #2790:Open travis support
2013-12-10 18:26:10 +08:00
boyu0
a71394b122
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect
2013-12-10 18:03:41 +08:00
samuele3hu
89c079009b
issue #2790:Resolve some errors of basical conversion functions
2013-12-10 18:01:40 +08:00
samuele3hu
883ecaa03f
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developConversion
2013-12-10 16:07:58 +08:00
samuele3hu
1ed8d108f7
issue #2790:Update binding-generator
2013-12-10 15:21:21 +08:00
minggo
55270cecb4
Merge pull request #4457 from dumganhar/iss2790-deprecate-ccarray
...
issue #2790 : Don't use CCDictionary, CCArray for CCBReader, use std::unordered_map, Vector<T>, Map<K, V> instead.
2013-12-09 23:15:43 -08:00
samuele3
c2e7299d8f
Issue #2790:Add more conversion functions to support templates containers
2013-12-10 11:21:30 +08:00
James Chen
ad5daeb962
issue #2790 : Don’t bind CCBAnimationManager::addNode.
2013-12-09 17:55:56 +08:00
James Chen
45cb79c5f4
issue #2790 : Updates bindings-generator. Fixes issue at https://github.com/cocos2d/bindings-generator/pull/53 .Matches typedef name firstly in conversion.yaml.
2013-12-08 22:10:14 +08:00
James Chen
c916377970
issue #2790 : Comments building template for android.
2013-12-06 17:23:31 +08:00
James Chen
7aff958063
issue #2790 : A typo fix.
2013-12-06 17:09:36 +08:00
James Chen
ed7c3f717a
issue #2790 : Travis-ci builds JSB projects again.
2013-12-06 16:49:17 +08:00
James Chen
b5978eeee6
issue #2790 : Bindings-generator supports binding Vector<T> and some bug fixes.
2013-12-06 16:46:19 +08:00
James Chen
68e376db2f
issue #2790 : Disables build lua projects for linux
2013-12-05 11:51:09 +08:00
James Chen
856a82d4b8
issue #2790 : Don’t build script bindings projects for travis.
2013-12-05 11:03:22 +08:00
samuele3
c1a226686f
issue #3309:Modify some deprecated cpp files and lua files
2013-12-04 15:15:55 +08:00
samuele3
a8c1bba464
issue #3309:Add some deprecated functions and classes to support master cocostudio lua bindings
2013-12-03 15:40:59 +08:00
James Chen
216f8743b0
closed #3288 : Updates bindings-generator.
2013-11-27 14:04:53 +08:00
minggo
6c7cb0bf23
Merge pull request #4359 from Dhilan007/androdi_build
...
[ci skip]add proceed java compilation and generate apk.
2013-11-26 01:47:14 -08:00
James Chen
03005173b1
issue #3258 : Updates bindings-generator.
2013-11-26 15:45:09 +08:00
James Chen
6f67447b5e
issue #3258 : Updates cocos2dx.ini. Adding some classes to ‘classes_need_extend’ section.
2013-11-26 15:43:39 +08:00
Dhilan007
881d43fe3b
add proceed java compilation and generate apk.
2013-11-26 11:58:01 +08:00
Dhilan007
c09f50e3f8
issue #3261:add miss binding
2013-11-24 22:47:29 +08:00
James Chen
43e8a4912d
Update tools/tolua/cocos2dx.ini, ignore onTouchXXX, onKeyXXX, onAccXXX callback functions to be bound to LUA.
2013-11-20 12:09:27 +08:00
Dhilan007
ce0a6d5b57
fix miss bind setGrid\getGrid for JS.
2013-11-19 10:33:11 +08:00
minggo
593c0f8946
Merge pull request #4304 from Dhilan007/di3223
...
[ci skip]issue #3223:bind gui and studio
2013-11-18 02:28:53 -08:00
minggo
c7e87b7f60
Merge pull request #4285 from dumganhar/iss3215-cpp-formatter
...
[ci skip]issue #3215 : Adding tools of best c++ practice for upgrading game codes from v2.x to v3.x
2013-11-18 02:25:38 -08:00
Dhilan007
6217641105
add miss bind
2013-11-18 18:00:42 +08:00
Dhilan007
8b14575d7e
bind gui and studio.
2013-11-18 16:54:52 +08:00
James Chen
102703703b
issue #3215 : Updating comments for this tool.
2013-11-16 23:09:45 +08:00
James Chen
fd72836e20
issue #3215 : Comments add_namespace type in “all” mode.
2013-11-16 23:02:33 +08:00
James Chen
dcf413765b
[First commit]Adding tools of best c++ practice for upgrading game codes from v2.x to v3.x
2013-11-16 22:58:01 +08:00
lite3
8d24960bb2
fix path for windows
2013-11-15 18:05:24 +08:00
minggo
0f3cb95f58
Merge pull request #4028 from lite3/develop
...
[ci skip]add options for android_mk_generator
2013-11-13 19:21:58 -08:00
samuele3
17f74eeb17
issue #2868:Modify armature test samples and add more armature test samples
2013-11-13 18:18:29 +08:00
samuele3
062fb85943
issue #2868:Modify cocos2dx_studio.ini to add more auto-binding class
2013-11-13 10:12:44 +08:00
samuele3
f429c4c632
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS
2013-11-12 17:51:33 +08:00
samuele3
cb51df7d65
Update bindings-generator
2013-11-12 17:31:24 +08:00
samuele3
ae6597dbaa
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCheck
...
Conflicts:
tools/bindings-generator
2013-11-12 17:23:41 +08:00
samuele3
18bc96096c
Resolve some warning and modify uint32_t to long
2013-11-12 17:18:51 +08:00
samuele3
c1d256c159
issue #2868:modify ccs lua test samples
2013-11-12 16:52:03 +08:00
samuele3
cfb1cfdf65
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS
...
Conflicts:
cocos/editor-support/cocostudio/CCSGUIReader.h
2013-11-12 15:30:36 +08:00
samuele3
482ee5d47f
issue #2868:Add more ccs lua test samples
2013-11-12 15:25:47 +08:00
James Chen
df214acb6f
[develop] Updating bindings-generator, fixing forward declare that generates binding glue codes which is an empty class.
2013-11-11 18:42:39 +08:00
samuele3
7cfe890d5d
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS
2013-11-11 17:04:37 +08:00
samuele3
06c7d3e96d
issue #2868:Add ccd lua test samples
2013-11-11 17:03:43 +08:00
James Chen
22584ca9c2
Updating submodule of bindings-generator.
2013-11-11 16:50:07 +08:00
James Chen
272afaa7d9
Updating Bindings-generator.
2013-11-11 15:57:15 +08:00
James Chen
8f8d0f86d7
Updating Bindings-generator.
2013-11-11 14:38:12 +08:00
Luis Parravicini
90df6fc763
fixed typos
2013-11-10 08:25:01 -03:00
samuele3
fa1a5c3735
Add conversion config for long type
2013-11-10 11:03:27 +08:00
samuele3
d4dbc7a442
Add conversion config for long type
2013-11-10 09:21:33 +08:00
samuele3
e26fe04deb
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS
2013-11-09 23:04:11 +08:00
samuele3
286393d28e
issue #2868:Add more manual lua binding functions
2013-11-09 22:58:40 +08:00
lite3
a3797e2ebc
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-11-08 21:00:31 +08:00
James Chen
74497e18ec
[CMake template] Fix compilation errors.
2013-11-08 18:25:58 +08:00
James Chen
eeedab78b2
[LINUX] Adding template CMake files for linux.
2013-11-08 18:13:24 +08:00
samuele3
6a1a774303
issue #2868:Config cocoStudio GUI lua binding files and add a few script files
2013-11-07 10:16:02 +08:00
samuele3
61d8f9673c
issue #2868:Move armature related lua binding from namespace 'cc' to namespace 'ccd'
2013-11-05 17:34:25 +08:00
samuele3
b76865c692
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS
2013-11-05 15:11:05 +08:00
samuele3
b445f0824a
issue #2868:Bind UI and Scene parser to lua by bindings-generator and add releated test samples
2013-11-05 15:09:51 +08:00
James Chen
a3a2b0274e
Updating submodule of bindings-generator.
2013-11-05 14:23:48 +08:00
James Chen
f968169da4
Update run-script.sh
2013-11-04 21:59:03 +08:00
James Chen
6a351711ae
[cmake] update run-script.sh
2013-11-04 21:05:29 +08:00
James Chen
b1a9843091
[cmake] update run-script.sh
2013-11-04 21:03:09 +08:00
minggo
cde79a9724
use -j10 to build android samples
2013-11-04 18:01:42 +08:00
James Chen
a823e66f8e
Update run-script.sh
...
Adding soft-link for `samples/Cpp/SimpleGame/proj.android/obj`.
2013-11-03 14:36:22 +08:00
minggo
d4210c77bb
Merge pull request #4058 from samuele3hu/developAssetsManager
...
issue #3037:Add assetsmananger lua binding and a releated test sample
2013-11-01 02:50:47 -07:00
samuele3
80f3a7d57a
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager
...
Conflicts:
build/cocos2d_samples.xcodeproj/project.pbxproj
cocos/scripting/lua/bindings/LuaScriptHandlerMgr.h
cocos/scripting/lua/script/Cocos2dConstants.lua
2013-11-01 17:17:21 +08:00
minggo
915d75ea7c
build release version of android samples
2013-11-01 16:44:35 +08:00
James Chen
8e7ed129c5
Update before-install.sh
2013-11-01 15:39:46 +08:00
James Chen
daf4e22819
[Bindings] Skip Label::getLettersInfo
2013-11-01 15:34:08 +08:00
samuelhu
e93bcca13e
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developHttp
2013-11-01 14:44:21 +08:00
samuelhu
b0fdb66d2d
Modify the all luajit build scripts and let libluajit.a of mac only support 64bit
2013-11-01 14:38:14 +08:00
James Chen
72d6f8650b
Regular expression fix for generate-jsbindings.sh.
2013-11-01 11:50:43 +08:00
James Chen
1d932ae95f
Updating travic-ci scripts.
2013-11-01 11:46:02 +08:00
James Chen
0298c338a6
issue #2826 : Updating cocos2d-console submodule.
2013-11-01 10:46:06 +08:00
samuelhu
7c45ddafe2
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2013-10-31 17:22:14 +08:00
James Chen
d1b88b0a78
[sp v25] Updating auto-generated and bindings-generated submodules.
2013-10-31 11:15:17 +08:00
samuelhu
1f07a659a6
issue #3069:Modify layer lua register and add some compatible lua binding functions
2013-10-31 09:49:04 +08:00
lite3
21d7dcaf3a
add some options
...
Usage: android_mk_generator.py [options]
Options:
-h, --help show this help message and exit
-c CONFIG, --config=CONFIG
config file path.
-r ROOTPATH, --rootpath=ROOTPATH
class root path for mkfile, pathes, exclude.
2013-10-30 16:44:21 +08:00
lite3
51f30a01d5
replace os.path.samefile
...
os.path.samefile not work at windows.
2013-10-30 16:43:19 +08:00
lite3
2e3b3be125
config android_mk_generator
2013-10-29 22:53:01 +08:00
Dhilan007
3305dd1de3
issues #2905:add miss file
2013-10-23 17:05:27 +08:00
samuelhu
5f769b2313
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager
2013-10-22 16:52:44 +08:00
samuelhu
be1f17ca0f
issue #3037:Add assetsmananger lua binding and a releated test sample
2013-10-22 16:14:49 +08:00
Dhilan007
f11dba586a
issue #2905:modification vs-project for folder structure change
2013-10-21 22:09:21 +08:00
James Chen
d6be31f74a
Merge commit 'refs/pull/3943/head' of git://github.com/cocos2d/cocos2d-x into create-project-fix
2013-10-18 10:40:12 +08:00
James Chen
5c5f2d84e2
issue #2905 : Updating tolua settings.
2013-10-16 16:27:45 +08:00
James Chen
6fba0dd5db
issue #2905 : [iOS Mac] TestJavascript works now.
2013-10-16 15:43:59 +08:00
Toru Matsuoka
de9e831e35
Fix definition of platform for ios and mac.
...
Remove unnecessary files
2013-10-14 20:42:45 +09:00
Toru Matsuoka
613bb89120
Make "rename" setting usable.
2013-10-14 20:19:21 +09:00
minggo
95acb1b9e3
issue #2905 : helloworld build ok on android
2013-10-14 14:01:00 +08:00
minggo
4313c46e93
issue #2905:adjust folder structure
2013-10-12 11:22:05 +08:00
minggo
9cf7d48d62
include correct path in cocos2dx.ini to generate audio lua binding
2013-10-10 17:04:36 +08:00
minggo
7b7aabf2de
include correct path in cocos2dx.ini to generate audio binding
2013-10-10 16:54:05 +08:00
samuele3hu
531e454eae
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into Armature
...
Conflicts:
samples/samples.xcodeproj/project.pbxproj
2013-10-10 11:47:36 +08:00
Dhilan007
20971b0ad2
issues #2895:Synchronize JSB from master to developer
2013-10-08 15:57:34 +08:00
samuele3hu
508654738a
issue #2768:Modify armature test sample and skip some functions to lua
2013-10-08 15:45:13 +08:00
samuele3hu
4c1bd825af
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into Armature
2013-10-08 10:17:58 +08:00
James Chen
5673af2b3e
Updating Bindings-generator.
2013-09-22 10:23:48 +08:00
minggo
bcb171e3c9
fix line end in windows
2013-09-20 22:23:13 +08:00
Ricardo Quesada
4f07dbaece
Restores .py file to its original layout
2013-09-19 18:32:47 -07:00