yangxiao
|
bf7997e342
|
modify
|
2014-08-22 18:14:33 +08:00 |
yangxiao
|
02ccee67df
|
add release note
|
2014-08-22 18:08:26 +08:00 |
huangshiwu
|
07af58c0c2
|
OpenGL context attributions setting revise -2
|
2014-08-22 16:22:16 +08:00 |
yangxiao
|
1db3d14896
|
reset bone number to 60, put test in alphabetical order
|
2014-08-22 16:06:36 +08:00 |
samuele3hu
|
d1b4d43a0b
|
Remove CCModuleManager.h/cpp and adjust the related project
|
2014-08-22 15:10:46 +08:00 |
yangxiao
|
6ff2aa2755
|
change skin joint count to 40
|
2014-08-22 15:00:34 +08:00 |
yangxiao
|
3a0d63caa6
|
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
|
2014-08-22 14:55:11 +08:00 |
yangxiao
|
a102946d35
|
android and linux
|
2014-08-22 14:54:26 +08:00 |
XiaoYang
|
e4737f9070
|
Merge pull request #112 from liuliang2004/Meshv3
Modify project file
|
2014-08-22 14:46:46 +08:00 |
yangxiao
|
39cc03173b
|
remove unused variable
|
2014-08-22 14:43:48 +08:00 |
liuliang
|
c7c091e4b6
|
Modify project file
|
2014-08-22 14:32:27 +08:00 |
yangxiao
|
70661b0ff4
|
lua bind
|
2014-08-22 14:25:00 +08:00 |
yangxiao
|
1938817187
|
reset girl name
|
2014-08-22 14:24:40 +08:00 |
yangxiao
|
81dbb0bca4
|
add comment
|
2014-08-22 14:02:51 +08:00 |
samuele3hu
|
70cba1f64a
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_new_module
Conflicts:
cocos/Android.mk
|
2014-08-22 14:01:17 +08:00 |
minggo
|
aba973b1ea
|
Merge pull request #7834 from andyque/improveUI
add click event listener to all Widget classes
|
2014-08-22 14:00:10 +08:00 |
yangxiao
|
d90572fc10
|
engine refactor hide concept of submesh
|
2014-08-22 13:52:03 +08:00 |
samuele3hu
|
a3e4402c5f
|
Adjust cpp-template-default template
|
2014-08-22 13:50:28 +08:00 |
samuele3hu
|
1bda276392
|
Update android.mk for related cpp test cases
|
2014-08-22 13:49:54 +08:00 |
samuele3hu
|
2f60e610a2
|
Integrate libcocosdenshion,libcocos3d,libnetwork,libcocostudio and libextension into cocos2d on the iOS/Mac platform
|
2014-08-22 13:49:21 +08:00 |
samuele3hu
|
523dcdb6fb
|
Update cocos2d android.mk
|
2014-08-22 13:43:18 +08:00 |
samuele3hu
|
ada7fa23d3
|
Add CC_DLL for related network files
|
2014-08-22 13:42:46 +08:00 |
minggo
|
eef93ccd14
|
Merge pull request #7838 from andyque/updateReleaseNote
update ui::Scale9Sprite release note
|
2014-08-22 13:42:02 +08:00 |
samuele3hu
|
700699a37f
|
Modify MciPlayer.cpp to support Unicode
|
2014-08-22 13:41:48 +08:00 |
minggo
|
a0b19db670
|
Merge pull request #7840 from minggo/fix-warning
fix warnings
|
2014-08-22 13:41:31 +08:00 |
minggo
|
0c9c873edb
|
Merge pull request #7846 from andyque/addUILuaBindings
add disableCascadeOpacity to ProtectedNode and Scale9Sprite
|
2014-08-22 13:40:02 +08:00 |
minggo
|
ab9c35616e
|
Merge pull request #7847 from andyque/addLuabindingsToUI
add deprecated options for ui, add Scale9Sprite bindings
|
2014-08-22 13:38:45 +08:00 |
yangxiao
|
7818b28ee3
|
Merge branch 'newcode' into v3
|
2014-08-22 13:32:57 +08:00 |
yangxiao
|
022b7e3fd3
|
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
|
2014-08-22 13:27:14 +08:00 |
XiaoYang
|
72e71d210e
|
Merge pull request #111 from lvlonggame/merge-bundle
modify assert(0)
|
2014-08-22 13:27:01 +08:00 |
yangxiao
|
2d5431353a
|
engine adjust
|
2014-08-22 13:25:26 +08:00 |
andyque
|
13003fe0a6
|
add deprecated options for ui, add Scale9Sprite bindings
|
2014-08-22 11:56:13 +08:00 |
andyque
|
84cf0ee834
|
add disableCascadeOpacity to ProtectedNode and Scale9Sprite
|
2014-08-22 11:49:39 +08:00 |
minggo
|
de7004345f
|
Merge pull request #7845 from minggo/update-version
[ci skip]update version
|
2014-08-22 11:49:25 +08:00 |
minggo
|
7fd1521bbf
|
update version
|
2014-08-22 11:48:14 +08:00 |
huangshiwu
|
7f57d15cb3
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_glviewattrs
|
2014-08-22 11:04:13 +08:00 |
huangshiwu
|
7dec715288
|
OpenGL context attributions setting revise
|
2014-08-22 10:55:39 +08:00 |
minggo
|
21cb90bf12
|
Merge pull request #7841 from pandamicro/3.2-cocos-engine-PR
Migrate some changes from Cocos2d-JS to -x
|
2014-08-21 22:38:59 +08:00 |
pandamicro
|
bb5e189f30
|
Fix warning or Bundle3D
|
2014-08-21 20:02:22 +08:00 |
pandamicro
|
59cedea6dc
|
Reverse useless change
|
2014-08-21 19:40:18 +08:00 |
pandamicro
|
634847412b
|
Reverse CC_CONSTRUCTOR_ACCESS modification
|
2014-08-21 19:36:28 +08:00 |
lvlong
|
4ce334c0c3
|
Merge branch 'v3' of github.com:super626/cocos2d-x into merge-bundle
|
2014-08-21 18:16:21 +08:00 |
lvlong
|
d00bcbccb0
|
add texture coord2-7
|
2014-08-21 18:14:24 +08:00 |
minggo
|
f94717de94
|
Merge pull request #7839 from minggo/revert-ccimage
Revert ccimage
|
2014-08-21 16:21:54 +08:00 |
minggo
|
2afbc7a698
|
fix warnings
|
2014-08-21 16:21:23 +08:00 |
pandamicro
|
34b93a24ff
|
Merge branch 'v3' of git://github.com/cocos2d/cocos2d-x into 3.2-cocos-engine-PR
Conflicts:
cocos/platform/desktop/CCGLViewImpl.h
|
2014-08-21 16:07:19 +08:00 |
minggo
|
4563e65427
|
fix compiling error on android and fix some coding style
|
2014-08-21 15:41:05 +08:00 |
pandamicro
|
5fb9f59633
|
Fix small issues
|
2014-08-21 15:40:53 +08:00 |
pandamicro
|
9544482058
|
Fix Android.mk s
|
2014-08-21 15:40:42 +08:00 |
pandamicro
|
485dd1f7da
|
Update #3897: Refactor missed protected constructors
|
2014-08-21 15:40:22 +08:00 |