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

31357 Commits

Author SHA1 Message Date
Neo Kim f558158667 Use addProtectedChild() instead of addChild() in ScrollViewBar 2015-07-13 21:28:16 +09:00
pandamicro 765561ebc2 Merge pull request #12807 from CocosRobot/update_lua_bindings_1436778626 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-07-13 17:58:23 +08:00
子龙山人 fc41463e6e Merge pull request #12809 from CocosRobot/update_lua_bindings_1436779844 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-07-13 17:50:25 +08:00
CocosRobot 8b50c307e5 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-13 09:35:35 +00:00
pandamicro d559971379 Merge pull request #12808 from pandamicro/v3 
Fix CCSprite ; missing
 2015-07-13 17:27:27 +08:00
CocosRobot 697f21d3d1 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-13 09:15:10 +00:00
子龙山人 db71e073dd Merge pull request #12742 from WenhaiLin/v3-audioengine-preload 
AudioEngine:support preload for audio
 2015-07-13 17:06:17 +08:00
Vincent Yang e65b01bdc0 Merge pr11866: FileUtilsWin32 correct use all unicode version winapi. 2015-07-13 17:06:01 +08:00
pandamicro 36e1f26570 Fix CCSprite ; missing 2015-07-13 16:44:33 +08:00
yangxiao 8598c5037e fix #11487 animate3d bugs 2015-07-13 16:10:48 +08:00
WenhaiLin adfa6d4f0d Add test case for issue 12775 2015-07-13 15:38:33 +08:00
WenhaiLin 2ddc1ccf3e [ci skip]Update web index 2015-07-13 13:45:05 +08:00
ZhangMenghe aca7914d86 Modify testcase for page Turndown 2015-07-13 13:44:58 +08:00
WenhaiLin c95283f563 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-animation-getCurrentFrame 2015-07-13 12:54:02 +08:00
ZhangMenghe 3396da508f pageTurnDown in WebGL testCase 2015-07-13 12:45:07 +08:00
pandamicro 68b7e390c2 Merge pull request #12801 from natural-law/v3.7-release 
[ci skip] Update the reference of submodule cocos2d-console.
 2015-07-13 12:07:07 +08:00
Bin Zhang 75920b8e11 Update the reference of submodule cocos2d-console. 2015-07-13 12:05:17 +08:00
pandamicro d6c535b592 Merge pull request #12800 from WenhaiLin/v3-37-rollback-12299 
Rollback pr12299
 2015-07-13 11:40:01 +08:00
WenhaiLin 80dff7f1c4 Rollback pr12299 2015-07-13 11:32:25 +08:00
Vincent Yang e23275d3e3 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into issue_9586 2015-07-13 11:30:32 +08:00
pandamicro 67c731f587 Merge pull request #12798 from VisualSJ/v3.7-release-backup 
[ci skip] update web index
 2015-07-13 11:18:16 +08:00
VisualSj 38756fb44b update web index 2015-07-13 11:14:06 +08:00
pandamicro 89927c7073 Merge pull request #12782 from xiaofeng11/v3.7-release 
UISliderReader and component update
 2015-07-13 11:05:59 +08:00
pandamicro 8ab1dce2a0 Merge pull request #12778 from yangws/issue_9586 
Fix bug: FileUtils::isDirectoryExist not correct on Android when using relative path in 'assets'
 2015-07-13 11:03:24 +08:00
Vincent Yang 8bc68395de Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into issue_9586 2015-07-13 11:00:18 +08:00
WenhaiLin dee13756ec Add Animate:getCurrentFrameIndex 2015-07-13 10:40:43 +08:00
子龙山人 e3a9042236 Merge pull request #12785 from WenhaiLin/v3-update-nibirusdk 
Update Nibiru SDK.
 2015-07-13 10:34:18 +08:00
pandamicro c167e249cd Merge pull request #12790 from pandamicro/shaderNormal 
Use shader with normal while creating mesh with normals
 2015-07-12 21:47:05 +08:00
pandamicro 0d2200f3e3 Merge pull request #12791 from cocos2d/revert-12773-bind-missing-function 
Revert "add lua-binding of EventDispacher::dispatchCustomEvent()"
 2015-07-12 12:20:11 +08:00
pandamicro 15bb633adb Revert "add lua-binding of EventDispacher::dispatchCustomEvent()" 2015-07-12 20:19:52 +08:00
pandamicro 600568fdba Migrate test case from #10692 @babcca 2015-07-12 11:33:22 +08:00
pandamicro 0d9da2f500 Merge pull request #12773 from minggo/bind-missing-function 
add lua-binding of EventDispacher::dispatchCustomEvent()
 2015-07-11 17:17:32 +08:00
pandamicro 2e3d7cb1f5 Merge pull request #12779 from CocosRobot/update_lua_bindings_1436512627 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-07-11 17:14:13 +08:00
WenhaiLin 5c9e8848bf [ci skip]Add missing configuration for Nibiru. 2015-07-10 21:16:21 +08:00
WenhaiLin 205e77a4fb Add missing configuration for Nibiru. 2015-07-10 21:09:15 +08:00
WenhaiLin 142d354485 [ci skip]Replace tab with spaces. 2015-07-10 21:03:43 +08:00
WenhaiLin 7f3e0b2a8c [ci skip]Replace tab with spaces. 2015-07-10 20:56:21 +08:00
WenhaiLin b459940bb8 [ci skip]Replace tab with spaces. 2015-07-10 20:47:21 +08:00
WenhaiLin c68469a611 Update Nibiru SDK. 2015-07-10 20:42:05 +08:00
子龙山人 bb4a3d4c1e Merge pull request #12783 from CocosRobot/update_lua_bindings_1436519205 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-07-10 17:14:20 +08:00
CocosRobot 0e8a3f14f0 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-10 09:11:50 +00:00
子龙山人 a4ea35b0c7 Merge pull request #12781 from natural-law/v3.7-release 
[ci skip] Use msbuild to generating engine prebuilt libs on win32.
 2015-07-10 17:03:53 +08:00
子龙山人 3adecedcee Merge pull request #12776 from fusijie/refine_capture 
CaptureScreen save in thread.
 2015-07-10 17:03:18 +08:00
Bin Zhang 8ca9e10a22 Use msbuild to generating engine prebuilt libs on win32. 2015-07-10 17:01:08 +08:00
XiaoFeng 92d78efce0 Fix percentage setting won't effect when UISlider's background resource set to null 2015-07-10 17:00:16 +08:00
Vincent Yang 34aa7a0bb1 Remove unused variable. 2015-07-10 16:40:02 +08:00
Vincent Yang 1711a70869 Merge v3 branch. 2015-07-10 16:39:36 +08:00
Vincent Yang 187c72e2b9 [ci skip] replace tab with 4 space. 2015-07-10 16:17:34 +08:00
pandamicro c30ce38cb5 Merge pull request #12766 from super626/v3.7-release 
Set default 3d animation quality to low
 2015-07-10 15:35:22 +08:00
CocosRobot 2542b7c033 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-10 07:21:50 +00:00