martell
|
75911658aa
|
Make CMake More Robust
|
2014-08-06 15:43:19 +01:00 |
CocosRobot
|
f47d11cce0
|
[AUTO]: updating luabinding automatically
|
2014-08-06 09:14:13 +00:00 |
minggo
|
7a833d66d1
|
Merge pull request #7676 from samuele3hu/v3_module
Split luabindings into serval modules and adjust project settings of test cases
|
2014-08-06 17:09:12 +08:00 |
samuele3hu
|
497847f7e8
|
Reset cpp-tests/cpp-empty-tests Mac build configure to ‘debug’ and delete some auto-bindings files.
|
2014-08-06 14:46:30 +08:00 |
minggo
|
6ee0c4171f
|
Merge pull request #7622 from rny/LabelTTF
fix LabelTTF::getBoundingBox() position error
|
2014-08-06 14:33:28 +08:00 |
minggo
|
f786190349
|
Merge pull request #7652 from zhiqiangxu/labelbmfont_getboundingbox
bug fix for LabelBMFont::getBoundingBox()
|
2014-08-06 14:28:52 +08:00 |
minggo
|
187dc29f6d
|
Merge pull request #7679 from andyque/fixComponentContainerRemoveIssue
add safe guard when remove component from node componentContainer
|
2014-08-06 14:21:49 +08:00 |
samuele3hu
|
9912b596f8
|
Reset lua-empty-test Mac/iOS build configure to ‘debug’ and delete CCModuleManager.h/cpp by mistake
|
2014-08-06 13:51:46 +08:00 |
andyque
|
e2e8325f58
|
add safe guard when remove component from node componentContainer
|
2014-08-06 13:51:16 +08:00 |
Kenichi Hamada
|
771996f9f3
|
Added a function getAssetManager() on CCFileUtilsAndroid
|
2014-08-06 13:36:04 +09:00 |
minggo
|
9f51adfafa
|
Merge pull request #7461 from joshuastray/fix_constructor_access
fix LabelAtlas constructor protected to CC_CONSTRUCTOR_ACCESS
|
2014-08-06 10:15:02 +08:00 |
samuele3hu
|
63b3f838b6
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module
|
2014-08-06 09:56:07 +08:00 |
minggo
|
e43b05955f
|
Merge pull request #7674 from darkdukey/patch-12
Fix opacity for Slider
|
2014-08-06 09:50:47 +08:00 |
minggo
|
16653bf24e
|
Merge pull request #7675 from darkdukey/chore/reuse-file-utils-for-video-path
Chore/reuse file utils for video path
|
2014-08-06 09:41:28 +08:00 |
Nite Luo
|
0a2afe983c
|
Fix spacing
|
2014-08-05 17:56:55 -07:00 |
Nite Luo
|
9f34a5c0f2
|
Fix build for ios
|
2014-08-05 17:53:15 -07:00 |
Nite Luo
|
ac20f51f7b
|
Fix formatting
|
2014-08-05 16:53:00 -07:00 |
Nite Luo
|
e0855d64df
|
Merge branch 'v3' into patch-12
Conflicts:
cocos/ui/UISlider.cpp
|
2014-08-05 16:51:02 -07:00 |
samuele3hu
|
0daa30419b
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module
Conflicts:
cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_auto_api.lua
cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp
cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp
cocos/scripting/lua-bindings/auto/lua_cocos2dx_extension_auto.hpp
tools/tolua/cocos2dx.ini
|
2014-08-06 00:37:19 +08:00 |
samuele3hu
|
6f763917a7
|
Delte liblua project for win32 and adjust cocos2d-win32 project
|
2014-08-06 00:26:02 +08:00 |
samuele3hu
|
4d4d5374df
|
Delete Android.mk for cocos_lua_static
|
2014-08-06 00:18:56 +08:00 |
samuele3hu
|
99c52f0102
|
Split module for Linux on Lua and adjust related test cases
|
2014-08-06 00:15:44 +08:00 |
samuele3hu
|
d86a37110d
|
Split module for win32 and adjust related test cases
|
2014-08-05 19:46:13 +08:00 |
Huabing.Xu
|
7353f036db
|
Merge branch 'v3' into v3_addNewAttribFlag
|
2014-08-05 15:23:14 +08:00 |
Huabing.Xu
|
7fbd81aeca
|
add NORMAL, BLEND_WEIGHT, BLEND_INDEX flag to be correspondent to GLProgram::VertexAttrib
|
2014-08-05 15:15:17 +08:00 |
minggo
|
1bad9ddbc2
|
Merge pull request #7657 from huangshiwu/v3_wp8glviewhookpr
V3 wp8glviewhookpr
|
2014-08-05 13:51:15 +08:00 |
CocosRobot
|
24da61e443
|
[AUTO]: updating luabinding automatically
|
2014-08-05 05:35:12 +00:00 |
minggo
|
cd98034f16
|
Merge pull request #7631 from maltium/v3
added 3D rotation support to the RotateTo action
|
2014-08-05 13:30:43 +08:00 |
samuele3hu
|
da18657f4f
|
Add module Android.mk config and adjust related test cases
|
2014-08-05 13:29:54 +08:00 |
CocosRobot
|
f3e2ebf215
|
[AUTO]: updating luabinding automatically
|
2014-08-05 03:57:51 +00:00 |
CocosRobot
|
8dd1be5172
|
[AUTO]: updating luabinding automatically
|
2014-08-05 02:05:02 +00:00 |
minggo
|
cc75a8e860
|
Merge pull request #7632 from super626/v3
SubMesh and AttachMement
|
2014-08-05 09:59:38 +08:00 |
minggo
|
6d09b00e1d
|
Merge pull request #7649 from andyque/fixPotentialCarshWhenRemoveSelfInCallback
fix potential crash when user remove self in widgets callback
|
2014-08-05 09:46:00 +08:00 |
minggo
|
34a0603a52
|
Merge pull request #7658 from andyque/fixButtonOpacityIssue
fix scale9Sprite anchorPoint bug when switch anchor point and scale9Enabled
|
2014-08-05 09:39:13 +08:00 |
minggo
|
007e42faa0
|
Merge pull request #7616 from gin0606/fix_videoPlayer_ios_memory_leak
Fix iOS VideoPlayer memory leak.
|
2014-08-05 09:30:52 +08:00 |
andyque
|
f44906d56c
|
fix scale9Sprite anchorPoint bug when switch anchor point and scale9Enabled property
|
2014-08-05 08:11:37 +08:00 |
huangshiwu
|
9c87522199
|
little more modefy
|
2014-08-04 17:34:50 +08:00 |
samuele3hu
|
cd0c82f8b7
|
Split deprecated class, functions and enums to related module and adjust iOS/Mac test case and templates
|
2014-08-04 17:11:57 +08:00 |
huangshiwu
|
9a3f231771
|
merge v3 into v3_wp8glviewhookpr
|
2014-08-04 16:49:42 +08:00 |
minggo
|
93ee009366
|
Merge pull request #7656 from zii/v3
希望加入一个简单获得绝对时间的方法, 包装了gettimeofday.
|
2014-08-04 16:30:41 +08:00 |
yangxiao
|
8ffd0fe16e
|
spelling error
|
2014-08-04 16:07:16 +08:00 |
yangxiao
|
4084fdc461
|
add new file to cmake
|
2014-08-04 15:49:12 +08:00 |
yangxiao
|
11a13ce9e2
|
Merge branch 'newcode' into v3
|
2014-08-04 15:41:21 +08:00 |
minggo
|
5deb273486
|
Merge pull request #7644 from 2youyouo2/v3
update ActionTimeline
|
2014-08-04 15:35:35 +08:00 |
samuele3hu
|
e5f9c1b488
|
Adjust common script and related test cases
|
2014-08-04 15:22:07 +08:00 |
zii
|
20c43e5684
|
Update ccUtils.h
|
2014-08-04 15:21:10 +08:00 |
zii
|
7659a1623f
|
Update ccUtils.h
|
2014-08-04 15:20:45 +08:00 |
zii
|
e151795c43
|
Update ccUtils.cpp
|
2014-08-04 15:18:01 +08:00 |
yangxiao
|
47838ce945
|
reset
|
2014-08-04 14:37:26 +08:00 |
yangxiao
|
01e0192a2d
|
reset
|
2014-08-04 14:29:55 +08:00 |