lvlong
|
387f190ff1
|
Merge newcode into v3
|
2014-09-02 17:52:02 +08:00 |
lvlong
|
27f771744a
|
static model load problem of old version .
|
2014-09-02 17:33:22 +08:00 |
yangxiao
|
f84c6a5d27
|
Merge branch 'newcode' into transition
|
2014-09-02 17:15:05 +08:00 |
andyque
|
dafbf28283
|
fix release mode compile error
|
2014-09-02 16:42:23 +08:00 |
andyque
|
fadfa87afd
|
fix vs2013 compile error
|
2014-09-02 16:42:04 +08:00 |
andyque
|
a429959e65
|
fix lua compile error
|
2014-09-02 01:31:02 -07:00 |
andyque
|
51e160beff
|
fix EditBox lua compile error
|
2014-09-02 17:37:55 +08:00 |
lite3
|
5d935c2cea
|
fix compile error on android
|
2014-09-02 16:16:36 +08:00 |
andyque
|
28f00df0cf
|
Merge branch 'mergeExtensionEditBox' of github.com:andyque/cocos2d-x into mergeExtensionEditBox
|
2014-09-02 16:14:16 +08:00 |
andyque
|
a0c28e49ac
|
remove exteion edtibox
|
2014-09-02 16:14:07 +08:00 |
andyque
|
2deeee2109
|
remove extension luabindings
|
2014-09-02 01:11:50 -07:00 |
Huabing.Xu
|
05d0e04073
|
[ci skip] update template for triangles command
|
2014-09-02 15:05:21 +08:00 |
andyque
|
8033b1f7bb
|
Merge branch 'v3' into mergeExtensionEditBox
|
2014-09-02 00:03:16 -07:00 |
minggo
|
4749205b61
|
Merge pull request #7917 from super626/v3
bundle code adjustment
|
2014-09-02 14:58:53 +08:00 |
XiaoYang
|
e5dd91029a
|
Merge pull request #122 from songchengjiang/billboard
BillBorad
|
2014-09-02 14:34:34 +08:00 |
yangxiao
|
49a2122e17
|
add sequence3d to template
|
2014-09-02 14:28:46 +08:00 |
minggo
|
a7c71470f9
|
Merge pull request #7928 from CocosRobot/update_lua_bindings_1409636609
[AUTO]: updating luabinding automatically
|
2014-09-02 14:18:41 +08:00 |
CocosRobot
|
dc15287ac3
|
[AUTO]: updating luabinding automatically
|
2014-09-02 05:45:07 +00:00 |
minggo
|
a6ec956bc7
|
[ci skip]
|
2014-09-02 13:43:14 +08:00 |
minggo
|
2aaae00e47
|
Merge pull request #7926 from kaishiqi/patch-1
Update CCGLViewImpl.cpp
|
2014-09-02 13:41:04 +08:00 |
yangxiao
|
50a7a1703a
|
add sequence3d to template
|
2014-09-02 12:05:37 +08:00 |
songchengjiang
|
8a88ba6142
|
Tab Format
|
2014-09-02 11:50:09 +08:00 |
songchengjiang
|
045af3f7a3
|
Merge branch 'billboard' of https://github.com/super626/cocos2d-x into billboard
|
2014-09-02 11:24:38 +08:00 |
songchengjiang
|
18d06015c6
|
Added More Models
Code optimization
|
2014-09-02 11:24:19 +08:00 |
yangxiao
|
de80d8c344
|
fix warning
|
2014-09-02 11:22:01 +08:00 |
andyque
|
dffdef1118
|
fix transition scene stencil buffer
|
2014-09-02 11:21:11 +08:00 |
kaishiqi
|
8f11dd7f8b
|
Update CCGLViewImpl.cpp
fix GLViewImpl::onGLFWMouseScrollCallback forger transform cursor position.
|
2014-09-02 11:13:30 +08:00 |
yangxiao
|
39e33cbf71
|
Merge branch 'billboard' of https://github.com/super626/cocos2d-x into billboard
|
2014-09-02 11:12:24 +08:00 |
yangxiao
|
de3921c101
|
fix render stats bug
|
2014-09-02 11:12:15 +08:00 |
lite3
|
74d8bf6f27
|
fix
|
2014-09-02 10:51:17 +08:00 |
yangxiao
|
aab78c898e
|
Merge branch 'newcode' into transition
|
2014-09-02 10:45:46 +08:00 |
yangxiao
|
d542624bfd
|
remove from map when release
|
2014-09-02 10:40:29 +08:00 |
andyque
|
c13e7b7224
|
Merge branch 'mergeExtensionEditBox' of github.com:andyque/cocos2d-x into mergeExtensionEditBox
|
2014-09-02 10:06:17 +08:00 |
andyque
|
6dc45f86e4
|
fix windows compile error
|
2014-09-02 10:05:22 +08:00 |
minggo
|
88a80495df
|
Merge pull request #7923 from natural-law/v3
Update the reference of submodule cocos2d-console.
|
2014-09-02 09:41:41 +08:00 |
zhangbin
|
3e1053aa2a
|
Update the reference of submodule cocos2d-console.
|
2014-09-02 09:31:23 +08:00 |
andyque
|
fa33ab76fc
|
remove UIEditBox test
|
2014-09-01 18:23:45 +08:00 |
andyque
|
e24192aeb2
|
fix linux compile
|
2014-09-01 18:06:21 +08:00 |
XiaoYang
|
2a0743e5a5
|
Merge pull request #121 from liuliang2004/transition
Configure project file
|
2014-09-01 17:58:22 +08:00 |
yangxiao
|
9ce30bdabd
|
add to linux
|
2014-09-01 17:52:13 +08:00 |
liuliang
|
c4242b4d0b
|
Configure project file
|
2014-09-01 17:45:45 +08:00 |
andyque
|
ffee7b27d4
|
fix linux and android compile error
|
2014-09-01 17:43:40 +08:00 |
cocoscodeide
|
c710d9daca
|
Merge pull request #68 from chuanweizhang2013/v3luaruntime
add mac app name in writable path
|
2014-09-01 17:40:38 +08:00 |
chuanweizhang2013
|
4ada914426
|
mac writable path
|
2014-09-01 02:35:08 -07:00 |
andyque
|
85ce801fdd
|
remove ccscale9sprite , cceditBox
|
2014-09-01 17:06:22 +08:00 |
chuanweizhang2013
|
5af89f5d46
|
fixed error
|
2014-09-01 01:57:08 -07:00 |
yangxiao
|
57a70b629f
|
add sequence3d
|
2014-09-01 16:00:50 +08:00 |
andyque
|
0076953f97
|
fix iOS compile error
|
2014-09-01 15:55:09 +08:00 |
yangxiao
|
33005bedcb
|
add to cocos3d
|
2014-09-01 15:32:06 +08:00 |
andyque
|
aef0f5e729
|
Merge branch 'v3' into mergeExtensionEditBox
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/ui/Android.mk
cocos/ui/CMakeLists.txt
cocos/ui/proj.win32/libui.vcxproj
cocos/ui/proj.win32/libui.vcxproj.filters
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CocosGUIScene.cpp
tests/cpp-tests/proj.wp8-xaml/cpp-testsComponent/cpp-testsComponent.vcxproj.filters
|
2014-09-01 15:26:25 +08:00 |