minggo
|
12f816687d
|
Merge pull request #336 from liswei/master
update wophone setup project (such as helloworld,tests)
|
2011-06-29 20:08:01 -07:00 |
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 |