yangws
|
ced029257f
|
temp commit
|
2011-05-06 16:38:09 +08:00 |
minggo
|
7e40957e04
|
Merge https://github.com/cocos2d/cocos2d-x into iss455
|
2011-05-06 16:29:44 +08:00 |
minggo
|
80f739942d
|
issue #455 : compile CCUserDefault on iOS
|
2011-05-06 16:29:35 +08:00 |
minggo
|
33648a9e9b
|
issue #455: add compile CCUserDefault to WoPhone, but not test, because the path will change later
|
2011-05-06 16:14:07 +08:00 |
Walzer
|
857141eef3
|
[ios] issue #371, compatible with ios 4.1 4.2 4.3. switching different input methods will not cause crash
|
2011-05-06 15:43:36 +08:00 |
minggo
|
2c0bd49513
|
issue #455: CCUserDefault ok on win32 & Android
|
2011-05-06 15:31:51 +08:00 |
Walzer
|
9e41eb310c
|
Merge pull request #252 from yangws/master
chipmunk test ok.
|
2011-05-05 22:42:41 -07:00 |
yangws
|
b95ef2f242
|
chipmunk test ok.
|
2011-05-06 12:30:52 +08:00 |
Walzer
|
8e4cfec708
|
Merge pull request #251 from natural-law/iss482
fixed #482
|
2011-05-05 19:50:26 -07: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 |
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
|
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 |
minggo
|
e7f484bfc9
|
Merge pull request #249 from Macarse/renderingExt
Added the possibility of extending Cocos2dxGLSurfaceView and providing a
|
2011-05-04 18:23:50 -07: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
|
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 |