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

23008 Commits

Author SHA1 Message Date
samuele3hu a3e4402c5f Adjust cpp-template-default template 2014-08-22 13:50:28 +08:00
samuele3hu 1bda276392 Update android.mk for related cpp test cases 2014-08-22 13:49:54 +08:00
samuele3hu 2f60e610a2 Integrate libcocosdenshion,libcocos3d,libnetwork,libcocostudio and libextension into cocos2d on the iOS/Mac platform 2014-08-22 13:49:21 +08:00
samuele3hu 523dcdb6fb Update cocos2d android.mk 2014-08-22 13:43:18 +08:00
samuele3hu ada7fa23d3 Add CC_DLL for related network files 2014-08-22 13:42:46 +08:00
samuele3hu 700699a37f Modify MciPlayer.cpp to support Unicode 2014-08-22 13:41:48 +08:00
samuele3hu 1ed4c4eab8 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_new_module 2014-08-21 15:05:31 +08:00
minggo 0f624078ca Merge pull request #7836 from natural-law/v3 
Update the reference of submodule cocos2d-console.
 2014-08-21 14:14:42 +08:00
minggo 3e6726e307 Merge pull request #7837 from minggo/update-release-note 
update release note
 2014-08-21 14:13:27 +08:00
minggo 88b8af0a34 update release note 2014-08-21 14:11:43 +08:00
zhangbin 97a4258cd6 Update the reference of submodule cocos2d-console. 2014-08-21 14:10:36 +08:00
minggo c0d1bfca26 Merge pull request #7832 from Teivaz/v3 
Fixed WinRT project
 2014-08-21 13:37:03 +08:00
teivaz 312f57d7a6 - [WP8] Now replacing application display name with project name 2014-08-21 18:49:52 +03:00
teivaz aecdb832a2 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-08-21 13:48:05 +03:00
teivaz a70688dc96 + [WINRT] Inserted newly added files to cocos WIN RT project 2014-08-21 13:47:53 +03:00
minggo 2fc3be2720 [ci skip] 2014-08-21 10:33:57 +08:00
minggo dfc5fb4ea4 Merge pull request #7833 from Teivaz/v3_WP8 
! Set version to 3.3 (as it is no longer 3.2)
 2014-08-21 09:38:20 +08:00
teivaz 4697cb07e6 ! Set version to 3.3 (as it is no longer 3.2) 2014-08-21 18:04:46 +03:00
minggo f3b211351b Merge pull request #7830 from dabingnn/v3_addPrimitiveheadFie 
V3 add primitivehead fie
 2014-08-20 16:04:27 +08:00
minggo 1535c666fc Merge pull request #7829 from natural-law/v3 
Update the reference of submodule cocos2d-console.
 2014-08-20 14:53:36 +08:00
Huabing.Xu b5e5e2d8d5 add primitive head file to cocos2d.h 2014-08-20 14:48:50 +08:00
Huabing.Xu 22db2abcaf add != operator in Blendfunc 2014-08-20 14:21:13 +08:00
minggo 5ef8938217 [ci skip] 2014-08-20 13:45:08 +08:00
zhangbin 8034b5429e Update the reference of submodule cocos2d-console. 2014-08-20 13:45:01 +08:00
minggo b6ea46fbbe Merge pull request #7828 from CocosRobot/update_cocosfiles_1408513041 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-08-20 13:44:17 +08:00
minggo 6458a1fc6d [ci skip] 2014-08-20 13:37:23 +08:00
CocosRobot 9c2cbaf742 [AUTO][ci skip]: updating cocos2dx_files.json 2014-08-20 05:37:22 +00:00
minggo bbf5c56e83 Merge pull request #7827 from andyque/ccRandom 
add c++11 random library support
 2014-08-20 13:35:12 +08:00
andyque 34629f1014 fix windows & win8 & wp8 compile error 2014-08-20 12:02:12 +08:00
zhangbin 8f30a7eeff Update the reference of submodule cocos2d-console. 2014-08-20 11:41:58 +08:00
minggo 01165951de [ci skip] 2014-08-20 11:24:53 +08:00
minggo fa95bda629 [ci skip] 2014-08-20 11:23:50 +08:00
minggo d91dc842de Merge pull request #7822 from Teivaz/v3_WP8 
Added method for custom precompiled shader program loading in WP8
 2014-08-20 11:22:26 +08:00
teivaz 0e5a79d486 + [WP8] Added method for custom precompiled shader program loading 2014-08-20 12:02:16 +03:00
minggo 2c4fe854fb [ 2014-08-20 10:28:48 +08:00
minggo 84f2e248d1 Merge pull request #7823 from newnon/v3_Label_fix 
Label performance problem
 2014-08-20 10:28:01 +08:00
minggo 2fe45ec6cc [ci skip] 2014-08-20 10:26:53 +08:00
minggo 2b709f92bb Merge pull request #7816 from xiangxw/fix_sendPrompt 
fix sendPrompt()
 2014-08-20 10:25:30 +08:00
minggo 74fba21fc0 Merge pull request #7825 from 2youyouo2/v3 
remove cascade color for CorlorFrame
 2014-08-20 10:23:15 +08:00
minggo 41905cb4c0 Merge pull request #7818 from andyque/fixPageViewTouchBeganPositionIssue 
fix pageView touch location
 2014-08-20 10:11:59 +08:00
andyque 9a3c2dc6a4 Merge branch 'ccRandom' of https://github.com/gin0606/cocos2d-x into ccRandom 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
 2014-08-20 09:56:16 +08:00
minggo 83ccfa0faa [ci skip] 2014-08-20 09:50:39 +08:00
minggo eecaac3384 [ci skip] 2014-08-20 09:48:39 +08:00
minggo 2682efd119 Merge pull request #7824 from newnon/v3_setKeepScreenOn 
setKeepScreenOn method
 2014-08-20 09:46:36 +08:00
samuele3hu abf6a8b128 Update Xcode project configure 2014-08-19 22:54:57 +08:00
Sergey 055a143f9d Label performance problem 2014-08-19 15:02:09 +04:00
Sergey bfe6513706 setKeepScreenOn method 2014-08-19 15:00:58 +04:00
samuele3hu cddb6c9fbd Integrate all module into cocos2d on the iOS/Mac platform 2014-08-19 18:00:34 +08:00
minggo 18cc62d16d Merge pull request #7821 from Teivaz/v3 
[WP8] Fixed default search path
 2014-08-19 16:59:12 +08:00
teivaz 0e7ec265ee * [WP8] Fixed default search path: renamed "Assets\Resources" to "Assets\res" 2014-08-20 11:54:41 +03:00