James Chen
|
7d2aed773d
|
Adds 'zip_file_size' section in 'external/config.json'
|
2014-05-07 17:25:42 +08:00 |
samuele3hu
|
8615e13c91
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix
|
2014-05-07 17:16:40 +08:00 |
zhangbin
|
ab4063a393
|
Update the reference of submodule plugin-x.
|
2014-05-07 17:04:08 +08:00 |
James Chen
|
385c62d5c4
|
updates repo_name to `cocos2d-x-3rd-party-libs-bin`
|
2014-05-07 16:49:55 +08:00 |
minggo
|
1cbe29071b
|
remove unneeded codes
|
2014-05-07 16:49:32 +08:00 |
James Chen
|
edcef656cc
|
Merge pull request #6599 from CocosRobot/update_lua_bindings_1399451378
[AUTO]: updating luabinding automatically
|
2014-05-07 16:39:41 +08:00 |
James Chen
|
56883e5e25
|
Merge pull request #6600 from dumganhar/objc-comments-fix
Comments fix in CCRenderTexture.h
|
2014-05-07 16:38:59 +08:00 |
James Chen
|
9862fab58f
|
Comments fix in CCRenderTexture.h
|
2014-05-07 16:37:21 +08:00 |
CocosRobot
|
36843196c5
|
[AUTO]: updating luabinding automatically
|
2014-05-07 08:30:46 +00:00 |
James Chen
|
c6fd98d5f1
|
Update CHANGELOG [ci skip]
|
2014-05-07 16:27:35 +08:00 |
James Chen
|
9fb38cb332
|
Merge pull request #6595 from samuele3hu/v3_lua_fix
close #5032: A potential crash bug of Lua binding for sp.SkeletonAnimation.setAnimation
|
2014-05-07 16:26:13 +08:00 |
James Chen
|
dc015df920
|
Delete external/version.txt, use external/version.json instead
|
2014-05-07 15:56:25 +08:00 |
James Chen
|
b57384080f
|
download-deps.py reads configuration from 'external/config.json'
|
2014-05-07 15:52:24 +08:00 |
James Chen
|
55555f64d1
|
Adds external/config.json for download-deps.py
|
2014-05-07 15:51:53 +08:00 |
yinkaile
|
ba5544b63d
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
|
2014-05-07 15:47:37 +08:00 |
James Chen
|
e4ad1f58f4
|
Removed external submodule in .gitmodules
|
2014-05-07 15:21:23 +08:00 |
James Chen
|
909b7569d8
|
download-deps.py supports to check 'external/version.json'
|
2014-05-07 15:08:10 +08:00 |
James Chen
|
a617680cae
|
Updates travis script
|
2014-05-07 15:06:20 +08:00 |
James Chen
|
87d8653343
|
Updates .gitignore, ignore version.json
|
2014-05-07 15:05:59 +08:00 |
minggo
|
564d81017f
|
Merge pull request #6598 from minggo/android-makefile
add some comment for dependences module in Android.mk to make it simple ...
|
2014-05-07 14:36:41 +08:00 |
minggo
|
21aa7058e3
|
:= -> +=
|
2014-05-07 14:35:43 +08:00 |
minggo
|
976ef3e2a4
|
add some comment for dependences module in Android.mk to make it simple to use other module
|
2014-05-07 14:31:05 +08:00 |
andyque
|
def0505ba7
|
closed #4861, refactor
|
2014-05-07 14:26:41 +08:00 |
andyque
|
1282252c25
|
closed #4861, refactor
|
2014-05-07 14:06:44 +08:00 |
James Chen
|
b76a6a5dda
|
updates travis-script.
|
2014-05-07 13:48:39 +08:00 |
James Chen
|
59051d2393
|
Updates .gitignore.
|
2014-05-07 13:48:35 +08:00 |
James Chen
|
7fbcf5cc67
|
Adds external/version.txt
|
2014-05-07 13:46:18 +08:00 |
James Chen
|
32b2b20a32
|
Re-adds box2d and chipmuck sources, we need to use prebuilt libraries for them too.
|
2014-05-07 13:40:39 +08:00 |
James Chen
|
014e515b8b
|
Delete external submodule, please use 'download-deps.py' instead.
|
2014-05-07 13:38:17 +08:00 |
James Chen
|
b49b9d673c
|
download-deps.py will unzip the download zip file.
Output more detail informations
|
2014-05-07 13:36:08 +08:00 |
andyque
|
8baa88e2e1
|
closed #4861, fixed temparory variable issue
|
2014-05-07 11:55:00 +08:00 |
andyque
|
657720e509
|
Merge remote-tracking branch 'upstream/v3' into focus3861
|
2014-05-07 11:42:09 +08:00 |
andyque
|
ef44b2687b
|
closed #4861, finished focus
|
2014-05-07 11:40:01 +08:00 |
cocoscodeide
|
04600227ae
|
Merge pull request #1 from chuanweizhang2013/v3luaruntime
V3luaruntime
|
2014-05-07 11:34:35 +08:00 |
cw
|
c9a7c44537
|
rename mac simulator app's file simulatorconfig class
|
2014-05-07 11:10:46 +08:00 |
samuele3hu
|
1f2c08e87d
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix
|
2014-05-07 11:08:34 +08:00 |
samuele3hu
|
3fb53e39ea
|
Update bindings-generator submodule
|
2014-05-07 11:06:58 +08:00 |
samuele3hu
|
f122f3894c
|
Update the bindings-generator
|
2014-05-07 10:52:49 +08:00 |
minggo
|
b766c6bdb5
|
Merge pull request #6596 from natural-law/v3
Export the `2d` include directory of engine on android.
|
2014-05-07 10:46:14 +08:00 |
zhangbin
|
9966d83c02
|
Export the `2d` include directory of engine on android.
|
2014-05-07 10:43:42 +08:00 |
samuele3hu
|
a0b60acf24
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix
|
2014-05-07 10:33:57 +08:00 |
andyque
|
ef70c684de
|
issue #4861, add requestFocus method and the layout current can get focus
|
2014-05-07 10:23:57 +08:00 |
samuele3hu
|
3c64f7cc44
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_lua_fix
|
2014-05-07 10:10:17 +08:00 |
samuele3hu
|
fb60b9f65a
|
issue #5032:A potential crash bug of Lua binding
|
2014-05-07 10:09:54 +08:00 |
andyque
|
62a66872aa
|
issue #4861, fixed some boundary conditions
|
2014-05-07 10:05:20 +08:00 |
Ricardo Quesada
|
db759005e0
|
Improvements for Attributes and Uniform API
|
2014-05-06 17:58:14 -07:00 |
Ricardo Quesada
|
21dd6fef69
|
Improves code a little bit
|
2014-05-06 12:46:35 -07:00 |
Trace
|
cf9e8ff0bd
|
Merge branch 'newV3' into improved_glprogram
Conflicts:
cocos/2d/CCGLProgram.cpp
cocos/2d/CCGLProgram.h
|
2014-05-06 12:07:42 -07:00 |
Trace
|
69fd841b30
|
fix the include error
|
2014-05-06 11:19:51 -07:00 |
Ricardo Quesada
|
720852681e
|
Adds license to VertexAttribBind
|
2014-05-06 11:15:40 -07:00 |