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 |
David Partouche
|
118d4d39f0
|
Fixed the video player not showing on iOS if it's not in FullScreen mode
|
2014-08-05 16:07:28 +02:00 |
xiangxw
|
78587254a5
|
show error after a win32 lua program crashes
|
2014-08-05 21:10:30 +08:00 |
samuele3hu
|
d86a37110d
|
Split module for win32 and adjust related test cases
|
2014-08-05 19:46:13 +08:00 |
CocosRobot
|
eacb8fa120
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-08-05 10:23:15 +00:00 |
minggo
|
5ad45ecae9
|
Merge pull request #7670 from Wu-Hao/v3
fix readme spellings, added missing files guide for git user
|
2014-08-05 18:21:31 +08:00 |
Wu-Hao
|
ac8e5d3d57
|
Create missing tools?.txt
|
2014-08-05 18:08:50 +08:00 |
Wu-Hao
|
87aded5d15
|
missing file guide
|
2014-08-05 18:06:39 +08:00 |
Wu-Hao
|
43c63fde21
|
fix spellings
|
2014-08-05 18:03:21 +08:00 |
heliclei
|
5bd0e14b17
|
refine code
|
2014-08-05 18:01:09 +08:00 |
minggo
|
befe284027
|
Merge pull request #7664 from CocosRobot/update_cocosfiles_1407217954
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-08-05 16:45:08 +08:00 |
minggo
|
7ef775db1b
|
Merge pull request #7667 from CocosRobot/update_cocosfiles_1407227920
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-08-05 16:41:58 +08:00 |
CocosRobot
|
3a3cf0383d
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-08-05 08:38:41 +00:00 |
minggo
|
f172a86e22
|
Merge pull request #7665 from dabingnn/v3_addNewAttribFlag
V3 add new attrib flag
|
2014-08-05 16:37:18 +08:00 |
Mircea Rila
|
119ca86e3f
|
additional fixes for win32 project
|
2014-08-05 11:29:04 +03:00 |
heliclei
|
da3e7d80db
|
[jenkins][ci skip]use github access token to retrive commits
|
2014-08-05 16:22:01 +08:00 |
Mircea Rila
|
d808581d2b
|
fix win32 template project
|
2014-08-05 10:43:29 +03: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 |
Mircea Rila
|
5720df4336
|
add VS 2013 support for C++ template
|
2014-08-05 10:11:04 +03:00 |
CocosRobot
|
839bfb7d55
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-08-05 05:52:35 +00:00 |
minggo
|
1bad9ddbc2
|
Merge pull request #7657 from huangshiwu/v3_wp8glviewhookpr
V3 wp8glviewhookpr
|
2014-08-05 13:51:15 +08:00 |
minggo
|
3814fe5592
|
Merge pull request #7663 from CocosRobot/update_lua_bindings_1407216814
[AUTO]: updating luabinding automatically
|
2014-08-05 13:40:16 +08:00 |
CocosRobot
|
24da61e443
|
[AUTO]: updating luabinding automatically
|
2014-08-05 05:35:12 +00:00 |
minggo
|
6771ee10a5
|
[ci skip]
|
2014-08-05 13:34:41 +08:00 |
minggo
|
2ece4b90fb
|
[ci skip]
|
2014-08-05 13:32:55 +08: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 |
minggo
|
376d218ff8
|
Merge pull request #7662 from CocosRobot/update_lua_bindings_1407210952
[AUTO]: updating luabinding automatically
|
2014-08-05 11:58:36 +08:00 |
CocosRobot
|
f3e2ebf215
|
[AUTO]: updating luabinding automatically
|
2014-08-05 03:57:51 +00:00 |
minggo
|
99f9a0fb19
|
[ci skip]
|
2014-08-05 11:55:06 +08:00 |
minggo
|
0ff00ddbf7
|
[ci skip]
|
2014-08-05 11:53:37 +08:00 |
minggo
|
38e4ad0fbd
|
Merge pull request #7653 from takaken1994/feature/improve-extensions-scrollview
Update : added function for setting min/max scale
|
2014-08-05 11:52:22 +08:00 |
minggo
|
2f41f031fa
|
Merge pull request #7661 from CocosRobot/update_cocosfiles_1407204823
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-08-05 10:14:28 +08:00 |
CocosRobot
|
1772ab78ac
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-08-05 02:13:45 +00:00 |
minggo
|
06144bfc7a
|
Merge pull request #7660 from CocosRobot/update_lua_bindings_1407204158
[AUTO]: updating luabinding automatically
|
2014-08-05 10:12:33 +08:00 |
minggo
|
a6a90e4090
|
[ci skip]
|
2014-08-05 10:10:17 +08:00 |
CocosRobot
|
8dd1be5172
|
[AUTO]: updating luabinding automatically
|
2014-08-05 02:05:02 +00:00 |
minggo
|
326c76007a
|
Merge pull request #7659 from CocosRobot/update_cocosfiles_1407204055
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-08-05 10:02:07 +08:00 |
CocosRobot
|
0f3fbfa07f
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-08-05 02:00:57 +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
|
a42bbaebf9
|
[ci skip]
|
2014-08-05 09:35:13 +08:00 |
minggo
|
b6ceb507c0
|
[ci skip]
|
2014-08-05 09:33:37 +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 |