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
Walzer
dcdad9a81a
Merge pull request #250 from yangws/481
...
fixed #481 DisableKeyLock and DisableBackLightAutoTurnOff when BackLightTurnOn.
2011-05-05 00:53:10 -07:00
Walzer
c7e25d305a
Merge pull request #248 from yangws/input
...
Split TextInputTest to Default test and Action test. Compile ok on vs2010
2011-05-05 00:50:48 -07:00
yangws
7c5a6d779c
fixed #481 DisableKeyLock and DisableBackLightAutoTurnOff when BackLightTurnOn.
2011-05-05 11:51:13 +08:00
Carlos Sessa
9d08f9582c
Added the possibility of extending Cocos2dxGLSurfaceView and providing a initView() method
2011-05-04 11:18:26 -03:00
yangws
a5da2bd226
Split TextInputTest to Default test and Action test. Compile ok on vs2010.
2011-05-04 14:13:15 +08:00
Walzer
5dc7ef2ffc
sort the TestCases alphabetically in project.pbxproj
2011-05-03 14:48:25 +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
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
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
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
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
73a3f776f0
android lanscope keyboard ok.
2011-04-27 17:01:27 +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
yangws
9b08f4add6
keyboard notification message on ios and TextFieldTTF test code OK.
2011-04-26 16:33:20 +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
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
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
natural-law
df00c32d5b
fixed #466 . [wophone] Modify the template and the Makefile.ARM file for wophone.
2011-04-22 11:49:14 +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
e5441a4fc2
fixed #450 : can set default pixel format other than RGBA8888
2011-04-20 15:34:33 +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
c38af3c28d
fixed #456 : integrate libcurl into cocos2dx
2011-04-19 10:57:44 +08:00
minggo
a4e9f1c18d
libcurl works ok on ios
2011-04-18 14:12:41 +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
8e85f56f97
Merge branch 'inflateViews' of https://github.com/Macarse/cocos2d-x into Macarse-inflateViews
2011-04-12 15:12:48 +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
Macarse
0203141aaf
Now the size depends on the GLView size
2011-04-11 00:28:12 -03:00
Macarse
da78032542
Added the possibility of inflating Cocos2dxGLSurfaceView from an xml
2011-04-10 17:57:17 -03:00
walzer
0173d0c3b7
Merge branch 'master' of https://github.com/minggo/cocos2d-x
2011-04-07 16:57:58 +08:00
minggo
1f6bbacb0a
[android] fix a bug of cocosdenshion::rewindBackgroundMusic()
2011-04-07 15:59:01 +08:00
walzer
63f323456c
Merge branch '0.8.2_vc10' of https://github.com/yangws/cocos2d-x
2011-04-07 15:16:30 +08:00
natural-law
b72b5306d2
Fix problems discovered when test:
...
1. Add include file in ccConfig.h
2. Resolve the memory leak in PerformanceSpriteTest.
3. Delete the 2048 * 2048 texture test case in PerformanceTextureTest.
2011-04-07 14:30:35 +08:00
yangws
455ec071b3
VC2010 compile ok.
2011-04-07 14:20:04 +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
290367c867
[airplay] fix screen orientation bugs (pointer not properly worked) on devices ( checked on IOS IPad/IPhone), when orientation was changed.
2011-04-04 01:54:34 -07:00
walzer
cb65469103
[airplay] move .mkf to proj.airplay folder, improve SimpleAudioEngine implementation, integrate chipmunk
2011-04-04 00:40:39 +08:00
walzer
3a16b76d00
remove duplicate frameworks in test.xcodeproj
2011-04-03 10:13:06 +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
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
8fbfc2773a
Merge branch 'issue_440' of https://github.com/minggo/cocos2d-x into minggo-issue_440
2011-04-01 17:19:30 +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
walzer
79229c82e8
Merge remote branch 'origin/master'
2011-03-31 17:56:21 +08:00
walzer
6c2f66792f
issue #422 , add CocosDenshion implementation on airplay port. But it doesn't work correctly.
2011-03-31 17:53:35 +08:00
yangws
16254a2de1
fixed #440 CCMessageBox works on ios.
2011-03-31 11:08:46 +08:00
minggo
768c356343
merge natural-law-iss411 into master
2011-03-31 10:48:00 +08:00
natural-law
c8b0d391cd
fixed #411,Add ZwoptexTest on ios, wophone, android and airplay.Fix the bug in ios templates which generated by merge.
2011-03-30 15:21:18 +08:00
walzer
2b12ef4f56
issue #411 , add Zwoptex.cpp/.h & test resource into tests.xcodeproj
2011-03-30 14:54:42 +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
walzer
6d30c123d7
Merge branch 'issue_367' of https://github.com/minggo/cocos2d-x into minggo-issue_367
2011-03-29 15:53:11 +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
minggo
27d5a670b5
[android] fixed #367 : make the compiling sequece of HelloWorld and tests don't depend on alphabet order
2011-03-29 15:26:50 +08:00
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
5f7357bf09
fixed #391,CCSpriteFrameCache support *.plist files with format value is not 0.
2011-03-29 11:56:14 +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
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
walzer
2f573a784e
fixed #435 , CocosDenshion crashes at foreground/background switching
2011-03-27 22:17:18 +08:00
natural-law
cee82fe9fa
issue #434,refactor class CCFileUtils on android and ios.
2011-03-26 17:24:37 +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
9c1d462275
Merge branch '430' of https://github.com/yangws/cocos2d-x into yangws-430
2011-03-25 14:23:05 +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
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
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
walzer
ed492bbd1e
[airplay] first commit of airplay port. Thanks for Аксёнов Максим's contribution!
2011-03-23 22:16:20 +08:00
natural-law
96d7cedadb
issue #411,implement the zwoptex test.
2011-03-22 14:59:10 +08:00
walzer
594dab24fc
Merge branch 'iss419' of https://github.com/natural-law/cocos2d-x into natural-law-iss419
2011-03-21 17:29:09 +08:00
natural-law
09be3e8fe5
[ios]fix #419,Enable the depth test when EAGLView is created.
2011-03-21 17:15:20 +08:00
walzer
9854370db3
fixed #410 , recheck the search header paths & libraries paths in xcode3 templates
2011-03-21 12:00:48 +08:00
walzer
ffeb116542
Merge branch 'issue_400' of https://github.com/minggo/cocos2d-x into minggo-issue_400
2011-03-18 16:32:20 +08:00
minggo
7b71a565ed
fixed #400 : change project.pbxproj of HelloWorld and test to include CCCamera.cpp
2011-03-18 16:09:21 +08:00
walzer
d8c28d3754
Merge branch 'issue_409' of https://github.com/minggo/cocos2d-x into minggo-issue_409
2011-03-18 15:59:01 +08:00
minggo
47173778cc
fixed #409 : rename NSArray UIAlignment
2011-03-18 14:31:29 +08:00
walzer
e62ff6c815
Merge branch 'issue_405' of https://github.com/minggo/cocos2d-x into minggo-issue_405
2011-03-18 14:08:52 +08:00
walzer
c15c1719ba
fixed #410 , recheck the header search path & library search path in HelloWorld, Tests, and all xcode3 templates
2011-03-18 14:06:04 +08:00
minggo
617d484257
[android] fixed #405 : pause BMG music when tap HOME and resume it when it is active
2011-03-18 11:12:06 +08:00
walzer
724ac1d0a9
Merge branch 'issue_403' of https://github.com/minggo/cocos2d-x into minggo-issue_403
2011-03-18 10:08:43 +08:00
minggo
7c52a521fa
fixed #403 : change UIEvent to CCEvent
2011-03-18 09:39:34 +08:00
yangws
12254f95f0
fixed #395 Add initInstance code for all platform in msvc templates.
2011-03-17 11:27:51 +08:00