minggo
2a39fe0aa4
Merge pull request #335 from minggo/iss547
...
[Android] fixed #547 : line wrap OK on Android
2011-06-29 19:46:25 -07:00
liswei
39fb944297
update wophone setup project (such as helloworld,tests)
2011-06-30 09:36:51 +08:00
minggo
6c47f53b13
[Android] fixed #547 : line wrap OK on Android
2011-06-29 15:45:30 +08:00
liswei
b23409a942
fixed #545 [Wophone] The effect of ChipmunkTest is wrong.
...
reset glOrthof param value in wophone
2011-06-29 15:24:04 +08:00
minggo
e8853583df
Merge pull request #329 from minggo/master
...
Fix some bug
2011-06-27 18:23:26 -07:00
minggo
7099b24ccb
Merge pull request #326 from liswei/issue521
...
issue #521 set depthtest value for true ,then set depthtest value for false
2011-06-27 18:20:10 -07:00
yangws
3b6265aa58
Compile ok on vs2010
2011-06-27 17:02:58 +08:00
minggo
5e15545dbd
[Android] fix an error when string is
2011-06-27 16:01:25 +08:00
liswei
bb59728543
issue #521 set depthtest value for true ,then set depthtest value for false
2011-06-27 15:34:26 +08:00
minggo
686b9ae179
fix the test title
2011-06-27 15:22:55 +08:00
natural-law
72f17ecbdf
fixed #542 , Record the volume user specified though the background music is not playing.
2011-06-27 11:43:27 +08:00
Walzer
688131c958
[android] in main.cpp, change view->create(320,480) to (480,320) to fit the lastest modification, in both HelloWorld, HelloLua, Tests
2011-06-25 12:11:40 +08:00
Walzer
00568c229a
[android] back to shared library link
2011-06-25 11:21:16 +08:00
minggo
8440d6a267
[android] fixed #364 : show string correct & line break ok
2011-06-24 13:55:00 +08:00
minggo
10cdd7f798
[android] fixed #364 : line break ok on Android
2011-06-23 14:44:20 +08:00
minggo
71c13b34bf
Merge https://github.com/cocos2d/cocos2d-x into iss535
2011-06-22 17:00:11 +08:00
minggo
1122a7c7d0
[android] use Android widget Bitmap other than skia to drawstring
2011-06-22 16:58:50 +08:00
Walzer
96996d4d52
Merge pull request #311 from yangws/master
...
Sync java code in Helloworld and tests and Add icon for Helloworld and tests on Android..
2011-06-22 01:11:49 -07:00
Walzer
1485a35338
update tests.xcodeproject to add lua support in cocos2dx lib. I finished it in xcode4 but don't know if this xcodeproject file will work on xcode4
2011-06-22 15:36:53 +08:00
yangws
01f277674e
Add icon for Helloworld and tests on Android.
2011-06-22 13:59:31 +08:00
yangws
4d8596169e
Sync java code in Helloworld and tests.
2011-06-22 11:37:42 +08:00
minggo
022e2b9998
issue #528 : refactor ok on win32
2011-06-20 17:31:38 +08:00
minggo
25de09e34b
lua support ok on win32
2011-06-15 15:50:16 +08:00
minggo
8003de7468
update to latest code and merge
2011-06-14 11:01:38 +08:00
Walzer
f600846d4b
Merge http://github.com/flyingpacer/cocos2d-x , resolve conflicts in cocos2dx/CCScheduler.cpp
2011-06-08 11:08:29 +08:00
RongHong
67eb87abfe
To fix the crash when the gles version is too low
2011-06-08 10:02:07 +08:00
RongHong
a13e8ae859
1.修正gles版本过低时会崩溃的问题
...
2.修正unscheduleAllSelectors()中遍历哈希表导致崩溃的问题
2011-06-03 15:22:50 +08:00
liswei
49410a2a07
Merge branch 'XXX'
2011-06-03 10:52:19 +08:00
liswei
54780b8cb7
fixed #521 , Fix the effect of PageTurn3D.
2011-06-03 10:51:21 +08:00
minggo
83e1e0ebd1
tests run ok when it don't enable lua
2011-06-01 20:29:05 +08:00
minggo
a8b6b850de
use precompile macro to cantrol if enable lua support
2011-06-01 17:51:08 +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
Walzer
11c401e3ea
[ios] setDepthTest(false) for EffectsTest
2011-05-26 21:01:16 +08:00
Walzer
bf95e4e7a5
Merge pull request #286 from natural-law/master
...
[android] fixed #510
2011-05-26 01:39:11 -07:00
natural-law
7e716f9d80
[android] fixed #510 , Delete the onDestroy method override in TestsDemo.java
2011-05-26 16:34:10 +08:00
yangws
476d86283f
Remove unnecessary code for digit in Cocos2dxGLSurfaceView.java.
2011-05-26 14:35:44 +08:00
minggo
dfbb0096e8
Merge pull request #283 from natural-law/master
...
Compile tests OK on wophone.
2011-05-24 18:45:18 -07:00
natural-law
8ab7057fe6
Resolve the memory leak of tests.
2011-05-24 18:00:59 +08:00
natural-law
f89a93fcf8
Compile tests OK on wophone.
2011-05-24 17:52:24 +08:00
yangws
c757dd4aeb
fixed #503 new chipmunk code compiled ok on vs2010.
2011-05-24 16:18:47 +08:00
yangws
d93a2f046e
android can input number form soft keyboard.
2011-05-23 16:30:45 +08:00
yangws
ec23d7ed55
fixed #508 Dynamic switch retina display support.
2011-05-23 16:21:31 +08:00
yangws
533949a736
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
2011-05-23 10:11:13 +08:00
Walzer
6b24b6fb8d
issue #503 , i forget to add chipmunk_private.h into xcodeproj
2011-05-21 21:35:05 +08:00
Walzer
e8835ee4c2
issue #503 , add chipmunk new files into win32 vcproj
2011-05-21 17:10:29 +08:00
Walzer
335d02a556
issue #503 , android version build & run ok.
2011-05-21 16:45:55 +08:00
Walzer
a9027574eb
issue #503 , ChipmunkTest & ios xcodeproject upgraded, run on ios simulator ok
2011-05-21 16:19:01 +08:00
yangws
c9f66665ec
temp commit.
2011-05-20 17:47:06 +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
Walzer
2dd11490ad
Merge pull request #274 from yangws/master
...
Fixed some bugs on wophone and modify CClog output utf-8 string on win32 and wophone emulator.
2011-05-18 18:51:38 -07:00
yangws
5173738f37
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
2011-05-18 11:08:44 +08:00
yangws
7a6a891242
fixed bugs: the image stoped when switch app fore/background several times. The background music not stoped when app enter background some time.
2011-05-18 11:08:18 +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
Walzer
c7fb183dcb
[airplay] After exclude CurlTest & CCUserDefault, UserDefaultTest, HelloWorld & Tests can be compiled successfully now.
2011-05-12 21:58:11 +08:00
Walzer
4da5a0eb71
[android] move the TextField position to visable while soft keyboard popup
2011-05-12 21:32:57 +08:00
Walzer
f17a8f6226
Merge pull request #271 from minggo/iss488
...
[Android] CCUserDefault works ok on android2.2
2011-05-12 05:40:15 -07:00
minggo
d8f3b0c25b
[android] CCUserDefault works ok on android2.2
2011-05-12 18:32:13 +08:00
Walzer
bf04194877
Merge pull request #269 from yangws/master
...
center CCTextField in TextInputTest
2011-05-12 01:59:39 -07:00
Walzer
7874ec5305
Merge pull request #270 from yangws/vs2010
...
compile ok in vs2010
2011-05-12 01:59:24 -07:00
yangws
c73c1a9ab6
compile ok in vs2010
2011-05-12 16:15:10 +08:00
yangws
01c5048203
set TextInputTest CCTextField to center.
2011-05-12 14:45:44 +08:00
natural-law
2855a9cefb
Fix the bug discovered by wophone test:
...
1. Can't play music & effect on wophone device.
2. UserDefaultTest is in the wrong path in test.wophone.vcproj.
2011-05-12 14:19:58 +08:00
minggo
a50fe1b95b
Merge pull request #267 from natural-law/master
...
Modify the TextInputTest code to clean the memory leak.
2011-05-11 20:01:23 -07:00
natural-law
cc6367a835
Modify the TextInputTest code to clean the memory leak.
2011-05-12 10:54:33 +08:00
Walzer
7f0c35b158
Merge remote branch 'origin/master'
2011-05-12 10:52:33 +08:00
Walzer
10d94fb170
fixed #486 , setDepthTest(true) in TileMapTest, while setDepthTest(false) in TransitionsTest. TransitionFlip will not flickers any more :)
2011-05-12 10:52:10 +08:00
natural-law
a7db186d06
Modify the test code for the right device orientation.
2011-05-12 10:11:58 +08:00
Walzer
58e9876124
change the position of TextField in TextInputTest
2011-05-11 22:15:51 +08:00
Walzer
074e127756
Merge pull request #265 from yangws/master
...
fixed a bug: TextInputTestWithAction crash.
2011-05-11 05:22:38 -07:00
yangws
7dad88c556
fixed a bug: TextInputTestWithAction crash.
2011-05-11 18:45:53 +08:00
Walzer
d0ff1f274e
Merge pull request #264 from yangws/master
...
fixed a bug: TextInputTextWithAction can't stop CCTextFieldTTF's action when click enter button.
2011-05-11 03:28:16 -07:00
Walzer
60f1468f57
Merge pull request #263 from yangws/input_android
...
fixed a bug: delete twice when delete button click once.
2011-05-11 03:27:45 -07:00
yangws
b8a9db98dc
fixed a bug: TextInputTextWithAction can't stop CCTextFieldTTF's action when click enter button.
2011-05-11 18:22:55 +08:00
yangws
e436e177de
fixed a bug: delete twice when delete button click once.
2011-05-11 17:33:59 +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
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
6c69107f33
fixed #455 : CCUserDefault works ok on iOS
2011-05-06 17:01:41 +08:00
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
minggo
2c0bd49513
issue #455 : CCUserDefault ok on win32 & Android
2011-05-06 15:31:51 +08:00
yangws
b95ef2f242
chipmunk test ok.
2011-05-06 12:30:52 +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
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