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

18200 Commits

Author SHA1 Message Date
boyu0 cb1c3ccd1a closed #4573: Set particle visible to false then set to true cause crashes. 
Because of the update order, _particleIdx may equal to zero.
 2014-03-27 16:47:21 +08:00
James Chen 10eee24b0f Merge pull request #6029 from natural-law/develop 
Add tools/bindings-generator & tools/tolua into the  lua template.
 2014-03-27 16:47:08 +08:00
James Chen 2945b6bd4a Merge pull request #6030 from CocosRobot/update_lua_bindings_1395909772 
[AUTO]: updating luabinding automatically
 2014-03-27 16:46:33 +08:00
James Chen 5beb2ee739 Update CHANGELOG [ci skip] 2014-03-27 16:44:58 +08:00
CocosRobot e5ff0912a7 [AUTO]: updating luabinding automatically 2014-03-27 08:43:46 +00:00
James Chen 2e3b6b62de Merge pull request #6028 from Dhilan007/develop_label 
closed #4494:: Easier for set texture parameters of label's cache textures.
 2014-03-27 16:40:12 +08:00
James Chen 1074d88da0 Merge pull request #6027 from CocosRobot/update_lua_bindings_1395905692 
[AUTO]: updating luabinding automatically
 2014-03-27 16:14:24 +08:00
zhangbin 0c82a4a3e0 Add tools/bindings-generator & tools/tolua into the lua project template. 2014-03-27 15:38:01 +08:00
Dhilan007 408107ff24 closed #4494::Easy to sets texture parameters of label's cache textures. 2014-03-27 15:35:51 +08:00
CocosRobot 8cec6b83d9 [AUTO]: updating luabinding automatically 2014-03-27 07:35:51 +00:00
James Chen b824aed1dc Update CHANGELOG [ci skip] 2014-03-27 15:21:52 +08:00
James Chen 44310fea18 Merge pull request #6019 from Dhilan007/develop_label 
closed #4569:Texture2D support for update partial texture
 2014-03-27 15:20:40 +08:00
Dhilan007 cac4e0bbbc closed #4569:Texture2D support for update partial texture 2014-03-27 15:11:04 +08:00
James Chen a8bb3d794a Merge pull request #6025 from CocosRobot/update_cocosfiles_1395903852 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-03-27 15:08:24 +08:00
CocosRobot b779ef0c27 [AUTO][ci skip]: updating cocos2dx_files.json 2014-03-27 07:04:13 +00:00
James Chen 91ca76515b Merge pull request #6024 from CocosRobot/update_lua_bindings_1395903260 
[AUTO]: updating luabinding automatically
 2014-03-27 14:56:05 +08:00
CocosRobot 7a3e40dd8e [AUTO]: updating luabinding automatically 2014-03-27 06:55:35 +00:00
James Chen c80fdaa54f Merge pull request #6020 from samuele3hu/develop_test 
Update the cocos2dx.ini for lua binding
 2014-03-27 14:40:56 +08:00
James Chen 1da2952c0a Merge pull request #6023 from lmskater/fix-generator-bindings-fail 
[Jenkins] Make build as failed when generating bindings fails
 2014-03-27 14:40:06 +08:00
James Chen c62144c350 Merge pull request #6022 from Dhilan007/develop_label4565 
closed #4565:fixed logical error in Label::setFontAtlas.
 2014-03-27 14:39:30 +08:00
lm edd14e6765 [Jenkins] Make build as failed when generating bindings fails 2014-03-27 14:28:40 +08:00
Dhilan007 8a8fa743eb closed #4565:fixed logical error in Label::setFontAtlas. 2014-03-27 14:28:32 +08:00
minggo 3aaf56f91f Merge pull request #6021 from andyque/fix_temp 
closed #102, add CC_CONSTRUCTOR_ACCESS to CCProtectedNode
 2014-03-27 14:27:49 +08:00
andyque 928e9def8d closed #102, add CC_CONSTRUCTOR_ACCESS to CCProtectedNode 2014-03-27 14:27:30 +08:00
samuele3hu a64f44d6b2 Add lua binding for `getOpenGLView` of `Director` 2014-03-27 14:16:20 +08:00
samuele3hu 7afa977ac3 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_test 2014-03-27 14:10:43 +08:00
samuele3hu 8b754c6257 Update coco2dx.ini for binding `ProtectedNode` class 2014-03-27 14:08:19 +08:00
James Chen 18ce311011 Merge pull request #6017 from CocosRobot/update_lua_bindings_1395899624 
[AUTO]: updating luabinding automatically
 2014-03-27 13:59:33 +08:00
CocosRobot 33d6b04fb4 [AUTO]: updating luabinding automatically 2014-03-27 05:55:07 +00:00
minggo e52fc981cc Merge pull request #5977 from dabingnn/develop_fixID_Android_bug 
Develop fix id android bug
 2014-03-27 13:49:53 +08:00
James Chen b028c29a7d Merge pull request #6016 from samuele3hu/develop_test 
Modify lua project setting and replace NativeActivity with Cocos2dActivity
 2014-03-27 11:29:55 +08:00
samuele3hu 6fbf1b4cdf Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_test 2014-03-27 11:21:20 +08:00
samuele3hu 06f4cb31b2 Replace NativeActivity with Cocos2dActivity and modify lua android project setting. 2014-03-27 11:18:13 +08:00
James Chen 6248e3330a Merge pull request #6015 from CocosRobot/update_lua_bindings_1395889786 
[AUTO]: updating luabinding automatically
 2014-03-27 11:13:59 +08:00
James Chen 6f425c96cb Merge pull request #6007 from Dhilan007/develop_testcase 
Remove the old implementation of LabelTTF in test case.
 2014-03-27 11:13:37 +08:00
CocosRobot b1859a4cac [AUTO]: updating luabinding automatically 2014-03-27 03:10:37 +00:00
James Chen aaab8881ae Merge pull request #6003 from pandamicro/LayerGradientCtor 
Fixed #4566: Constructor added for LayerGradient
 2014-03-27 11:06:49 +08:00
James Chen 3fd5039b97 Update CHANGELOG [ci skip] 2014-03-27 11:05:57 +08:00
pandamicro 751cf488f0 Merge pull request #6 from pandamicro/develop 
Fixed #4566: Fix bugs with LayerGradient constructor fix
 2014-03-27 11:05:26 +08:00
James Chen a3a0833401 Merge pull request #6014 from andyque/fix_issue4562 
closed #4562, Stopped music could also be resumed on iOS
 2014-03-27 11:04:05 +08:00
pandamicro f0bb69bc5f Revert "Reverse CONSTRUCTOR_ACCESS" 
This reverts commit 44d446ef1d.
 2014-03-27 10:59:47 +08:00
pandamicro cd9509947d Merge branch 'LayerGradientCtor' into develop 2014-03-27 10:59:29 +08:00
shujunqiao d38f873ecc Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into cocos-console-test 2014-03-27 10:56:29 +08:00
pandamicro 87384d8ffa Fixed #4566: Move LayerGradient's init functions into CC_CONSTRUCTOR_ACCESS section 2014-03-27 10:55:41 +08:00
James Chen 7616d8d8e5 Merge pull request #6013 from natural-law/develop 
Update the reference of submodule "cocos2d-console".
 2014-03-27 10:49:31 +08:00
andyque 26a04b38f2 closed #4562, fix audio resume bug after stop the music 2014-03-27 10:43:57 +08:00
pandamicro 6bdf4e9684 Merge branch 'LayerGradientCtor' into develop 2014-03-27 10:37:46 +08:00
pandamicro 87f9eb3217 Fixed #4566: Remove autorelease for create construct in LayerTest 2014-03-27 10:25:39 +08:00
pandamicro 413e0010f5 Fixed #4566: Fix LayerTest bug 2014-03-27 10:22:04 +08:00
pandamicro 2d5c295f99 Merge branch 'develop' into LayerGradientCtor 2014-03-27 10:14:57 +08:00