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 |
natural-law
|
f3b1385279
|
fixed #446,read the .fnt file by it's full path.
|
2011-04-06 10:20:01 +08:00 |
walzer
|
8e3731a0c7
|
Merge branch 'master' of https://github.com/axmx/cocos2d-x into axmx-master
|
2011-04-05 19:59:40 +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 |
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 |
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 |
Stepan Generalov
|
0010b49ec4
|
Fix link in readme
|
2011-04-04 06:02:45 +04: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
|
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
|
9c768060b6
|
[android] implement keyPadDelegegate in HellloWorld
|
2011-04-01 17:26:12 +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 |
walzer
|
4b33a6ccb8
|
Merge branch '420' of https://github.com/yangws/cocos2d-x into yangws-420
|
2011-03-31 17:58:13 +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
|
0efeaa6696
|
fixed #420 deal with ccsprite init failed case in CCSprite.cpp.
|
2011-03-31 14:56:49 +08:00 |
yangws
|
63801db3f6
|
fixed #440 Commit missing file last commit.
|
2011-03-31 11:23:58 +08:00 |
yangws
|
16254a2de1
|
fixed #440 CCMessageBox works on ios.
|
2011-03-31 11:08:46 +08:00 |
yangws
|
20539d4b89
|
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into 439
|
2011-03-31 10:51:00 +08:00 |
minggo
|
768c356343
|
merge natural-law-iss411 into master
|
2011-03-31 10:48:00 +08:00 |
yangws
|
f8a5a4ecf3
|
CCMessageBox works on ios.
|
2011-03-31 10:36:53 +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
|
87bd4a2938
|
fixed #438, rename CCMotionStreak::update to CCMotionStreak::updateMotion to avoid this crash
|
2011-03-30 15:00:13 +08:00 |
walzer
|
2b12ef4f56
|
issue #411, add Zwoptex.cpp/.h & test resource into tests.xcodeproj
|
2011-03-30 14:54:42 +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
|
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 |
yangws
|
6c5cf577b7
|
issue #439 wophone and android modified.
|
2011-03-29 15:05:53 +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
|
334786c633
|
fixed #391,Add implement of CCNS on airplay.
|
2011-03-29 13:59:10 +08:00 |
natural-law
|
edc33952be
|
fixed #391,Add support on ios and airplay.
|
2011-03-29 12:50:25 +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 |
yangws
|
041953151a
|
issue #439 CCFileData and imageWithImageFile modified on win32.
|
2011-03-29 11:41:44 +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 |