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

1767 Commits

Author SHA1 Message Date
natural-law 987da86c01 Merge branch 'master' into iss411 
Conflicts:
	tests/test.win32/test.win32.vcproj
	tests/tests/controller.cpp
	tests/tests/tests.h
 2011-03-29 14:26:31 +08:00
minggo c686047f83 [android] fixed #422: multitouch for android 2011-03-29 14:20:05 +08:00
natural-law 334786c633 fixed #391,Add implement of CCNS on airplay. 2011-03-29 13:59:10 +08:00
natural-law edc33952be fixed #391,Add support on ios and airplay. 2011-03-29 12:50:25 +08:00
natural-law 5f7357bf09 fixed #391,CCSpriteFrameCache support *.plist files with format value is not 0. 2011-03-29 11:56:14 +08:00
yangws 041953151a issue #439 CCFileData and imageWithImageFile modified on win32. 2011-03-29 11:41:44 +08:00
natural-law 1991a65b0b Merge branch 'master' into iss391 
Conflicts:
	HelloWorld/ios/HelloWorld.xcodeproj/project.pbxproj
	cocos2dx/proj.win32/cocos2d-win32.vcproj
	cocos2dx/proj.wophone/Makefile.ARM
	cocos2dx/proj.wophone/cocos2d-wophone.vcproj
	template/xcode3/cocos2d-x_app/___PROJECTNAME___.xcodeproj/project.pbxproj
	template/xcode3/cocos2d-x_box2d_app/___PROJECTNAME___.xcodeproj/project.pbxproj
	template/xcode3/cocos2d-x_chipmunk_app/___PROJECTNAME___.xcodeproj/project.pbxproj
	tests/test.ios/test.xcodeproj/project.pbxproj
 2011-03-29 10:20:57 +08:00
walzer 6cc09aa4dc Merge branch '396' of https://github.com/yangws/cocos2d-x into yangws-396 2011-03-28 21:08:56 +08:00
yangws 6b66affbab fixed #396 wophone modified. 2011-03-28 17:20:39 +08:00
yangws a9f85a2daa issue #396 airplay modified. 2011-03-28 17:10:05 +08:00
natural-law e38d3a2277 Merge branch 'master' into iss434 
Conflicts:
	cocos2dx/platform/airplay/CCFileUtils_airplay.h
	template/xcode3/cocos2d-x_app/___PROJECTNAME___.xcodeproj/project.pbxproj
	template/xcode3/cocos2d-x_box2d_app/___PROJECTNAME___.xcodeproj/project.pbxproj
	template/xcode3/cocos2d-x_chipmunk_app/___PROJECTNAME___.xcodeproj/project.pbxproj
 2011-03-28 17:06:32 +08:00
natural-law ed2566e201 issue #434,Refactor class CCFileUtils on platform airplay. 2011-03-28 16:27:26 +08:00
yangws a5040e0ccb issue 396 ios modified. 2011-03-28 13:41:14 +08:00
yangws 814b66b089 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into 396 2011-03-28 11:11:50 +08:00
yangws dceff2d179 issue #396 android modified. 2011-03-28 11:09:49 +08:00
yangws 4b86cec4be issue #396 win32 modifyed. 2011-03-28 10:44:14 +08:00
walzer 2f573a784e fixed #435, CocosDenshion crashes at foreground/background switching 2011-03-27 22:17:18 +08:00
walzer 71873f3e75 fixed #437, xcode3 templates doesn't content CCSAXParser.cpp & .h 2011-03-27 21:25:30 +08:00
natural-law cee82fe9fa issue #434,refactor class CCFileUtils on android and ios. 2011-03-26 17:24:37 +08:00
walzer f568ad8487 issue #379, fix a bug caused by airplay port integration, which makes android port unable to load resources by zlib. 2011-03-26 14:09:42 +08:00
natural-law 28a940ab57 issue #434,refactor class CCFileUtils on win32 and wophone. 2011-03-26 13:52:33 +08:00
walzer 3029b66fbc Merge branch '417' of https://github.com/yangws/cocos2d-x into yangws-417 2011-03-26 13:35:53 +08:00
yangws 2015e468ca fixed #417 When mouse pressed， capture it in EGLView. 2011-03-26 11:34:18 +08:00
yangws cd6352adec add new files to vc2010 project. 2011-03-25 17:41:54 +08:00
walzer 2bd28bd2dd issue #390, add PerformanceTest into airplay port. But, oops, I cannot see anything in these test except "back to mainmenu". 2011-03-25 16:46:36 +08:00
walzer 326bc998da typo fixed, sorry :( 2011-03-25 16:13:18 +08:00
walzer 95d672a858 add copyright & author name for airplay port 2011-03-25 15:30:10 +08:00
walzer e4ae24a20c Merge branch 'yangws-430' 2011-03-25 14:25:52 +08:00
walzer 9c1d462275 Merge branch '430' of https://github.com/yangws/cocos2d-x into yangws-430 2011-03-25 14:23:05 +08:00
walzer 9b8bc8373b fixed #431, manually merge the WenSheng's work 2011-03-25 14:20:53 +08:00
walzer fa5e71916b issue #431, manually merge WenSheng's work 2011-03-25 14:16:58 +08:00
walzer a205df20a4 issue #390, manually merge from Bin's work. 2011-03-25 13:59:08 +08:00
yangws be966dbddb fixed #430 Solved bug by replacing glColor4ub with glColor4f. 2011-03-25 13:50:57 +08:00
walzer 7e7e8e2b4c Merge branch 'issue427' 2011-03-25 13:45:49 +08:00
walzer ff91c91ea9 issue #427 android HelloWorld ok 2011-03-25 12:01:56 +08:00
walzer d58a1ac9bc issue #427 projct configs for win32-vs2008, wophone emu & device are ok 2011-03-25 11:23:21 +08:00
walzer 0450048a41 [all] typo fixed, CCSprite::isTextureRectTotated -> CCSprite::isTextureRectRotated 2011-03-25 09:48:43 +08:00
walzer 799fb0994f issue #427, airplay port ok 2011-03-24 18:17:35 +08:00
walzer db4fb7cc9c issue #427, refactor ios port ok. 2011-03-24 17:51:29 +08:00
walzer b9c56f1728 issue #427, try to add CCSAXParser.h 2011-03-24 16:16:49 +08:00
walzer 4e1138fa7b Merge branch 'issue_421' of https://github.com/minggo/cocos2d-x into minggo-issue_421 2011-03-24 15:22:05 +08:00
minggo 7bdd5ed535 [android]fixed #421: list targets before inputting target id 2011-03-24 13:48:05 +08:00
natural-law 55143e3b9e issue #391,implement functions:CCRectFromString, CCPointFromString and CCSizeFromString. 2011-03-24 10:38:08 +08:00
walzer ef7fe5afd1 [airplay] issue #379, fix search header paths with cause compilation error on release build 2011-03-24 10:19:52 +08:00
minggo 0cdc85ccd5 [android] fixed #421: create project ok on linux 2011-03-24 09:37:56 +08:00
walzer ed492bbd1e [airplay] first commit of airplay port. Thanks for Аксёнов Максим's contribution! 2011-03-23 22:16:20 +08:00
minggo 15b5acab3b [android]: add some commet and check the running path 2011-03-23 15:01:00 +08:00
minggo 07736e507f [android]issue #421:copy c++ files into Classes, copy pictures into Resources 2011-03-23 14:30:14 +08:00
unknown 7fa4e43ee5 fixed #424 CCamera.cpp rename to CCCamera.cpp, re-add the file to vc2010 project. 2011-03-23 10:01:37 +08:00
minggo 538c5725b0 [android] issue #421: create project ok on windows 2011-03-23 09:42:23 +08:00