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

5763 Commits

Author SHA1 Message Date
yangws a5da2bd226 Split TextInputTest to Default test and Action test. Compile ok on vs2010. 2011-05-04 14:13:15 +08:00
Walzer cf18337926 Merge remote branch 'origin/master' 2011-05-03 14:48:40 +08:00
Walzer 5dc7ef2ffc sort the TestCases alphabetically in project.pbxproj 2011-05-03 14:48:25 +08:00
Walzer ccf712a3e3 Merge pull request #247 from yangws/459. 
fixed #459 template for vs use the Multi-ThreadDLL instead the error setting MT.
 2011-05-02 23:39:28 -07:00
yangws f288516b89 fixed #459 template for vs use the Multi-ThreadDLL instead the error setting MT. 2011-05-03 14:28:31 +08:00
Walzer 8cec640c1a [airplay] fixed #480, add template for airplay 2011-05-03 14:06:57 +08:00
Walzer 2b8799d3ac Merge pull request #246 from yangws/input. 
Modify tests doesn't change orientation every test scene.
 2011-05-02 23:00:35 -07:00
yangws e723a424d8 Modify tests doesn't change orientation every test scene. 2011-05-03 11:37:30 +08:00
minggo c644370ce8 Merge pull request #244 from natural-law/master. 
[iOS] Modify the template files for XCode.
 2011-05-02 18:49:47 -07:00
minggo 0db248e1f1 Merge pull request #245 from yangws/input. 
TextInputTest on on ios.
 2011-05-02 18:48:48 -07: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
natural-law 07107477f4 [iOS] Modify the template files for XCode. 2011-04-29 16:45:48 +08:00
minggo b00c54dc64 Merged pull request #243 from minggo/iss477. 
[android] fixed #477: set default ndk version to ndk-r5
 2011-04-28 19:29:15 -07:00
Walzer bdd0b44b99 fixed a warning in CCProfiling.cpp 2011-04-29 10:08:35 +08:00
minggo bb4fc1c446 [android] fixed #477: set default ndk version to ndk-r5 2011-04-29 09:59:05 +08:00
Walzer 031a750f95 [ios] issue #456, add curl into header search path for Release build. 2011-04-29 09:39:35 +08:00
yangws 2bb4775051 add CCTextFieldDelegate. 2011-04-28 18:01:29 +08:00
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
minggo 8b14b1bab8 Merged pull request #242 from yangws/input. 
[ios] tests add RootViewController for rotate with ui object.
 2011-04-27 23:46:47 -07:00
yangws d73699aabb [ios] tests add RootViewController for rotate with ui object. 2011-04-28 14:19:12 +08:00
minggo 86b856c7f1 Merged pull request #241 from yangws/input. 
make tests can compile on wophone and airplay.
 2011-04-27 20:50:08 -07:00
minggo 963c271120 Merged pull request #240 from natural-law/master. 
issue #428
 2011-04-27 19:38:09 -07:00
yangws 323c065934 make test can compile on wophone and airplay. 2011-04-28 10:31:51 +08:00
natural-law 15ef0b9105 issue #428, fix the bug created by issue 428. Have some loop in wrong arrays. 2011-04-28 10:16:58 +08:00
Walzer 2cceeb5c39 Merge remote branch 'origin/master' 2011-04-27 22:46:38 +08:00
Walzer fa43292250 ccTouchDeletateAllBit -> ccTouchDelegateAllBit. I met this typo 3 days ago, then miss it. Thanks to Isaac Ashdown. 2011-04-27 22:45:54 +08:00
yangws f8dc140840 change CCLabelTTF accept string from gb2312 to utf8. 2011-04-27 18:19:47 +08:00
yangws a5be05e50c sync test and helloworld android java code. 2011-04-27 17:03:43 +08:00
yangws 73a3f776f0 android lanscope keyboard ok. 2011-04-27 17:01:27 +08:00
minggo fcf3c587ac Merged pull request #239 from yangws/input. 
text input support on ios android win32.
 2011-04-26 19:14:02 -07: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 a73ccaf0e3 Cocos2dxGLSurfaceView little modify. 2011-04-26 16:40:49 +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
Walzer 6c8efba1e2 Merge remote branch 'origin/master' 2011-04-26 14:51:53 +08:00
Walzer 3480d7cc9e [android] add NDK_ROOT & ANDROID_SDK_ROOT paramter default setting into create-android-project.sh 2011-04-26 14:51:17 +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 f11acc5e31 [android] pause/resume gl render thread when the activity is paused or remused 2011-04-25 15:53:08 +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