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

32339 Commits

Author SHA1 Message Date
子龙山人 75882e64a0 Merge pull request #13646 from neokim/refactor_scrollview_inertia_scroll 
Refactor scroll view's inertia scroll
 2015-09-07 22:38:20 +08:00
子龙山人 aec82b97a3 Merge pull request #13708 from natural-law/v3 
Update the reference of submodule cocos2d-console.
 2015-09-07 17:39:09 +08:00
zhangbin d145416e1f Update the reference of submodule cocos2d-console. 2015-09-07 17:36:54 +08:00
pandamicro 00abec6c2c Merge pull request #13707 from pandamicro/fix_layerrgba 
[ci skip] Fix compile error in __LayerRGBA
 2015-09-07 17:27:46 +08:00
TheCodez d77045818c Fix compile error in __LayerRGBA 2015-09-07 17:25:56 +08:00
WenhaiLin e500b960f3 AudioEngine:Fixed audio can not resume if it is interrupted cause by an incoming phone call. 2015-09-07 16:29:57 +08:00
pandamicro 0eee625788 Merge pull request #13697 from pabitrapadhy/patch-1 
Updated spelling and grammar mistakes
 2015-09-07 15:02:27 +08:00
pandamicro 4fb34ba190 Merge pull request #13703 from cocos2d/v3.8 
Sync v3.8 to v3
 2015-09-07 14:56:37 +08:00
子龙山人 0da3d83a6a Merge pull request #13698 from WenhaiLin/v3-rename-AVAudioPlayer 
Rename AVAudioPlayer to CCAudioPlayer for avoid conflicting with system framework.
 2015-09-07 13:40:16 +08:00
pandamicro 12ff8cd2dd Merge pull request #13702 from pandamicro/v3.8 
[ci skip] Update COCOS2D_VERSION
 2015-09-07 11:45:46 +08:00
pandamicro 2739be06bb Update COCOS2D_VERSION 2015-09-07 11:45:04 +08:00
WenhaiLin 42b24a9c5b Rename AVAudioPlayer to CCAudioPlayer for avoid conflicting with system framework 2015-09-07 11:12:13 +08:00
Pabitra Padhy d4c60144f0 Updated spelling and grammar mistakes 2015-09-06 15:29:36 +05:30
pandamicro b31b9213ea Merge pull request #13693 from pandamicro/v3.8 
[ci skip] Update release docs for v3.8 final
 2015-09-06 16:29:19 +08:00
pandamicro 08fc2dd36b Update release docs for v3.8 final 2015-09-06 16:28:44 +08:00
子龙山人 68b2689a4d Merge pull request #13691 from CocosRobot/update_cocosfiles_1441505141 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-09-06 10:22:59 +08:00
CocosRobot f427ae2f06 [AUTO][ci skip]: updating cocos2dx_files.json 2015-09-06 02:05:42 +00:00
子龙山人 f9eef5ceed Merge pull request #13636 from zilongshanren/refactorEditBox 
refactor EditBox iOS&Android implementation
 2015-09-06 10:03:54 +08:00
pandamicro 2dfd22dfef Merge pull request #13690 from pandamicro/v3.8 
[ci skip][JS] Add common APIs for compatibility with web engine
 2015-09-06 08:59:27 +08:00
pandamicro 86fb0fc3bc [JS] Add common APIs for compatibility with web engine 2015-09-06 08:57:43 +08:00
pandamicro 70d551a932 Merge pull request #13683 from MSOpenTech/v3-winrt 
update libcococs2d name to v3.9 for WinRT platforms
 2015-09-06 08:14:05 +08:00
Dale Stammen 030157ded0 update libcococs2d name to v3.9 for WinRT platforms 2015-09-04 08:46:08 -07:00
pandamicro f9c20caa67 Merge pull request #13603 from perminovVS/correct-key-code 
Desktop and WinRT use correct keyboard codes
 2015-09-04 14:39:44 +08:00
子龙山人 7fb36b4c9c Update Jenkins build status icon link 2015-09-04 09:43:45 +08:00
pandamicro ab5b634976 Merge pull request #13625 from frranck/patch-4 
Update CCImage.cpp
 2015-09-03 00:10:16 +08:00
andyque c0f40ad4a5 fix Android EditBox font size issue 2015-09-02 18:25:30 +08:00
pandamicro 0f2a528129 Merge pull request #13663 from linguofeng/patch-1 
lua add UPDATE_FAILED ERROR_DECOMPRESS
 2015-09-02 18:24:51 +08:00
子龙山人 c92a308b68 Merge pull request #13665 from WenhaiLin/v3-link-resource-fix 
[ci skip]js-template-default:Fixed the path of link resources.
 2015-09-02 13:55:12 +08:00
WenhaiLin be60f7f65c [ci skip]js-template-default:Fixed the path of link resources. 2015-09-02 13:48:57 +08:00
linguofeng 7fc382055b lua add UPDATE_FAILED ERROR_DECOMPRESS 
add
cc.EventAssetsManagerEx.EventCode.UPDATE_FAILED
cc.EventAssetsManagerEx.EventCode.ERROR_DECOMPRESS
 2015-09-02 11:27:47 +08:00
pandamicro 150db941da Merge pull request #13650 from ZhangMenghe/v3-testcases 
[ci skip] Remove clickAndMove testcase
 2015-09-02 09:08:16 +08:00
子龙山人 4530043d9b Merge pull request #13649 from WenhaiLin/v3-string-empty-check 
Use string::empty() to check whether string is empty.
 2015-09-01 18:04:41 +08:00
pandamicro d1845efdb2 Merge pull request #13653 from natural-law/v3.8 
[ci skip] Update the version displayed in about dialog of windows simulator.
 2015-09-01 18:03:12 +08:00
zhangbin 2c6c35cb76 Update the version displayed in about dialog of windows simulator. 2015-09-01 18:00:50 +08:00
ZhangMenghe f3190206e0 Remove clickAndMove testcase 2015-09-01 14:21:08 +08:00
Neo Kim 3656ce99bd Fix an issue regarding non-bouncing scroll view 2015-09-01 15:13:18 +09:00
pandamicro 91769c3feb Merge pull request #13632 from xiaofeng11/v3.8 
Fix missing config.json notice when simulator start to run a cocostudio project
 2015-09-01 12:57:40 +08:00
WenhaiLin 5fdb041856 Use string::empty() to check whether string is empty. 2015-09-01 11:26:09 +08:00
Neo Kim 129f4b3186 Implement the inertia scroll using auto scroll feature. Consolidate them into one. 2015-09-01 11:52:05 +09:00
Neo Kim ecd947d9f4 Change auto scroll feature to receive callbacks to remove dependencies. 2015-09-01 11:45:42 +09:00
Neo Kim 137a05a2aa Rectify the wrong indentations in switch statements 2015-09-01 11:45:42 +09:00
Neo Kim 69d23eb00c Extract the touch move speed calculation logic from inertia concept. 2015-09-01 11:45:42 +09:00
Neo Kim 81795f6d73 Add a guard statement in setInnerContainerPosition(). 2015-09-01 11:45:42 +09:00
Neo Kim 96a78f687c Remove redundant codes 2015-09-01 11:45:42 +09:00
子龙山人 2e9e660cbb Merge pull request #13220 from zilongshanren/testEditBoxWin32 
Improved EditBox implement for platform win32
 2015-09-01 10:40:11 +08:00
pandamicro 7f04a191c7 Merge pull request #13635 from super626/v3.8 
Enable depth write for transparent object
 2015-09-01 10:30:50 +08:00
pandamicro 3be083680a Merge pull request #13639 from WenhaiLin/v3.9-beta0 
Sync v3.8 to v3
 2015-09-01 09:49:43 +08:00
子龙山人 ca2ee10e2d Merge pull request #26 from wohaaitinciu/v3-remote 
revert to the original state when user cancel input
 2015-09-01 09:47:24 +08:00
子龙山人 59c1b21d0b Merge pull request #13634 from WenhaiLin/v3.8-textreader-refine 
This is a small optimization about TextReader.
 2015-09-01 09:40:52 +08:00
Jeff Wang b8105349c7 revert to the original state when user cancel input 2015-09-01 00:06:18 +08:00