yangxiao
|
fdc0fad935
|
tmp work
|
2014-08-27 14:46:24 +08:00 |
yangxiao
|
c5515874d5
|
merge cocos
|
2014-08-27 11:00:14 +08:00 |
yangxiao
|
65b0cca132
|
Merge branch 'light' of https://github.com/super626/cocos2d-x into light
|
2014-08-26 14:37:56 +08:00 |
songchengjiang
|
3369bb7e51
|
Replaced Tab Format
|
2014-08-26 14:25:01 +08:00 |
songchengjiang
|
cf964d62de
|
Light Shader optimization
|
2014-08-26 14:18:22 +08:00 |
yangxiao
|
03390a4f46
|
merge cocos
|
2014-08-26 14:05:59 +08:00 |
samuele3hu
|
07cf4d3526
|
Fix the win32 and android compile error
|
2014-08-25 14:10:13 +08:00 |
songchengjiang
|
1a1ccda3ed
|
repaired Action BUG
|
2014-08-25 13:58:15 +08:00 |
samuele3hu
|
74624f5ba1
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_new_module
|
2014-08-25 11:52:52 +08:00 |
samuele3hu
|
893e0b0a08
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_new_module
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
|
2014-08-25 11:45:29 +08:00 |
minggo
|
7ece79e7d3
|
Merge pull request #7867 from CocosRobot/update_lua_bindings_1408933963
[AUTO]: updating luabinding automatically
|
2014-08-25 11:01:27 +08:00 |
minggo
|
e5ac6e204b
|
Merge pull request #7864 from minggo/module-devide
Module devide
|
2014-08-25 11:01:19 +08:00 |
CocosRobot
|
5db16cdc23
|
[AUTO]: updating luabinding automatically
|
2014-08-25 02:34:32 +00:00 |
minggo
|
74fc9931e7
|
fix compiling error of cpp-tests on linux
|
2014-08-24 19:12:36 -07:00 |
samuele3hu
|
c495e5266a
|
Remove useless win32 module project and adjust the related project setting
|
2014-08-25 09:59:50 +08:00 |
samuele3hu
|
1126e950b2
|
Integrate libluacocosdenshion,libluacocos3d,libluanetwork,libluacocostudio and libluaextension into libluacocos2d on the win32 platform and adjust the related test cases
|
2014-08-25 09:52:48 +08:00 |
samuele3hu
|
281da9f1d7
|
Integrate libluacocosdenshion,libluacocos3d,libluanetwork,libluacocostudio and libluaextension into libluacocos2d on the iOS/Mac platform and adjust the related test cases
|
2014-08-25 09:51:08 +08:00 |
samuele3hu
|
25aab05b1f
|
Integrate libluacocosdenshion,libluacocos3d,libluanetwork,libluacocostudio and libluaextension into libluacocos2d on the android platform
|
2014-08-25 09:48:14 +08:00 |
minggo
|
dcea3b6134
|
Merge pull request #7843 from huangshiwu/v3_glviewattrs
V3 glviewattrs
|
2014-08-25 09:46:19 +08:00 |
minggo
|
e7050486d3
|
fix conflict
|
2014-08-24 18:56:51 +08:00 |
minggo
|
030f80a257
|
one static library for c++ and another one for lua-binding
|
2014-08-24 03:52:51 -07:00 |
zii
|
e8a5fc9fef
|
Update CCActionManager.cpp
|
2014-08-23 17:06:46 +08:00 |
zii
|
4763531085
|
Update CCActionManager.cpp
|
2014-08-23 17:03:26 +08:00 |
CocosRobot
|
899e0a4182
|
[AUTO]: updating luabinding automatically
|
2014-08-22 11:25:33 +00:00 |
minggo
|
0701fe1dfb
|
Merge pull request #7853 from super626/v3
Better reskin model support
|
2014-08-22 19:18:47 +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
|
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
|
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 |
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 |
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 |