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

492 Commits

Author SHA1 Message Date
Walzer b61c019b2c [android] fixed #475, CCImage::initWithString return true even if the bitmap hasn't been initialized. Thanks to Isaac Ashdown's fix on the forum. 2011-04-28 15:14:59 +08:00
yangws d73699aabb [ios] tests add RootViewController for rotate with ui object. 2011-04-28 14:19:12 +08:00
yangws f8dc140840 change CCLabelTTF accept string from gb2312 to utf8. 2011-04-27 18:19:47 +08:00
yangws e895d9d073 TextInputTest compile ok on android and merge last master code. 
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into input

Conflicts:
	HelloWorld/android/src/org/cocos2dx/lib/Cocos2dxGLSurfaceView.java
	HelloWorld/android/src/org/cocos2dx/lib/Cocos2dxRenderer.java
	HelloWorld/ios/HelloWorld.xcodeproj/project.pbxproj
	cocos2dx/platform/android/Cocos2dJni.cpp
	tests/test.android/src/org/cocos2dx/lib/Cocos2dxGLSurfaceView.java
	tests/test.android/src/org/cocos2dx/lib/Cocos2dxRenderer.java
	tests/test.ios/test.xcodeproj/project.pbxproj
	tests/test.win32/test.win32.vcproj
 2011-04-26 18:04:07 +08:00
yangws 9b08f4add6 keyboard notification message on ios and TextFieldTTF test code OK. 2011-04-26 16:33:20 +08:00
Walzer b3f76a81a4 [win32] issue #471, CCFileUtils::fullPathFromRelativeFile mustn't calculate realtive path twice 2011-04-26 14:53:57 +08:00
minggo 99733c602d [android] fixed #462: call applicationDidEnterBackground and applicationWillEnterBackground on android 2011-04-25 15:13:24 +08:00
Walzer 38ee881876 Merge branch 'master' of https://github.com/natural-law/cocos2d-x 2011-04-25 09:52:13 +08:00
natural-law 7337119501 issue #466, Modify the interface to fit the refactor of CCFileUtils. 2011-04-25 09:40:10 +08:00
moadib 85afa22195 [android] fixed typo in CCEGLView method name 2011-04-24 18:52:21 +04:00
Walzer 386005ef79 issue #466, Bin forget to modify CCFileUtils_ios.mm to fit the refactor, which cause compilation error. 2011-04-24 15:44:00 +08:00
yangws 252f3efe1a CCIMEDispatcher works on android. 2011-04-22 16:33:41 +08:00
natural-law e2ce006db2 fixed #466. [wophone] Refactor the CCFileUtils for the new packing approach. 2011-04-22 10:57:46 +08:00
minggo 8458058f26 Merge branch 'iss393' of https://github.com/minggo/cocos2d-x into minggo-iss393 2011-04-20 17:19:03 +08:00
minggo fd45cbea77 [android] fixed #393: use new version of libxml2, it supports xpath and xslt 2011-04-20 17:08:50 +08:00
minggo 7b51fa8e9b [android] fixed #393: use new version of libxml2, it supports xpath and xslt 2011-04-20 16:11:18 +08:00
minggo e5441a4fc2 fixed #450: can set default pixel format other than RGBA8888 2011-04-20 15:34:33 +08:00
yangws 85027c40ca CCIMEDispatcher works on ios. 2011-04-19 18:11:57 +08:00
minggo 0db048de73 Merge branch 'issue_456' of https://github.com/minggo/cocos2d-x into minggo-issue_456 2011-04-19 11:36:00 +08:00
minggo c38af3c28d fixed #456: integrate libcurl into cocos2dx 2011-04-19 10:57:44 +08:00
yangws d11bd85d00 CCTextFieldTTF works on win32. 2011-04-19 09:32:33 +08:00
minggo a4e9f1c18d libcurl works ok on ios 2011-04-18 14:12:41 +08:00
walzer eb4b31e4da update config file from doxygen 1.7.2 to 1.7.4. add simple brief for CCMessageBox 2011-04-16 15:21:50 +08:00
minggo 37e7fad0d3 issue #456: add curl test & libcurl.so works ok on android 2011-04-15 17:15:05 +08:00
minggo 3d6fd051ab issue #449: refactor CCTransition 2011-04-11 16:09:14 +08:00
minggo 37bb33d9e5 fixed #452: refactor CCDirector CCNode CCGrid 2011-04-11 15:10:09 +08:00
natural-law d4dbedca4d fixed #451,remove the code of support mac platform. 
1. Remove the EventDispatcher.
2. Refactor CCLayer, CCMenu and CCParticleSystemPoint.
3. Modify the project file of win32, wophone and android.
 2011-04-11 11:24:10 +08:00
yangws b1ab937ec3 fix MouseEvent bug 2011-04-07 11:05:44 +08:00
Max Aksenov b33aeac164 [airplay] renamed "CCEGLView::setFrameWitdAndHeight" to "CCEGLView::setFrameWidthAndHeight". 
reformatted CCEGLView::setMotionTouch for unification with other functions of  "setTouche".
 2011-04-04 01:58:07 -07:00
Max Aksenov 6927dae38f [airplay] renamed "CCEGLView::setFrameWitdAndHeight" to "CCEGLView::setFrameWidthAndHeight". 
reformatted CCEGLView::setMotionTouch for unification with other functions of  "setTouche".
 2011-04-04 01:56:15 -07:00
walzer de81120b6a Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master 2011-04-03 09:51:01 +08:00
walzer 28fbfb04dc Merge branch 'iss349' of https://github.com/natural-law/cocos2d-x into natural-law-iss349 2011-04-03 09:30:26 +08:00
minggo 0aa8eb2892 fixed #350: transitionfade flickers on both android and iphone 2011-04-02 16:16:19 +08:00
natural-law 72f11cb421 [ios]fixed #349,Modify the method of parse *.plist files in order to deal with *.plist files in binary format. 2011-04-02 11:32:15 +08:00
minggo 39b60291ed Merge branch 'issue_441' of https://github.com/minggo/cocos2d-x into minggo-issue_441 2011-04-01 17:34:17 +08:00
minggo 8fbfc2773a Merge branch 'issue_440' of https://github.com/minggo/cocos2d-x into minggo-issue_440 2011-04-01 17:19:30 +08:00
minggo 7d52161804 fixed #441: Initialize pointer in contruction & detect pointer value in destruction 2011-04-01 16:06:53 +08:00
Marat Yakupov ac84278dae [android] #443 implemented CCKeypadDelegate on android 2011-04-01 11:27:06 +04:00
minggo 2c539a1df5 [android] fixed #440: CCMessage works ok on android 2011-04-01 11:35:26 +08:00
yangws 63801db3f6 fixed #440 Commit missing file last commit. 2011-03-31 11:23:58 +08:00
yangws 20539d4b89 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into 439 2011-03-31 10:51:00 +08:00
yangws f8a5a4ecf3 CCMessageBox works on ios. 2011-03-31 10:36:53 +08:00
walzer 70eb85e6df Merge branch 'yangws-439' 2011-03-30 11:47:10 +08:00
yangws 7e81c56231 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into 439 
Conflicts:
	cocos2dx/platform/ios/CCFileUtils_ios.mm
 2011-03-30 11:05:23 +08:00
walzer 35d94eb3a5 Merge branch 'iss411' of https://github.com/natural-law/cocos2d-x into natural-law-iss411 2011-03-30 10:44:34 +08:00
yangws ba68a5b966 fixed #439 test OK. 2011-03-29 17:32:52 +08:00
natural-law 87ea85a986 fixed #411,support .plist format generated by zwoptex in the last version. 2011-03-29 16:59:50 +08:00
yangws 48d57b88e2 issue #439 ios and airplay midified. 2011-03-29 15:59:37 +08:00
yangws 1887417472 issue #439 ios and airplay midified. 2011-03-29 15:56:55 +08:00
walzer 5811fb7c76 Merge branch 'issue_422' of https://github.com/minggo/cocos2d-x into minggo-issue_422 2011-03-29 15:50:28 +08:00