andyque
|
87af0ecdd6
|
add back libbox2d and libspine project to our solution
|
2014-09-03 17:37:34 +08:00 |
minggo
|
5cca8cc87d
|
remove Node::_setLocalZOrder()
|
2014-09-03 17:26:50 +08:00 |
songchengjiang
|
68ce6449e8
|
repaired camera orientation
Testing RotateBy action
|
2014-09-03 17:17:57 +08:00 |
yangxiao
|
bb90fe48ef
|
merge cocos
|
2014-09-03 16:54:17 +08:00 |
yangxiao
|
8c5f928456
|
Merge branch 'newcode' into v3
|
2014-09-03 16:28:04 +08:00 |
minggo
|
290238f6e1
|
Merge pull request #7936 from andyque/fixWarning
fxi compile warning
|
2014-09-03 16:19:04 +08:00 |
XiaoYang
|
f03c4d4790
|
Merge pull request #125 from liuliang2004/Meshv3
Set the node name
|
2014-09-03 15:59:49 +08:00 |
liuliang
|
c167ed17ee
|
Set the node name
|
2014-09-03 15:55:11 +08:00 |
yangxiao
|
1bd09f21d0
|
merge cocos
|
2014-09-03 15:42:58 +08:00 |
cocoscodeide
|
da057b5a68
|
Merge pull request #69 from cocos2d/v3
update v3
|
2014-09-03 15:30:40 +08:00 |
yangxiao
|
5a85cb405e
|
fix billboard face
|
2014-09-03 15:28:15 +08:00 |
minggo
|
5fa3e11613
|
Merge pull request #7937 from samuele3hu/v3_template_fix
Fix the crash of project which was created by the lua-template-runtime
|
2014-09-03 15:12:36 +08:00 |
samuele3hu
|
45f08d54cb
|
Fix the member name error in the `vec4_to_luaval `
|
2014-09-03 15:07:31 +08:00 |
andyque
|
58f219fc20
|
test extension::Scale9Sprite and remove unused file compile flags
|
2014-09-03 15:00:09 +08:00 |
samuele3hu
|
d681bdce92
|
Fix the crash of project which was created by the lua-template-runtime
|
2014-09-03 14:54:58 +08:00 |
andyque
|
7493c7bf3e
|
fxi compile warning
|
2014-09-03 14:47:04 +08:00 |
minggo
|
1b9e9d2291
|
Merge pull request #7935 from CocosRobot/update_cocosfiles_1409722664
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-09-03 14:16:03 +08:00 |
andyque
|
2e27a6865f
|
update project to vs2013
|
2014-09-03 14:10:38 +08:00 |
CocosRobot
|
1ec9933045
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-09-03 05:37:45 +00:00 |
minggo
|
66943eec98
|
Merge pull request #7932 from minggo/remove-unneeded-files
remove unneeded files
|
2014-09-03 13:36:31 +08:00 |
minggo
|
1ddd7149ee
|
Merge pull request #7933 from CocosRobot/update_cocosfiles_1409717115
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-09-03 13:36:12 +08:00 |
XiaoYang
|
4e0c358a90
|
Merge pull request #124 from liuliang2004/Meshv3
Set the node name
|
2014-09-03 13:12:33 +08:00 |
XiaoYang
|
92cfea4dfa
|
Merge pull request #123 from lvlonggame/v3
Make old version static model compatible.
|
2014-09-03 13:12:19 +08:00 |
yangxiao
|
5fc5741285
|
not export Sequence3D
|
2014-09-03 12:44:54 +08:00 |
yangxiao
|
6e55a508de
|
not export Sequence3D::create
|
2014-09-03 12:08:58 +08:00 |
CocosRobot
|
61a3c80cb9
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-09-03 04:05:23 +00:00 |
minggo
|
61f2efbc1b
|
Merge pull request #7931 from CocosRobot/update_lua_bindings_1409714881
[AUTO]: updating luabinding automatically
|
2014-09-03 12:03:24 +08:00 |
minggo
|
cb64b11781
|
Merge pull request #7930 from CocosRobot/update_cocosfiles_1409714789
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-09-03 12:03:06 +08:00 |
yangxiao
|
adda886210
|
tmp work
|
2014-09-03 11:58:09 +08:00 |
minggo
|
b37ef4e1c3
|
remove unneeded files
|
2014-09-03 11:52:19 +08:00 |
liuliang
|
278a3441ce
|
Set the node name
|
2014-09-03 11:43:42 +08:00 |
Jeff
|
ed849a1863
|
fix: win32 cpp-tests sometimes cannot display font correctly
Pass FILE_SHARE_READ to the 3rd parameter of CreateFileW. Otherwise, it
may fail to get date from the font file.
|
2014-09-03 11:34:40 +08:00 |
CocosRobot
|
ffb36d577e
|
[AUTO]: updating luabinding automatically
|
2014-09-03 03:29:43 +00:00 |
minggo
|
8fd8ba97db
|
[ci skip]
|
2014-09-03 11:27:45 +08:00 |
CocosRobot
|
2dea7c3a18
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-09-03 03:26:30 +00:00 |
minggo
|
eee9ac626a
|
Merge pull request #7815 from andyque/mergeExtensionEditBox
merge extension EditBox to ui module
|
2014-09-03 11:25:10 +08:00 |
yangxiao
|
cb96458878
|
not export Sequence3D
|
2014-09-03 11:06:38 +08:00 |
yangxiao
|
f59f43251a
|
failed to export Sequence3D::create
|
2014-09-03 10:38:21 +08:00 |
minggo
|
9351caaa58
|
Merge pull request #7927 from andyque/fixTransitionSceneStencilBuffer
fix transition scene stencil buffer
|
2014-09-03 10:26:28 +08:00 |
andyque
|
b00a7b3b38
|
add Node normalizedPosition bug test
|
2014-09-03 09:16:31 +08:00 |
andyque
|
a79d35d08b
|
remove NodeNormalizedPositionTest
|
2014-09-03 09:16:31 +08:00 |
andyque
|
fab9a0052b
|
fix normalizedPosition bug
|
2014-09-03 09:16:31 +08:00 |
yangxiao
|
8dff467b27
|
Merge branch 'newcode' into transition
|
2014-09-03 09:15:12 +08:00 |
yangxiao
|
fed2021707
|
Fixme: frustum culling
|
2014-09-03 09:02:32 +08:00 |
lite3
|
6ff1289aed
|
fix compile error on Xcode
|
2014-09-02 20:26:21 +08:00 |
andyque
|
aa929fe106
|
add chipmunk prebuilt lib for linux
|
2014-09-02 03:51:41 -07:00 |
andyque
|
3743f02c7e
|
finish ios/mac/android
|
2014-09-05 11:39:11 +08:00 |
andyque
|
4f217ed577
|
remove include
|
2014-09-05 10:43:33 +08:00 |
andyque
|
4276c59975
|
remove chipmunk source code
|
2014-09-05 10:42:59 +08:00 |
minggo
|
4881ca31d5
|
Merge pull request #7929 from andyque/fixVs2013CompileError
Fix vs2013 compile error
|
2014-09-02 18:17:30 +08:00 |