Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
21,763 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

21763 Commits

Author SHA1 Message Date
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
minggo 92e113a602 [ci skip] 2014-07-08 10:59:50 +08:00
minggo b0d260d293 Merge pull request #7027 from zhouxiaoxiaoxujian/improvement/COC-9 
Fix UITextField IME can't auto detach
 2014-07-08 10:56:16 +08:00
minggo 4ef666ef8b Merge pull request #7335 from Dhilan007/v3-labelttf-color 
fixed can's set color for LabelTTF correctly on IOS.
 2014-07-08 10:54:40 +08:00
minggo aca498b06f [ci skip] 2014-07-08 10:53:07 +08:00
Dhilan007 6e2caf1c78 fixed can's set color for LabelTTF correctly on IOS. 2014-07-08 10:31:14 +08:00
minggo b583684d61 Merge pull request #7332 from 2youyouo2/v3 
fixed set color to parent, it will effect its children
 2014-07-08 10:26:58 +08:00
minggo bf1ec7d463 Merge pull request #7333 from natural-law/v3 
Add configuration in templates to set the bundle identity of Mac & iOS project.
 2014-07-08 10:25:15 +08:00
zhangbin d69050399b Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-07-08 10:23:07 +08:00
zhangbin af5cf0a33f Add configuration in templates to set the bundle identity of Mac & iOS project. 2014-07-08 10:22:08 +08:00
kaile.yin f01b249880 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-07-08 10:21:00 +08:00
kaile.yin d5a79f17ab fixed set color to parent, it will effect its children 2014-07-08 10:13:15 +08:00
Huabing.Xu 9fb85e303f change the logic of texture loading 2014-07-08 10:08:02 +08:00
minggo 3344ebbcdd Merge pull request #7267 from andyque/addBinaryFileTests 
add tests to GUI
 2014-07-08 09:51:17 +08:00
minggo e6a3238b80 Merge pull request #7330 from MSOpenTech/wp8-v3-fix 
WP8 v3 build fix
 2014-07-08 09:45:53 +08:00
Dale Stammen 021ee7d1e7 check if _itemsPerRow == 0 to avoid divide by zero 2014-07-07 11:17:05 -07:00
Dale Stammen fa62f4273f fixed missing zlib.h header path 2014-07-07 10:14:57 -07:00
XiaoYang b0f5ce36ff Merge pull request #48 from lvlonggame/v3 
delete the cube model file and modify 3DBundle
 2014-07-07 21:51:10 +08:00
minggo fd7f3dba4b [ci skip] 2014-07-07 19:59:41 +08:00
minggo e1b29a8ef6 Merge pull request #7329 from Dhilan007/v3-gc-refactor 
issue #4689:Fixed lose disconnected event and incorrect device name/id.
 2014-07-07 18:45:23 +08:00
Dhilan007 bbf0fead91 update API annotation. 2014-07-07 18:25:53 +08:00
Dhilan007 9cf01c0e47 update test case 2014-07-07 17:57:08 +08:00