chuanweizhang2013
|
ca6bff963d
|
fixed transfor file error which size is 0
|
2014-07-11 10:38:55 +08:00 |
Jason Xu
|
d94941243a
|
Fix build with -DCC_ENABLE_SCRIPT_BINDING=0 , it causes failed
|
2014-07-11 10:27:00 +08:00 |
Huabing.Xu
|
f5cffba6c9
|
change pure virtual function to virtual function in action series
remove unimplemented function to deprecated and give an empty implementation
add CC_DLL to Vec2
|
2014-07-11 10:19:49 +08:00 |
yangxiao
|
fd8541e32d
|
rename Bone to Bone3D
|
2014-07-11 10:17:36 +08:00 |
Dhilan007
|
900d4b36fc
|
Enabled nibiru\moga\ouya controller support.
|
2014-07-11 09:57:26 +08:00 |
minggo
|
7a4dfda868
|
Merge pull request #7390 from CocosRobot/update_cocosfiles_1405043017
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-07-11 09:49:13 +08:00 |
CocosRobot
|
463a2ab5ac
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-07-11 01:43:39 +00:00 |
minggo
|
e4042fbf0c
|
Merge pull request #7388 from CocosRobot/update_lua_bindings_1405001287
[AUTO]: updating luabinding automatically
|
2014-07-11 09:42:32 +08:00 |
samuele3hu
|
caae8392d4
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_controller
Conflicts:
build/cocos2d_tests.xcodeproj/project.pbxproj
cocos/scripting/lua-bindings/Android.mk
cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj/project.pbxproj
tools/tolua/genbindings.py
|
2014-07-10 22:42:09 +08:00 |
Dhilan007
|
dfbeb0fb63
|
Update Nibiru SDK and remove prompt box of install driver .
|
2014-07-10 22:33:58 +08:00 |
CocosRobot
|
c205bd0806
|
[AUTO]: updating luabinding automatically
|
2014-07-10 14:10:03 +00:00 |
minggo
|
c79dabce17
|
Merge pull request #7387 from CocosRobot/update_cocosfiles_1405001188
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-07-10 22:07:30 +08:00 |
minggo
|
337fc03f3a
|
[ci skip]
|
2014-07-10 22:06:29 +08:00 |
CocosRobot
|
e1559c4828
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-07-10 14:06:29 +00:00 |
minggo
|
e876065d3e
|
Merge pull request #7229 from samuele3hu/v3_VideoPlayer
Add VideoPlayer Lua bindings and update bindings-generator submodule
|
2014-07-10 22:04:46 +08:00 |
minggo
|
4895e6d54a
|
Merge pull request #7362 from geron-cn/chukongv3
Chukongv3
|
2014-07-10 21:17:19 +08:00 |
minggo
|
b30d758d09
|
Merge pull request #7383 from 2youyouo2/v3
fixed call Bone::setRotation has no effect
|
2014-07-10 21:16:48 +08:00 |
zhangcheng
|
a0ecae21c3
|
1. fixes TextReader load default font error.
|
2014-07-10 19:29:39 +08:00 |
minggo
|
e749a9a598
|
Merge pull request #7380 from huangshiwu/v3
change "const static" to "static const"
|
2014-07-10 18:31:09 +08:00 |
geron-cn
|
1c4cb78745
|
deal with null in string
|
2014-07-10 18:24:11 +08:00 |
joshuastray
|
7396f447a4
|
move initWithDuration to CC_CONSTRUCTOR_ACCESS
|
2014-07-10 17:56:20 +08:00 |
kaile.yin
|
04c63cc370
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
|
2014-07-10 17:51:02 +08:00 |
kaile.yin
|
42f2302866
|
fixed call Bone::setRotation has no effect
|
2014-07-10 17:50:38 +08:00 |
huangshiwu
|
2a65b7d98e
|
change "const static" to "static const"
|
2014-07-10 16:50:25 +08:00 |
andyque
|
f76f71eb5d
|
fix win32 & win8 compile error
|
2014-07-10 16:37:15 +08:00 |
andyque
|
eec40ff2a8
|
fix linux and android compile
|
2014-07-10 16:37:15 +08:00 |
andyque
|
6de47ea53a
|
update ccs-res and add custom ImageView and custom particle widget support
|
2014-07-10 16:37:15 +08:00 |
andyque
|
afe5e7527a
|
update cocostudio resource path
|
2014-07-10 16:37:15 +08:00 |
andyque
|
8b42eb4ce9
|
add Cocostudio 1.3,1.4, 1.5 ui tests
|
2014-07-10 16:37:15 +08:00 |
andyque
|
41ccd5e465
|
add v1.4 tests
|
2014-07-10 16:37:15 +08:00 |
andyque
|
937b0ab52a
|
add cocostudio parser test template
|
2014-07-10 16:37:15 +08:00 |
edwardzhou
|
814f45179e
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
|
2014-07-10 16:10:11 +08:00 |
edwardzhou
|
efde627f5b
|
no use JoinThread
|
2014-07-10 16:10:02 +08:00 |
minggo
|
d2bcf9e9d1
|
[ci skip]
|
2014-07-10 15:49:29 +08:00 |
minggo
|
831b0b332b
|
Merge pull request #7371 from minggo/enumerateChildren-fix
Node::enumerateChildren just searches from itself
|
2014-07-10 15:46:04 +08:00 |
minggo
|
c7856b21fd
|
Merge pull request #7366 from Dhilan007/v3-fixed-warn
fixed warn and replace NULL with nullptr.
|
2014-07-10 15:42:02 +08:00 |
joshuastray
|
30574af6c5
|
move JumoTo's copy constuctor and operator= to private
|
2014-07-10 14:30:08 +08:00 |
minggo
|
0ba3f6c1c9
|
Merge pull request #7376 from joshuastray/v3
use CC_CONSTRUCTOR_ACCESS to replace protected/private
|
2014-07-10 14:14:08 +08:00 |
joshuastray
|
6b22870e27
|
use CC_CONSTRUCTOR_ACCESS to replace protected
|
2014-07-10 14:00:23 +08:00 |
minggo
|
cdc02aea7c
|
Merge pull request #7368 from CocosRobot/update_lua_bindings_1404957724
[AUTO]: updating luabinding automatically
|
2014-07-10 13:54:21 +08:00 |
minggo
|
400aa2dec7
|
Merge pull request #7373 from super626/v3
use function with less parameter
|
2014-07-10 13:50:15 +08:00 |
gero
|
01e1508239
|
Merge pull request #3 from cocos2d/v3
merge V3
|
2014-07-10 11:33:59 +08:00 |
geron-cn
|
5b7852c5f6
|
update ccs-res hd csbs
|
2014-07-10 11:17:01 +08:00 |
minggo
|
316564d58a
|
Node::enumerateChildren just searches from itself
|
2014-07-10 11:07:39 +08:00 |
yangxiao
|
0b4c6b7f7a
|
comment
|
2014-07-10 11:05:48 +08:00 |
yangxiao
|
d7b88e86ff
|
add comment
|
2014-07-10 10:56:52 +08:00 |
yangxiao
|
ef1f6892e1
|
deprecated Mesh::create use less parameter ones instead
|
2014-07-10 10:54:37 +08:00 |
CocosRobot
|
af460a1530
|
[AUTO]: updating luabinding automatically
|
2014-07-10 02:03:40 +00:00 |
minggo
|
ddb72228d3
|
[ci skip]
|
2014-07-10 09:57:16 +08:00 |
minggo
|
345fb040e7
|
Merge pull request #7352 from super626/v3
adjust api according feedback
|
2014-07-10 09:53:27 +08:00 |