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

25494 Commits

Author SHA1 Message Date
minggo c1d8db842f Merge pull request #8759 from dabingnn/v3_updateLicense 
update license for spine
 2014-10-16 19:59:03 +08:00
Huabing.Xu 71b0a707d1 update license for spine 2014-10-16 19:56:45 +08:00
minggo cbfe2b586f [ci skip] Update CHANGELOG 2014-10-16 19:38:43 +08:00
minggo 883230d9d8 Merge pull request #8758 from dabingnn/v3_fixVBOFullTest 
change vbo full test
 2014-10-16 19:36:01 +08:00
minggo 34cfcb0b54 Merge pull request #8690 from dabingnn/v3_spriteLamp 
sprite lamp
 2014-10-16 19:33:57 +08:00
minggo 8bf00bd4e6 Merge pull request #8748 from super626/cameraoperation 
Modify camera operation
 2014-10-16 19:29:55 +08:00
minggo a92f485d71 Merge pull request #8754 from zawasp/decrease-logging-verbosity 
decrease logging verbosity - CCFileUtils-android
 2014-10-16 19:28:20 +08:00
pipu 20cb663746 Delete the blank block 2014-10-16 19:02:39 +08:00
minggo 10d1c8a2c4 Merge pull request #8756 from CocosRobot/update_cocosfiles_1413454610 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-10-16 18:38:03 +08:00
Huabing.Xu a655a883f1 change vbo full test 2014-10-16 18:30:01 +08:00
CocosRobot 6f79cbd64c [AUTO][ci skip]: updating cocos2dx_files.json 2014-10-16 10:16:52 +00:00
minggo e23dd5825d Merge pull request #8750 from CocosRobot/update_lua_bindings_1413453179 
[AUTO]: updating luabinding automatically
 2014-10-16 18:15:44 +08:00
minggo df788c0ca9 Merge pull request #8749 from CocosRobot/update_cocosfiles_1413453088 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-10-16 18:15:20 +08:00
kaile.yin 7faf2fe1e6 set tag for ActionTimeline 2014-10-16 18:14:58 +08:00
Mircea Rila 0678601f61 decrease logging verbosity - CCFileUtils-android 2014-10-16 13:03:39 +03:00
CocosRobot 4a084a4ebc [AUTO]: updating luabinding automatically 2014-10-16 09:55:07 +00:00
CocosRobot f50989fa79 [AUTO][ci skip]: updating cocos2dx_files.json 2014-10-16 09:51:29 +00:00
minggo 064f0d9042 Merge pull request #8708 from dabingnn/v3_updateSpine 
V3 update spine
 2014-10-16 17:50:07 +08:00
minggo dc44887a81 Merge pull request #8745 from CocosRobot/update_cocosfiles_1413451546 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-10-16 17:49:36 +08:00
pipu 7cb2629baa Delete annotate code of all Reader files 2014-10-16 17:44:22 +08:00
yangxiao 1ed38334d9 remove unused variables 2014-10-16 17:44:04 +08:00
yangxiao f13fdb5162 adjust 2014-10-16 17:40:41 +08:00
yangxiao f5400b74a5 adjust 2014-10-16 17:38:42 +08:00
yangxiao e5dedf062a adjust 2014-10-16 17:37:05 +08:00
yangxiao 8e6728d8c0 change camera operation 2014-10-16 17:31:18 +08:00
CocosRobot ec067b15ac [AUTO][ci skip]: updating cocos2dx_files.json 2014-10-16 09:25:47 +00:00
minggo 9b2fe14337 Merge pull request #8744 from CocosRobot/update_lua_bindings_1413449574 
[AUTO]: updating luabinding automatically
 2014-10-16 17:23:07 +08:00
CocosRobot c4985c45e4 [AUTO]: updating luabinding automatically 2014-10-16 08:55:11 +00:00
minggo 0787a228d0 Merge pull request #8739 from huangshiwu/v3_iphone6hires 
Add Default-667h@2x and Default-737h@3x launch images to support iPhone6...
 2014-10-16 16:48:39 +08:00
Huabing.Xu 644aa19b2d Merge branch 'v3' into v3_updateSpine 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
 2014-10-16 16:48:16 +08:00
andyque f3f15c58fe remove UIWebView.cpp in win32 2014-10-16 16:46:49 +08:00
minggo 8c06d6b981 Merge pull request #8737 from samuele3hu/v3_rc_fix 
Update the related cocosstudio lua test cases and lua-bindings
 2014-10-16 16:28:31 +08:00
minggo ed92e247f8 Merge pull request #8727 from CocosRobot/update_cocosfiles_1413432972 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-10-16 16:27:54 +08:00
pipu 85bbcdd537 Deleting original code that parsing "Visible" 2014-10-16 16:26:46 +08:00
minggo 08c1f58398 Merge pull request #8740 from natural-law/v3 
Solve the error effect of lua runtime template on iOS.
 2014-10-16 16:22:23 +08:00
zhangbin a7cb5f74e6 Solve the error effect on iOS. 2014-10-16 16:19:50 +08:00
samuele3hu 8b5f6ae52a Merge branch 'v3_updateSpine' of https://github.com/dabingnn/cocos2d-x into v3_new_spine 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
 2014-10-16 16:04:09 +08:00
minggo a4d31262ac Merge pull request #8735 from dabingnn/v3_OptimizeQuadCommand 
V3 optimize quad command
 2014-10-16 16:01:37 +08:00
pipu e77f7f02b0 Modify Reader: 
1. Parsing "FlipX", "FlipY", "AnchorPoint".
2. Parsing "VisibleForFrame" instead of "Visible"
 2014-10-16 15:55:38 +08:00
samuele3hu 3ba1289710 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_rc_fix 2014-10-16 15:54:41 +08:00
huangshiwu 0a04da0a10 Add Default-667h@2x and Default-737h@3x launch images to support iPhone6 and iPhone6+'s native resolution mode 2014-10-16 15:53:12 +08:00
samuele3hu b4c91f0712 Update the related cocosstudio lua test cases 2014-10-16 15:51:01 +08:00
minggo 04839b0e8f [ci skip]update version 2014-10-16 15:41:43 +08:00
minggo 41d280893f [ci skip] Update CHANGELOG 2014-10-16 15:40:34 +08:00
minggo 57068207ab [ci skip]update config.json 2014-10-16 15:35:42 +08:00
Huabing.Xu 97aa69a7c2 works on no VAO devices 2014-10-16 15:33:31 +08:00
Huabing.Xu 90030140d5 fix some format problem 2014-10-16 14:56:17 +08:00
Huabing.Xu 93ea1b9078 separate trianglesCommand and QuadCommand 2014-10-16 14:15:29 +08:00
minggo d72651828b Merge pull request #8729 from CocosRobot/update_cocosfiles_1413439331 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-10-16 14:03:02 +08:00
CocosRobot a6f0c1322c [AUTO][ci skip]: updating cocos2dx_files.json 2014-10-16 06:02:13 +00:00