minggo
|
bfc9f6ba78
|
Merge pull request #7355 from CocosRobot/update_lua_bindings_1404884403
[AUTO]: updating luabinding automatically
|
2014-07-09 16:03:27 +08:00 |
kaile.yin
|
c53cb42e83
|
fixed Armature blend func effect
|
2014-07-09 14:25:51 +08:00 |
yangxiao
|
dbea3a4d04
|
deprecated functions
|
2014-07-09 14:07:33 +08:00 |
CocosRobot
|
ae12030745
|
[AUTO]: updating luabinding automatically
|
2014-07-09 05:42:06 +00:00 |
minggo
|
3c59cdaf1c
|
Merge pull request #7354 from boyu0/update_tolua_ini
Skip class Sprite3DMaterialCache in lua binding.
|
2014-07-09 13:36:54 +08:00 |
boyu0
|
8f6e05bbf5
|
Skip class Sprite3DMaterialCache in lua binding.
|
2014-07-09 12:59:01 +08:00 |
yangxiao
|
0c28106b48
|
init playreverse
|
2014-07-09 09:59:18 +08:00 |
yangxiao
|
7b35f36ba3
|
Merge branch 'newcode' into v3
|
2014-07-09 09:56:23 +08:00 |
yangxiao
|
90b6841e25
|
adjust api according feedback
|
2014-07-09 09:53:15 +08:00 |
minggo
|
a25a54d162
|
Merge pull request #7350 from chengstory/v3_fixesWarning
1、fixes warning.
|
2014-07-09 09:32:13 +08:00 |
zhangcheng
|
af0613cf32
|
1、fixes warning.
|
2014-07-09 00:09:35 +08:00 |
minggo
|
fc515428bf
|
[ci skip]
|
2014-07-08 22:19:54 +08:00 |
minggo
|
0f7968de89
|
Merge pull request #7339 from super626/v3
fix android, add 3d files to cocos2d.h and remove unused resources
|
2014-07-08 22:09:50 +08:00 |
minggo
|
3e658216da
|
[ci skip]
|
2014-07-08 22:08:28 +08:00 |
minggo
|
f7af8938bd
|
Merge pull request #7277 from darkdukey/fix_rotation3D
Fix setRotation3D
|
2014-07-08 22:05:27 +08:00 |
minggo
|
08027a65a7
|
[ci skip]
|
2014-07-08 21:21:26 +08:00 |
minggo
|
eba1735d04
|
Merge pull request #7347 from Dhilan007/v3-memory-leak
fixed memory leak cause by singleton.
|
2014-07-08 21:13:56 +08:00 |
minggo
|
c2474ea7c0
|
Merge pull request #7262 from pandamicro/origin_v3
Indicate correct button and cursor position infomation in mouse move event
|
2014-07-08 21:07:09 +08:00 |
minggo
|
81e6fdabba
|
[ci skip]
|
2014-07-08 20:38:58 +08:00 |
minggo
|
de1533190e
|
[ci skip]
|
2014-07-08 20:37:38 +08:00 |
minggo
|
08ac5a691a
|
Merge pull request #7337 from chareice/patch-1
Make Setup.py Support for zsh.
|
2014-07-08 20:35:34 +08:00 |
minggo
|
36ef5dd3e8
|
Merge pull request #7346 from CocosRobot/update_lua_bindings_1404813827
[AUTO]: updating luabinding automatically
|
2014-07-08 20:19:22 +08:00 |
minggo
|
211096816b
|
[ci skip]
|
2014-07-08 20:18:55 +08:00 |
minggo
|
4f42df3cea
|
Merge pull request #7336 from andyque/addMoreUITests
fix opacity issue when replace Widget textures
|
2014-07-08 20:15:21 +08:00 |
Dhilan007
|
10defddc2e
|
fixed memory leak cause by singleton.
|
2014-07-08 18:22:48 +08:00 |
CocosRobot
|
5838370b31
|
[AUTO]: updating luabinding automatically
|
2014-07-08 10:05:47 +00:00 |
minggo
|
2398f6b8f0
|
Merge pull request #7341 from samuele3hu/v3_3
Fix some type conversion error and add manual lua binding for Node::enumerateChildren
|
2014-07-08 18:00:23 +08:00 |
yangxiao
|
ae97d6ebc6
|
Bone conflict
|
2014-07-08 15:48:55 +08:00 |
minggo
|
ca59f663a5
|
[ci skip]
|
2014-07-08 15:31:48 +08:00 |
minggo
|
5ec2f76a68
|
Merge pull request #7340 from Dhilan007/v3-opacity-issue
fixed opacity issue in SpriteBatchNode.
|
2014-07-08 15:29:48 +08:00 |
minggo
|
0e5e2cbe5e
|
Merge pull request #7338 from Dhilan007/v3
fixed duplicate definition.
|
2014-07-08 15:29:02 +08:00 |
samuele3hu
|
bf3e0cb132
|
Update ini configure and bindings-generator submodule
|
2014-07-08 15:17:46 +08:00 |
samuele3hu
|
521f805219
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_VideoPlayer
Conflicts:
tests/lua-tests/src/mainMenu.lua
tools/bindings-generator
tools/tolua/cocos2dx_physics.ini
|
2014-07-08 14:57:19 +08:00 |
samuele3hu
|
f7c8674584
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3
|
2014-07-08 14:25:10 +08:00 |
samuele3hu
|
7095298735
|
Add manual lua binding for Node::enumerateChildren
|
2014-07-08 14:22:05 +08:00 |
Dhilan007
|
e31abe3f54
|
fixed opacity issue in SpriteBatchNode.
|
2014-07-08 14:08:53 +08:00 |
minggo
|
2d20b282a4
|
Merge pull request #7334 from dabingnn/v3_rollBackTexture
change the logic of texture loading
|
2014-07-08 13:52:16 +08:00 |
yangxiao
|
e9d3bc1b76
|
remove unused code
|
2014-07-08 13:36:22 +08:00 |
Dhilan007
|
7d924d2b64
|
fixed duplicate definition.
|
2014-07-08 12:50:47 +08:00 |
XiaoYang
|
79398f99c9
|
Merge pull request #49 from lvlonggame/v3
have two GL_UNSIGNED_INT delete one
|
2014-07-08 12:18:33 +08:00 |
lvlong
|
6de3309f90
|
have two GL_UNSIGNED_INT delete one
|
2014-07-08 20:13:57 +08:00 |
邵成磊
|
61b0ecbcdc
|
Make Setup.py Support for zsh.
When i use zsh for my default shell, `python setup.py` don't take the correct information for me.This change make it works.
|
2014-07-08 12:18:29 +08:00 |
samuele3hu
|
c59ba7851e
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3
|
2014-07-08 12:03:04 +08:00 |
samuele3hu
|
a1615123a3
|
Fix some type conversion error
|
2014-07-08 12:01:35 +08:00 |
andyque
|
2a2184331e
|
fix opacity issue when replace Widget textures
|
2014-07-08 11:30:27 +08:00 |
yangxiao
|
b19ca902ce
|
Merge branch 'newcode' into v3
|
2014-07-08 11:19:26 +08:00 |
yangxiao
|
75ee088631
|
resolve conflict Bone in cocos2d and cocostudio
|
2014-07-08 11:03:29 +08:00 |
yangxiao
|
61f4a4d6b3
|
add 3d file to cocos2d.h
|
2014-07-08 11:02:29 +08:00 |
minggo
|
74e7ed3c7d
|
[ci skip]
|
2014-07-08 11:02:22 +08:00 |
yangxiao
|
8b482fdfcd
|
remove gl_fixed
|
2014-07-08 11:02:00 +08:00 |