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

185 Commits

Author SHA1 Message Date
minggo 0d27381cdd format the file 2011-05-31 14:49:05 +08:00
minggo 697368cf20 support lua 2011-05-31 14:04:14 +08:00
yangws 7e2d1d5c48 fixed #490 Text input on android use a different way, TextInputTest OK now. 2011-05-30 16:36:12 +08:00
Walzer 58a63f7ec0 [airplay] following MaxAksenov's suggestion, I set HelloWorld & Tests to landscape as default. Users had to rotate the simulator in airplay's surface configuration. 2011-05-30 14:14:19 +08:00
yangws 476d86283f Remove unnecessary code for digit in Cocos2dxGLSurfaceView.java. 2011-05-26 14:35:44 +08:00
Walzer 78f87f1207 Merge remote branch 'origin/master' 2011-05-26 10:29:43 +08:00
Walzer 03b1bb6c52 fix a typo in CCTextFieldTTF. add comment for in helloworld/AppDelegate.cpp 2011-05-26 10:08:05 +08:00
minggo 8d76a4103b fixed #509: let UI rotate HelloWorld to landscape 2011-05-24 18:16:05 +08:00
minggo a5c294ed69 fixed #501: let UI rotate HelloWorld to landscape 2011-05-24 18:13:54 +08:00
yangws d93a2f046e android can input number form soft keyboard. 2011-05-23 16:30:45 +08:00
unknown 97142d4a59 Use GetCurrentDirectory instead GetModuleName in CCFileUitls_win32.cpp and compile OK on vs2010 2011-05-19 21:11:29 +08:00
unknown b940676cab Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into 489 2011-05-19 20:55:39 +08:00
minggo ff1017d86f Merge pull request #276 from minggo/iss496 
[android] fixed #496 fixed #497
 2011-05-18 23:18:37 -07:00
minggo 073260e0a9 [android] fixed #496 fixed #497: tests and HelloWorld work ok on Android3.0 2011-05-19 11:26:57 +08:00
minggo 6cf0a9d4f4 [android] fixed #494: fix a wrong function name 2011-05-18 10:54:52 +08:00
yangws aba77f4cae issue #489 modified for vs2008. 2011-05-13 14:13:30 +08:00
minggo 8e44d5bc40 [android] fixed #488: synchrolize code to HelloWorld 2011-05-12 18:34:16 +08:00
yangws 21c8628e68 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into input2 
Conflicts:
	cocos2dx/platform/wophone/CCApplication_wophone.h
	tests/tests/tests.h
 2011-05-10 16:09:26 +08:00
minggo da64909963 [iOS] fixed #477: force exit HelloWorld when x button is clicked 2011-05-09 10:17:00 +08:00
yangws 3f8293dffb Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into input 
Conflicts:
	HelloWorld/wophone/HelloWorld.wophone.vcproj
	tests/test.wophone/copy_res.bat
 2011-05-06 17:45:39 +08:00
minggo bfcee3e2ae fixed #455: add CCUserDefault to HelloWorld 2011-05-06 17:09:35 +08:00
yangws ced029257f temp commit 2011-05-06 16:38:09 +08:00
natural-law 846b529e49 [wophone] fixed #482, Modify the resource data path for the new WoPhone-SDK. 2011-05-06 10:13:12 +08:00
yangws 0fe61642f6 issue #478 text input ok. 2011-05-05 18:17:50 +08:00
Carlos Sessa 9d08f9582c Added the possibility of extending Cocos2dxGLSurfaceView and providing a initView() method 2011-05-04 11:18:26 -03:00
minggo bb4fc1c446 [android] fixed #477: set default ndk version to ndk-r5 2011-04-29 09:59:05 +08:00
yangws a5be05e50c sync test and helloworld android java code. 2011-04-27 17:03:43 +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 a73ccaf0e3 Cocos2dxGLSurfaceView little modify. 2011-04-26 16:40:49 +08:00
minggo 99733c602d [android] fixed #462: call applicationDidEnterBackground and applicationWillEnterBackground on android 2011-04-25 15:13:24 +08:00
moadib 85afa22195 [android] fixed typo in CCEGLView method name 2011-04-24 18:52:21 +04:00
yangws 252f3efe1a CCIMEDispatcher works on android. 2011-04-22 16:33:41 +08:00
Walzer 3e643d73a3 Merge branch 'master' of https://github.com/flyingpacer/cocos2d-x into flyingpacer-master 2011-04-22 16:02:15 +08:00
RongHong 22316eeb11 Update the iOS template version and add cocosdension include directory to helloworld make file 2011-04-22 15:49:05 +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
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 37e7fad0d3 issue #456: add curl test & libcurl.so works ok on android 2011-04-15 17:15:05 +08:00
minggo a165663b4c [andorid] merge Macarse-inflateViews into master and sychrolize it to HelloWorld 2011-04-12 15:37:44 +08:00
minggo d8115cacea [android] fixed #453: cocosdenshion can replace the background music 2011-04-12 14:43:21 +08:00
minggo 0b7ca9c865 fixed #449: remove the code that suppots mac platform 2011-04-11 17:04:45 +08:00
minggo e28d226f3a synchronize Cocos2dxMusic.java from tests to HelloWorld 2011-04-07 16:16:48 +08:00
natural-law 1af4aa1138 [android] fixed #374,Modify the approach of cache the textures when EGL rendering context lost. 2011-04-06 16:29:58 +08:00
Max Aksenov 804e264a66 [airplay] fix screen orientation bugs (pointer not properly worked) on devices ( checked on IOS IPad/IPhone), when orientation was changed. 2011-04-04 02:05:37 -07:00
walzer cb65469103 [airplay] move .mkf to proj.airplay folder, improve SimpleAudioEngine implementation, integrate chipmunk 2011-04-04 00:40:39 +08:00
minggo 9c768060b6 [android] implement keyPadDelegegate in HellloWorld 2011-04-01 17:26:12 +08:00
minggo 2c539a1df5 [android] fixed #440: CCMessage works ok on android 2011-04-01 11:35:26 +08:00
yangws 16254a2de1 fixed #440 CCMessageBox works on ios. 2011-03-31 11:08:46 +08:00