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

30813 Commits

Author SHA1 Message Date
子龙山人 6005c42892 Merge pull request #12700 from CocosRobot/update_lua_bindings_1436178667 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-07-06 21:25:34 +08:00
CocosRobot a4bce56cca [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-06 10:37:24 +00:00
子龙山人 89d40c164e Merge pull request #12697 from jianglong0156/add-remove-key-api 
add UserDefault api deleteValueForKey
 2015-07-06 18:27:04 +08:00
子龙山人 06ea3dce20 Merge pull request #12696 from andyque/improve-template-dialy-build 
[ci skip]fix python syntax error
 2015-07-06 17:10:28 +08:00
andyque 92585d3a8e fix python syntax error 2015-07-06 17:09:55 +08:00
jianglong0156 6f3b977c1e add UserDefault api deleteValueForKey 2015-07-06 17:01:17 +08:00
子龙山人 b2c83b6038 Merge pull request #12695 from andyque/improve-template-dialy-build 
add framework daily build scripts
 2015-07-06 17:00:10 +08:00
andyque 881a388892 add framework daily build scripts 2015-07-06 16:43:37 +08:00
子龙山人 faab927f1b Merge pull request #12693 from CocosRobot/update_lua_bindings_1436170966 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-07-06 16:36:44 +08:00
CocosRobot ae860bd6ee [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-06 08:29:03 +00:00
子龙山人 17207f14e5 Merge pull request #12689 from fusijie/refine_setAnimationInterval 
Refine setAnimationInterval from double to float.
 2015-07-06 16:18:45 +08:00
Jacky 4499b60446 Refine setAnimationInterval from double to float. 2015-07-06 14:57:42 +08:00
子龙山人 731754ccea Merge pull request #12684 from neokim/fix_radio_button_clear_bug 
Fix radio button group clear issue
 2015-07-05 16:36:28 +08:00
Neo Kim 9548d85f08 Fix radio button group clear issue 2015-07-04 09:57:54 +09:00
pandamicro 7f6334a620 Merge pull request #12678 from CocosRobot/update_lua_bindings_1435934564 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-07-04 08:41:49 +08:00
CocosRobot fbf98adc7a [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-03 14:48:11 +00:00
pandamicro 38ded61568 Merge pull request #12670 from yangws/issue_8256 
Fixbug: CCTargetedAction executes callback twice.
 2015-07-03 22:34:54 +08:00
子龙山人 61c076eee9 Merge pull request #12677 from CocosRobot/update_lua_bindings_1435919557 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-07-03 18:37:59 +08:00
CocosRobot 91dc2d22de [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-03 10:37:33 +00:00
子龙山人 73586bb2c5 Merge pull request #12676 from CocosRobot/update_cocosfiles_1435919437 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-07-03 18:31:31 +08:00
CocosRobot 50703b262c [AUTO][ci skip]: updating cocos2dx_files.json 2015-07-03 10:30:38 +00:00
子龙山人 9865e00dba Merge pull request #12675 from andyque/fixJSBCompileError 
add v3 to travis build
 2015-07-03 18:28:52 +08:00
andyque 4704d38c13 add v3 to travis build 2015-07-03 18:27:42 +08:00
Vincent Yang ca02f167c6 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2015-07-03 15:43:58 +08:00
Vincent Yang 1abeb8bf1e Fixbug: CCTargetedAction executes callback twice. 2015-07-03 15:42:49 +08:00
pandamicro f126eb3267 Merge pull request #12644 from WenhaiLin/v3-38-backevent-fix 
Fixed EventListenerKeyboard.onKeyPressed not firing for back button on Android.
 2015-07-03 15:42:45 +08:00
子龙山人 5dd075368c Merge pull request #12669 from andyque/fix-template-daily-build 
[ci skip]fix runtime template compilation
 2015-07-03 15:40:27 +08:00
andyque 698f70f5b6 fix runtime template compilation 2015-07-03 15:38:53 +08:00
子龙山人 39eb7273db Merge pull request #12667 from andyque/fix-template-daily-build 
[ci skip]fix templates daily build issue
 2015-07-03 15:19:23 +08:00
andyque f37d4d226b fix templates daily build issue 2015-07-03 15:18:33 +08:00
pandamicro 99bad19cff Merge pull request #12660 from pandamicro/merge-v3.7 
Merge v3.7-release
 2015-07-03 11:08:50 +08:00
pandamicro 48c99d2ac4 Merge pull request #12635 from yangws/v3_scene3dtest 
Fix bug: spine animition can't show in Scene3DTest.
 2015-07-03 11:04:23 +08:00
pandamicro 1b22438792 Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into merge-v3.7 
Conflicts:
	cocos/ui/UICheckBox.cpp
 2015-07-03 10:23:49 +08:00
pandamicro 761ba4f7cb Merge pull request #12659 from natural-law/v3.7-release 
[ci skip] Solve the error when generating simulator on win32.
 2015-07-03 10:17:48 +08:00
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 e7aeb335a3 Merge pull request #12609 from alexpeak/fixCCLabelPurgeResetOrder 
Ensure CCLabel atlases are purged before resetting
 2015-07-02 19:01:50 +08:00
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