Nite Luo
|
11149cc92d
|
Change release note
|
2015-01-14 14:51:42 -08:00 |
Dale Stammen
|
ef816a1bb9
|
fixed handling of default font
|
2015-01-14 11:10:58 -08:00 |
Dale Stammen
|
32c14710e7
|
allow custom shaders for WinRT Universal App
|
2015-01-14 10:37:04 -08:00 |
CocosRobot
|
b2db3c13dd
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-01-14 15:39:55 +00:00 |
minggo
|
7958958cc0
|
Merge pull request #9960 from andyque/remove-box2d
put box2d cmakelist to external
|
2015-01-14 23:37:05 +08:00 |
minggo
|
1e7f204f2b
|
Merge pull request #10000 from yinjimmy/bugfix_runtime
add default `-workdir` for vs project
|
2015-01-14 23:35:27 +08:00 |
yinjimmy
|
49869847cc
|
add default `-workdir` for vs project
|
2015-01-14 18:45:18 +08:00 |
minggo
|
87b51278ec
|
Merge pull request #9998 from CocosRobot/update_cocosfiles_1421227858
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-01-14 17:32:13 +08:00 |
CocosRobot
|
b703c7b169
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-01-14 09:30:59 +00:00 |
minggo
|
4189a7696f
|
Merge pull request #9995 from CocosRobot/update_lua_bindings_1421227055
[AUTO]: updating luabinding automatically
|
2015-01-14 17:21:03 +08:00 |
CocosRobot
|
97aee8cef0
|
[AUTO]: updating luabinding automatically
|
2015-01-14 09:19:31 +00:00 |
minggo
|
e509d85237
|
Merge pull request #9994 from CocosRobot/update_lua_bindings_1421226821
[AUTO]: updating luabinding automatically
|
2015-01-14 17:17:01 +08:00 |
CocosRobot
|
6a9b56883b
|
[AUTO]: updating luabinding automatically
|
2015-01-14 09:16:01 +00:00 |
minggo
|
ec54e042ea
|
Merge pull request #9993 from zawasp/tintto_color3b
add Color3B type parameter to TintTo::create
|
2015-01-14 17:14:58 +08:00 |
minggo
|
fa7b6970e8
|
[ci skip] Update CHANGELOG
|
2015-01-14 17:09:14 +08:00 |
minggo
|
825f90564c
|
Merge pull request #9992 from samuele3hu/v3_4_issue9986
issue #9986:Add lua bindings for Component and related test cases
|
2015-01-14 17:05:51 +08:00 |
minggo
|
d8b5d0b84c
|
Merge pull request #9991 from Dhilan007/v3-physicsbody-posfix
Fixed can't get correct position of PhysicsBody after add PhysicsBody to PhysicsWorld in the current frame.
|
2015-01-14 17:05:22 +08:00 |
Mircea Rila
|
2a235f5b8d
|
add Color3B type parameter to TintTo::create
|
2015-01-14 11:04:23 +02:00 |
Wenhai Lin
|
b61adcfdbb
|
Fixed can't get correct position of PhysicsBody after add PhysicsBody to PhysicsWorld in the current frame.
|
2015-01-14 17:01:04 +08:00 |
samuele3hu
|
77912270f9
|
issue #9986:Add lua bindings for Component and related test cases
|
2015-01-14 16:58:35 +08:00 |
minggo
|
c13a9741fc
|
Merge pull request #9990 from CocosRobot/update_cocosfiles_1421225139
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-01-14 16:58:00 +08:00 |
CocosRobot
|
88029d33bd
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-01-14 08:45:40 +00:00 |
minggo
|
4454951e12
|
Merge pull request #9967 from yinjimmy/combine
Combine lua templates
|
2015-01-14 16:42:58 +08:00 |
yinjimmy
|
f2ab171fab
|
Merge branch 'v3' into combine
|
2015-01-14 16:38:06 +08:00 |
minggo
|
8a67b9b368
|
Merge pull request #9989 from CocosRobot/update_lua_bindings_1421223864
[AUTO]: updating luabinding automatically
|
2015-01-14 16:30:40 +08:00 |
minggo
|
1a121b4633
|
[ci skip] Update CHANGELOG
|
2015-01-14 16:29:37 +08:00 |
yinjimmy
|
a80e26f680
|
cleanup
|
2015-01-14 16:27:29 +08:00 |
CocosRobot
|
e69497c7c0
|
[AUTO]: updating luabinding automatically
|
2015-01-14 08:26:14 +00:00 |
minggo
|
d19df76217
|
Merge pull request #9987 from CocosRobot/update_cocosfiles_1421223133
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-01-14 16:13:21 +08:00 |
CocosRobot
|
29d85ca8c2
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-01-14 08:12:14 +00:00 |
minggo
|
1641c92721
|
Merge pull request #9983 from samuele3hu/v3_4_issue9820
issue #9820:Inconsistent :setBlendFunc(...) function binding for Sprite and LabelBMFont classes
|
2015-01-14 16:11:43 +08:00 |
minggo
|
5154b844bb
|
Merge pull request #9985 from super626/frustum
enable disable culling using macro
|
2015-01-14 16:11:28 +08:00 |
minggo
|
6acfd612cd
|
Merge pull request #9984 from andyque/fixlinuxCompile
[ci skip]fix linux compile
|
2015-01-14 16:11:10 +08:00 |
minggo
|
1e2029598d
|
Merge pull request #9936 from Dhilan007/v3-cocosplay
Integrate CocosPlayClient
|
2015-01-14 16:10:20 +08:00 |
WenhaiLin
|
553cf58312
|
Remove FileUtilsAndroid::purgeCachedEntries
|
2015-01-14 16:05:33 +08:00 |
minggo
|
d57ba984be
|
Merge pull request #9979 from geron-cn/inneractionframe
inneractionframe rename variables
|
2015-01-14 15:15:51 +08:00 |
samuele3hu
|
c026aa82f9
|
Add CC_DEPRECATED_ATTRIBUTE flag
|
2015-01-14 15:09:37 +08:00 |
yinjimmy
|
bd3c250a6d
|
add proj.linux support
|
2015-01-14 14:44:48 +08:00 |
andyque
|
b44f422f4d
|
remove glfw2
|
2015-01-14 14:43:01 +08:00 |
yangxiao
|
42c40d895f
|
enable disable culling using macro
|
2015-01-14 14:41:10 +08:00 |
owen
|
d57509aea9
|
fix linux compile
|
2015-01-13 22:22:08 -08:00 |
Huabing.Xu
|
6850c7497b
|
Merge pull request #9981 from huangshiwu/v3_ioshttp
fix HttpAsynConnection method didReciveResponse's process error
|
2015-01-14 14:07:31 +08:00 |
huangshiwu
|
12212dc572
|
fix HttpAsynConnection method didReciveResponse's process error
|
2015-01-14 14:01:58 +08:00 |
Huabing.Xu
|
9039592423
|
[ci skip] update changelog
|
2015-01-14 14:01:44 +08:00 |
samuele3hu
|
951324a230
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_4_issue9820
Conflicts:
cocos/scripting/lua-bindings/manual/3d/lua_cocos2dx_3d_manual.cpp
|
2015-01-14 13:58:12 +08:00 |
andyque
|
64098a1f84
|
update external library version number
|
2015-01-14 13:54:57 +08:00 |
samuele3hu
|
1d5350e648
|
Update bindings-generator submodule
|
2015-01-14 13:51:33 +08:00 |
samuele3hu
|
1d94ae4302
|
issue #9820:Inconsistent :setBlendFunc(...) function binding for Sprite and LabelBMFont classes
|
2015-01-14 13:51:09 +08:00 |
minggo
|
d742e7345f
|
Merge pull request #9972 from dabingnn/v3_AddOptionsForCulling
add macro to enable to disable culling
|
2015-01-14 13:38:27 +08:00 |
geron-cn
|
ab2b86b392
|
rename variables
|
2015-01-14 13:02:30 +08:00 |