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

30874 Commits

Author SHA1 Message Date
Bin Zhang 558e9c3d61 Solve the error when generating simulator on win32. 2015-07-03 10:14:20 +08:00
子龙山人 7e0904a50b Merge pull request #12658 from andyque/update-config-json 
add config.json to 69
 2015-07-03 09:58:12 +08:00
andyque e92896cf4c add config.json to 69 2015-07-02 22:09:33 +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
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
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
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
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
子龙山人 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
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
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
songchengjiang da5e077b55 texture set GL_CLAMP_TO_EDGE 2015-07-01 18:06:17 +08: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
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
andyque df421f7734 fix tiff 32bit include error in mac 2015-07-01 17:18:19 +08:00
pandamicro 48cc900198 Merge pull request #12622 from natural-law/framework 
Add link libs config in simulator project for framework.
 2015-07-01 17:03:46 +08:00
Bin Zhang d0fc1e9d34 Add link libs config in simulator project for framework. 2015-07-01 15:31:03 +08:00
WenhaiLin 322bd30d7b Label:Fixed the top of character's texture may be tailored if enable outline effect. 2015-07-01 14:57:01 +08:00
yangxiao d35bf2305f add clipping test 2015-07-01 14:48:37 +08:00
yangxiao 52daa2234c add setForce2DQueue 2015-07-01 14:24:22 +08:00
yangxiao 269feeb1f9 remove stencil from Renderstate 2015-07-01 14:06:37 +08:00
pandamicro 168d56ff98 Merge pull request #12610 from natural-law/v3.7-release 
Remove the plugin-x related files from the Xcode project of js-bindings.
 2015-07-01 12:48:30 +08:00
子龙山人 d65900ea3d Merge pull request #12606 from natural-law/v3.7-release 
Optimize the implementation of framework-compile tools & simulator project.
 2015-07-01 09:32:43 +08:00
Bin Zhang d0db3aee98 Remove the plugin-x related files from the Xcode project of js-bindings . 2015-06-30 17:28:47 +08:00
Bin Zhang 0726b2be9c Generate prebuilt Android.mk when compiling prebuilt libs for android. 2015-06-30 16:53:11 +08:00
Bin Zhang 78c5f2e77e Build simulator project when generating prebuilt libs for android. 2015-06-30 16:45:55 +08:00
Bin Zhang bb77101f0b Solve the error when building simulator for android. 2015-06-30 16:45:13 +08:00
Bin Zhang 9b45a9ee6f Add preprocessor CC_ENABLE_BULLET_INTEGRATION=1 in simulator. 2015-06-30 16:14:25 +08:00
Bin Zhang a6a1cbdfbe Solve the error config of js runtime template. 2015-06-30 16:03:39 +08:00