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

33037 Commits

Author SHA1 Message Date
XiaoYang 09c086dc10 Merge pull request #368 from songchengjiang/motionstreak3d 
add CC_DLL
 2015-09-02 15:59:34 +08:00
songchengjiang addce6c565 add CC_DLL 2015-09-02 15:55:58 +08:00
zhangbin cc2dd7b225 Add Particle3D tests. 2015-09-02 14:31:35 +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
zhangbin c664756dbe Add particle tests. 2015-09-02 11:21:17 +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
yangxiao 5cabc592e0 add motionstreak3d to cocos2d header 2015-09-01 11:34:35 +08:00
WenhaiLin 5fdb041856 Use string::empty() to check whether string is empty. 2015-09-01 11:26:09 +08:00
yangxiao c23805889f add motionstreak3d 2015-09-01 11:02:22 +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
yangxiao 8499400514 motionstreak3d test demo 2015-09-01 10:39:31 +08:00
yangxiao b6c4f4cf50 add comment 2015-09-01 10:39:14 +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
Jeff Wang 426061dffd Merge pull request #2 from zilongshanren/testEditBoxWin32 
keep synced with zilongshanren-test branch
 2015-08-31 23:56:28 +08:00
WenhaiLin a3b5becb45 Sync v3.8 to v3 2015-08-31 22:05:37 +08:00
andyque 367a105a48 refactor EditBox iOS&Android implementation 
Fixed issue: https://github.com/cocos2d/cocos2d-x/issues/13616#issuecomment-135742727
 2015-08-31 18:36:27 +08:00
yangxiao 030ab8858d enable depth write for transparent object 2015-08-31 18:34:09 +08:00
XiaoFeng 4cd3683e5b Use solution path as root path 2015-08-31 18:14:38 +08:00
zhangbin 013ed60c15 Add node children tests. 2015-08-31 17:40:26 +08:00
pandamicro 0c94e48248 Merge pull request #13631 from geron-cn/v3.8 
fix bug: bone can be see by other cameras
 2015-08-31 17:36:17 +08:00
WenhaiLin df383de894 This is a small optimization about TextReader. 2015-08-31 17:06:11 +08:00
zhangbin 46427bec59 Write the test data with json format. 2015-08-31 16:57:46 +08:00
XiaoFeng be2be30162 Fix missing config.json notice when simulator start to run a cocostudio project 2015-08-31 16:16:10 +08:00
geron-cn e7c7b248d6 fix bug: bone can be see by other cameras 2015-08-31 16:04:17 +08:00
zhangbin 351dee8c22 Optimize the implementation of Alloc Test. 2015-08-31 15:08:36 +08:00
pandamicro 4ad78778a8 Merge pull request #13630 from pandamicro/release-note 
[ci skip]Update engine versions
 2015-08-31 13:53:02 +08:00
pandamicro 8f6f5c1191 Update engine versions 2015-08-31 13:52:15 +08:00
pandamicro d174a2a60e Merge pull request #13619 from super626/v3.8 
fix render state
 2015-08-31 13:39:05 +08:00
pandamicro c1da4eb893 Merge pull request #13629 from natural-law/v3.8 
Update the reference of submodule cocos2d-console.
 2015-08-31 13:37:50 +08:00
zhangbin 2520e16cc0 Update the reference of submodule cocos2d-console. 2015-08-31 12:04:18 +08:00
zhangbin 0e0213b121 Add logic for auto test the test cases. 2015-08-31 11:42:48 +08:00
frranck 8e195723e6 Update CCImage.cpp 
When you're creating a sprite (e.g. with Sprite* Sprite::create(filename))
There's no way to test the file before, without getting "a unsupport image format!" thrown.
 2015-08-30 09:40:15 +02:00