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

32060 Commits

Author SHA1 Message Date
子龙山人 a4a1a62886 Merge pull request #13328 from zilongshanren/fix-ios-Appcontroller 
remove unneeded protocol in AppController.h.
 2015-08-13 10:35:00 +08:00
WenhaiLin c06994de34 Label:Fixed display incorrect if label content is changed after invoking `getLetter(letterIndex)` 2015-08-13 10:29:58 +08:00
andyque d9645b63c7 fix checkbox Luabindings issue. 
https://github.com/cocos2d/cocos2d-x/issues/13080
 2015-08-13 10:04:16 +08:00
VisualSj 1458e06492 [js-tests] Optimization Cocosbuilder test 2015-08-13 10:03:10 +08:00
minggo 423a6c921d Merge pull request #13337 from CocosRobot/update_cocosfiles_1439374876 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-08-13 09:37:38 +08:00
minggo bc964e8314 Merge pull request #13335 from pandamicro/v3 
Upgrade Spine runtime
 2015-08-12 18:46:59 +08:00
minggo 591f661cd2 Merge pull request #13338 from VisualSJ/v3-updateIndex 
[ci skip] Update web index
 2015-08-12 18:31:06 +08:00
VisualSj 62fe8f0248 Update web index 2015-08-12 18:28:10 +08:00
CocosRobot b5aaf4039e [AUTO][ci skip]: updating cocos2dx_files.json 2015-08-12 10:21:18 +00:00
子龙山人 38b1da2c06 Merge pull request #13315 from ZhangMenghe/v3-touchInter 
[ci skip]Add testcase to issue3053
 2015-08-12 18:20:23 +08:00
子龙山人 986cce2872 Merge pull request #13316 from ZhangMenghe/v3-cameraOrbit 
[ci skip] Fix camera orbit testcase
 2015-08-12 18:19:09 +08:00
子龙山人 da9b894494 Merge pull request #13336 from zilongshanren/v3 
[ci skip]merge v3.7.1 back to v3.
 2015-08-12 18:12:25 +08:00
andyque 68a90743c7 Sync PR: https://github.com/cocos2d/cocos2d-x/pull/13303 2015-08-12 18:09:32 +08:00
子龙山人 033a3cba81 Merge pull request #13329 from CocosRobot/update_cocosfiles_1439359141 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-08-12 18:09:11 +08:00
pandamicro cb143963ce Upgrade Spine runtime 2015-08-12 18:07:28 +08:00
子龙山人 a84553ae17 Merge pull request #13311 from WenhaiLin/v3-audio-crashfix 
AudioEngine:Fixed possible crash on iOS/Mac.
 2015-08-12 18:02:00 +08:00
andyque 82f597ce98 Merge branch 'v3.7.1' into v3 
# Conflicts:
#	cocos/scripting/lua-bindings/auto/api/CheckBox.lua
#	cocos/ui/UICheckBox.cpp
#	cocos/ui/UICheckBox.h
 2015-08-12 17:59:50 +08:00
子龙山人 cdda478aea Merge pull request #13332 from fusijie/fix_retro_pos 
fixed retro pos.
 2015-08-12 15:34:18 +08:00
fusijie bed3640e6c fixed retro pos. 2015-08-12 15:09:33 +08:00
子龙山人 86d674030e Merge pull request #13307 from fusijie/fix_cocostudio_skin_flip 
fix cocostudio skin setfliped.
 2015-08-12 14:34:46 +08:00
pandamicro 58b8da9ccb Merge pull request #13293 from jianglong0156/fixJstestsReleaseError 
fix js-tests can't use cocos run -p web -m release
 2015-08-12 14:24:15 +08:00
minggo 76c89c9398 Merge pull request #13331 from minggo/v3.7.1 
[ci skip]add some pictures and gif for release note
 2015-08-12 14:20:03 +08:00
子龙山人 b9187dde82 Merge pull request #13330 from CocosRobot/update_cocosfiles_1439359174 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-08-12 14:19:06 +08:00
minggo f40a0c14d5 add some pictures and gif for release note 2015-08-12 14:18:19 +08:00
CocosRobot 6c6a792295 [AUTO][ci skip]: updating cocos2dx_files.json 2015-08-12 05:59:36 +00:00
CocosRobot cb331915ce [AUTO][ci skip]: updating cocos2dx_files.json 2015-08-12 05:59:02 +00:00
子龙山人 f78ebf5843 Merge pull request #13312 from super626/animate3d 
Modify CCLOG to cocos2d::log
 2015-08-12 13:57:31 +08:00
子龙山人 be1d3ccc67 Merge pull request #13324 from zilongshanren/fix-editbox-soft-keyboard-backissue 
fix ui::TextField status error.
 2015-08-12 13:57:10 +08:00
andyque 9a83ed9b28 remove unneeded protocol in AppController.h. 2015-08-12 13:55:36 +08:00
minggo 37ad4f3c6f Merge pull request #13327 from pandamicro/v3.7.1 
[ci skip]Update release docs for v3.7.1
 2015-08-12 13:46:47 +08:00
子龙山人 675d5efb39 Merge pull request #13151 from flashjay/patch-2 
Update AppController.h
 2015-08-12 13:43:39 +08:00
子龙山人 25d4f9fccc Merge pull request #13326 from yangws/bug_22060 
fix bug: #22060 cpp-tests Scheduler -> Pause/Resume All User test cas…
 2015-08-12 13:34:32 +08:00
pandamicro 6f010f5316 Update release docs for v3.7.1 2015-08-12 13:02:35 +08:00
Vincent Yang 9159b21c9a fix bug: #22060 cpp-tests Scheduler -> Pause/Resume All User test case not correct. 2015-08-12 11:37:15 +08:00
子龙山人 0f99e09adb Merge pull request #13325 from jianglong0156/fixTextField 
textfield not create, don't need open ime.
 2015-08-12 11:26:31 +08:00
jianglong0156 fc5e2233e9 textfield not create, don't need open ime. 2015-08-12 11:22:36 +08:00
andyque 763976d50c fix ui::TextField status error. 
1. Refactoring Cocos2dxEditText to reuse Cocos2dxEditBox.

2. Reorder the event handling in ui::TextField.
 2015-08-12 11:05:07 +08:00
pandamicro 3d65700400 Merge pull request #13295 from fusijie/refine_testcase_retro_pos 
fix retro effect pos bug.
 2015-08-12 10:45:14 +08:00
pandamicro dfc17edb27 Merge pull request #13291 from dabingnn/v3_FixShaderTestCrash 
fix shader test crash on android device
 2015-08-12 10:40:14 +08:00
pandamicro dbd0b6dd86 Merge pull request #13272 from yangws/bug_21800 
fixed bug #21800 [CppTest]Node: Scene3D when player outof terrain app…
 2015-08-12 10:25:30 +08:00
ZhangMenghe fc7dc66c05 Change to non-background 2015-08-12 10:09:11 +08:00
pandamicro 6f4ed8a67b Merge pull request #13317 from CocosRobot/update_lua_bindings_1439279877 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-08-11 22:06:57 +08:00
Wenhai Lin b46000287e AudioEngine:Fixed crash cause by multiple threads access into a shared unsynchronized data.[iOS/Mac] 2015-08-11 18:11:59 +08:00
CocosRobot ef41cb27ca [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-08-11 08:02:58 +00:00
子龙山人 5fb0135bc2 Merge pull request #13297 from yangws/bug_21861 
Fix bug: #21861 cpp-tests->Node:Sprite->Testing Sprite BatchNode's ef…
 2015-08-11 15:55:26 +08:00
子龙山人 f3f67a10f9 Merge pull request #13232 from perminovVS/v3-dev-get-file-extension 
Add getFileExtension to FileUtils
 2015-08-11 15:54:55 +08:00
子龙山人 65c4261cc6 Merge pull request #13301 from yangws/bug_21906 
fix bug: #21906 Pause/Resume 's result not correct.
 2015-08-11 15:54:02 +08:00
ZhangMenghe 417652cbbd Fix camera orbit testcase 2015-08-11 15:13:11 +08:00
子龙山人 9174017ae8 Merge pull request #13313 from zilongshanren/fix-editbox-soft-keyboard-backissue 
Fix EditBox turning black when soft keyboard hide.
 2015-08-11 14:39:26 +08:00
子龙山人 aba3d40a52 Merge pull request #13309 from jianglong0156/improvetestcase 
[ci skip]Improve test case
 2015-08-11 14:38:58 +08:00