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 |