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

1107 Commits

Author SHA1 Message Date
yangws 6eb24cafee fixed #481 remove KeyLock control code. 2011-05-05 14:00:36 +08:00
yangws 7c5a6d779c fixed #481 DisableKeyLock and DisableBackLightAutoTurnOff when BackLightTurnOn. 2011-05-05 11:51:13 +08:00
yangws a5da2bd226 Split TextInputTest to Default test and Action test. Compile ok on vs2010. 2011-05-04 14:13:15 +08:00
yangws 2b94d7d9ce TextInputTest on on ios. 2011-04-29 18:09:54 +08:00
yangws 170933b4c5 CCTextFieldTTF test code ok on win32. 2011-04-29 16:46:29 +08:00
yangws 2bb4775051 add CCTextFieldDelegate. 2011-04-28 18:01:29 +08:00
yangws d73699aabb [ios] tests add RootViewController for rotate with ui object. 2011-04-28 14:19:12 +08:00
yangws 323c065934 make test can compile on wophone and airplay. 2011-04-28 10:31:51 +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 ef94d19030 Merge branch 'iss468' of https://github.com/natural-law/cocos2d-x 2011-04-25 16:08:27 +08:00
minggo 1c248b9955 Merge branch 'iss462' of https://github.com/minggo/cocos2d-x 2011-04-25 16:07:16 +08:00
minggo 99733c602d [android] fixed #462: call applicationDidEnterBackground and applicationWillEnterBackground on android 2011-04-25 15:13:24 +08:00
natural-law 71e4ec6aca issue #468, Fix the compile error when the target platform is not win32. 2011-04-25 15:05:16 +08:00
Walzer 6a11f73999 Merge branch 'iss468' of https://github.com/natural-law/cocos2d-x 2011-04-25 14:44:21 +08:00
natural-law 7231120b16 fixed #468, Implement CCProfiler & CCProfilingTimer. And use them in PerformanceNodeChildrenTest. 2011-04-25 14:30:30 +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
Walzer f7b294fe24 fixed #467 CCLayer:m_eTouchDelegateType = ccTouchDeletateAllBit all the time, which makes an error logic if adding standard touch delegate when CCTouchDispatcher::m_tLock = ture 2011-04-24 15:38:03 +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
natural-law acb4bb5a16 Merge branch 'master' into iss428 
Conflicts:
	template/xcode3/cocos2d-x_chipmunk_app/___PROJECTNAME___.xcodeproj/project.pbxproj
 2011-04-21 14:58:58 +08:00
natural-law 5d2ac1fc0c fixed #428, Use CCArray instead of CCMutableArray as the parameter type of CCNode::m_pChildren. 2011-04-21 14:46:15 +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 4ffe24fc8e Merge branch 'iss374' of https://github.com/natural-law/cocos2d-x into natural-law-iss374 2011-04-19 13:45:56 +08:00
minggo f1363af496 Merge branch 'master' of https://github.com/natural-law/cocos2d-x into natural-law-master 2011-04-19 11:49:50 +08:00
minggo 26da27aaca Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2011-04-19 11:48:33 +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
Walzer 735b6ce97b CCMutableArray::count() may crash if m_array is empty. Detect empty() before iteration 2011-04-19 11:23:02 +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
natural-law adbf349116 fixed #449. Modify the wophone Makefile.ARM for remove mac support. 2011-04-18 11:35:57 +08:00
walzer 0738f751d1 Merge branch 'point_math' of https://github.com/moadib/cocos2d-x 2011-04-16 15:22:44 +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
moadib 03093a98b5 In pointmath-related functions parameters should be passed by reference 2011-04-16 10:55:02 +04:00
minggo 37e7fad0d3 issue #456: add curl test & libcurl.so works ok on android 2011-04-15 17:15:05 +08:00
walzer 73f2c5297c #define ccp CCPointMake(...) to cocos2d::CCPointMake(...). Thanks Marat Yakupov's fix. http://www.cocos2d-x.org/boards/6/topics/1200 2011-04-14 16:15:12 +08:00
minggo 932b475170 fixed #448: make CCCallFuncO invoke correct parameter 2011-04-13 11:53:25 +08:00
minggo 7f6e0052a1 Merge branch 'iss341' of https://github.com/natural-law/cocos2d-x into natural-law-iss341 2011-04-12 15:43:48 +08:00
natural-law da7c608ab8 fixed #341. Modify the location of allocate memory for m_pTMXLayers. 2011-04-12 15:31:54 +08:00
minggo 3d6fd051ab issue #449: refactor CCTransition 2011-04-11 16:09:14 +08:00