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

31094 Commits

Author SHA1 Message Date
pandamicro ecf7148f85 Merge pull request #12624 from WenhaiLin/v3.8 
AudioEngine:Fixed play audio may fail when switch to new scene on iOS.
 2015-07-02 18:47:44 +08:00
pandamicro e7c6ae7b13 Merge pull request #12637 from super626/skybox 
Set Texturecube tex parameter to clamp to edge
 2015-07-02 18:34:38 +08:00
子龙山人 91a8872cbd Merge pull request #12647 from xiaofeng11/v3.7-release 
UISlider update
 2015-07-02 18:01:38 +08:00
pandamicro dbd72d0123 Merge pull request #12646 from VisualSJ/v3.7-release 
[ci skip] Fixed a bug that is don't analytical frame
 2015-07-02 17:22:13 +08:00
pandamicro 831b3ce564 Merge pull request #12649 from natural-law/v3.7-release 
[ci skip] Not compile the scripts when generating simulator.
 2015-07-02 17:17:18 +08:00
Bin Zhang c713708e4d Not compile the scripts when generating simulator. 2015-07-02 17:13:35 +08:00
子龙山人 5b971ee93d Merge pull request #12607 from neokim/add_radio_button_and_group 
Add RadioButton and RadioButtonGroup widgets
 2015-07-02 17:12:59 +08:00
XiaoFeng 668dc50e07 Fix when slider set to disable mode then clean slider ball disable texture, normal texture won't show 2015-07-02 16:45:17 +08:00
WenhaiLin a28ad6939d Fixed EventListenerKeyboard.onKeyPressed not firing for back button on Android. 2015-07-02 16:19:33 +08:00
pandamicro d155d42c0e Merge pull request #12617 from yangws/issue_8194 
Fixbug :EventDispatcher wrong dispatch order
 2015-07-02 14:42:30 +08:00
pandamicro 95916709ee Merge pull request #12641 from natural-law/v3.7-release 
Update framework-compile tools & simulator.
 2015-07-02 14:39:31 +08:00
Bin Zhang 7ffb5edc27 Update the bundle version when generating simulator. 2015-07-02 14:37:42 +08:00
Sijie.Wang 7818bfcc7a Fixed a bug that is don't analytical frame 2015-07-02 14:30:44 +08:00
Neo Kim 61df7bc827 Add class documentation 2015-07-02 15:20:06 +09:00
Neo Kim ec589c8d6f Correct the wrong comment for lua 2015-07-02 15:19:50 +09:00
Neo Kim 0e35ee597a Add logic for not belonging radio button checking. 2015-07-02 15:01:24 +09:00
pandamicro 079ccbb0e2 Merge pull request #12639 from VisualSJ/v3.7-release 
Fixed a bug that is LayoutComponent position error
 2015-07-02 13:58:15 +08:00
子龙山人 ae90b35026 Merge pull request #12636 from xiaofeng11/v3.7-release 
CheckBox bug fix
 2015-07-02 13:44:54 +08:00
Bin Zhang e24975f0fe Add python script for generate cocos simulator. 2015-07-02 13:43:52 +08:00
pandamicro 05ff8db328 Merge pull request #12640 from pandamicro/v3.7-release 
[ci skip] Fix video player and web view in js template
 2015-07-02 13:42:56 +08:00
VisualSJ a475caf35a Fixed a bug that is LayoutComponent position error 2015-07-02 11:52:31 +08:00
pandamicro 613fde6573 Fix video player and web view in js template 2015-07-02 11:48:13 +08:00
Neo Kim c4aa5a6274 Remove the code related to becoming parent node of radio buttons. Radio button group is not a parent node of radio buttons anymore. 2015-07-02 11:50:50 +09:00
Neo Kim 6550a9ccc2 Replace all tabs to 4 spaces to comply with the convention 2015-07-02 11:30:14 +09:00
XiaoFeng 9a905ede56 Fix check box front cross texture expand to normal size when change status between normal and disable frequency 2015-07-02 10:29:53 +08:00
Neo Kim 4b2bff4674 Change RadioButtonGroup not to be a node-parent of radio buttons but just a grouping node. And add one more test case. 2015-07-02 11:28:14 +09:00
Vincent Yang 7794bc9d46 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_scene3dtest 2015-07-02 10:27:55 +08:00
Vincent Yang 46d25a45a0 Merge branch 'v3_scene3d_fixspineani' into v3_scene3dtest 2015-07-02 10:27:25 +08:00
pandamicro 740346335f Merge pull request #12620 from yangws/v3_scene3dtest 
Fix bug: wrong usage of function isVisiableByVisitingCamera, which should only effect draw call.
 2015-07-02 10:14:26 +08:00
子龙山人 2673e102df Merge pull request #12631 from CocosRobot/update_lua_bindings_1435759611 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-07-02 09:40:23 +08:00
XiaoYang d08a3d42b5 Merge pull request #357 from songchengjiang/skybox 
texture set GL_CLAMP_TO_EDGE
 2015-07-02 08:56:05 +08:00
Neo Kim 47e11b0635 Merge pull request #2 from andyque/fixAddRadioButton 
fix jsb bindings error
 2015-07-01 23:25:20 +09:00
CocosRobot bf3c970534 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-01 14:12:18 +00:00
pandamicro bebce270a7 Merge pull request #12630 from pandamicro/v3.7-release 
Fix cc.isArray for JSB
 2015-07-01 21:59:04 +08:00
pandamicro 3b9fd5502e Fix cc.isArray for JSB 2015-07-01 21:57:39 +08:00
zhang 48c3466774 Update LayerEx.lua 2015-07-01 20:25:45 +08:00
pandamicro 8fa43089f3 Merge pull request #12629 from pandamicro/v3.7-release 
Refine release docs for Cocos2d-x v3.7rc0
 2015-07-01 19:19:13 +08:00
pandamicro 33c5b9b102 Refine release docs for Cocos2d-x v3.7rc0 2015-07-01 19:17:38 +08:00
pandamicro a95edbfb65 Merge pull request #12618 from super626/clippingnode2 
Sprite3D Clipping
 2015-07-01 18:56:16 +08:00
pandamicro 6b730b5fbd Merge pull request #12619 from WenhaiLin/v3-37-labelfix 
Label:Fixed the top of character's texture may be tailored if enable outline effect.
 2015-07-01 18:55:04 +08:00
pandamicro d6181d16a1 Merge pull request #12627 from pandamicro/v3.7-release 
[ci skip] Release docs for Cocos2d-x v3.7rc0
 2015-07-01 18:47:58 +08:00
pandamicro 992ea8ac4b Release docs for Cocos2d-x v3.7rc0 2015-07-01 18:44:15 +08:00
andyque dce583db93 fix jsb bindings error 2015-07-01 18:28:22 +08:00
songchengjiang da5e077b55 texture set GL_CLAMP_TO_EDGE 2015-07-01 18:06:17 +08:00
Neo Kim a3cbd13402 Update the resource sub module reference 2015-07-01 18:44:59 +09:00
子龙山人 b70d4ad009 Merge pull request #12625 from CocosRobot/update_cocosfiles_1435742557 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-07-01 17:31:29 +08:00
子龙山人 8f7098e2c8 Merge pull request #12611 from andyque/add-project-template-to-jenkins 
finish template daily build.
 2015-07-01 17:26:12 +08:00
Bin Zhang 8d928e60c8 Update the version displayed in simulator about dialog. 2015-07-01 17:23:34 +08:00
CocosRobot c3693b8948 [AUTO][ci skip]: updating cocos2dx_files.json 2015-07-01 09:22:38 +00:00
子龙山人 1f90b87fa4 Merge pull request #12623 from andyque/fix-mac-32bit-tiff-include 
[ci skip]fix tiff 32bit include error in mac
 2015-07-01 17:20:05 +08:00