laschweinski
dbf3a94200
modified: HelloWorld/HelloWorldScene.cpp
...
modified: tests/AppDelegate.cpp
HelloWorld/Linux/
cocos2dx/.settings/
cocos2dx/platform/Linux/
tests/test.linux/
2011-08-17 18:09:51 +08:00
laschweinski
5d20ebe24b
modified: HelloWorld/AppDelegate.cpp
...
modified: HelloWorld/HelloWorldScene.cpp
modified: cocos2dx/cocoa/CCNS.cpp
modified: cocos2dx/include/CCActionInstant.h
modified: cocos2dx/misc_nodes/CCRenderTexture.cpp
modified: cocos2dx/particle_nodes/CCParticleSystemQuad.cpp
modified: cocos2dx/platform/CCAccelerometer_platform.h
modified: cocos2dx/platform/CCApplication_platform.h
modified: cocos2dx/platform/CCArchOptimalParticleSystem.h
modified: cocos2dx/platform/CCCommon.cpp
modified: cocos2dx/platform/CCEGLView_platform.h
modified: cocos2dx/platform/CCGL.cpp
modified: cocos2dx/platform/CCGL.h
modified: cocos2dx/platform/CCImage.cpp
modified: cocos2dx/platform/CCPlatformConfig.h
modified: cocos2dx/platform/CCPlatformMacros.h
modified: cocos2dx/platform/CCSAXParser.h
modified: cocos2dx/platform/CCStdC.h
modified: cocos2dx/support/CCUserDefault.cpp
modified: cocos2dx/support/data_support/ccCArray.h
modified: tests/AppDelegate.cpp
deleted: tests/Res/music.mid
modified: tests/tests/controller.cpp
modified: tests/tests/tests.h
HelloWorld/Linux/
cocos2dx/.settings/
cocos2dx/platform/Linux/
tests/test.linux/
2011-08-17 11:36:54 +08:00
Walzer
0881668cc2
fixed #661 . Thanks to GMTDev's previous resolvtion. And I fix the compilation error in the his patch: add float m_fContentScaleFactor declaration into CCTMXLayer.h, fix tile->setPositionIn to tile->setPosition. I just run TiledMapTest in retina mode, it works well
2011-08-15 12:10:11 +08:00
minggo
9a884ffda6
[iOS] fixed #668 : CCLabelBMFont looks ok in retina mode
2011-08-10 15:07:34 +08:00
minggo
d386116255
[iOS]fixed #667 : call AppDelegate::applicationDidEnterBackground() & AppDeleaget::applicationWillEnterForeground() when application enter background & enter foreground
2011-08-10 10:24:06 +08:00
minggo
5e5151b41e
Merge pull request #459 from minggo/iss643
...
[android] swap axes according to the orientation
2011-08-09 00:55:34 -07:00
minggo
ada4c2af80
[android] fixed #643 : swap axes according to the orientation
2011-08-09 15:50:42 +08:00
minggo
08797014e9
fix a bug that cause error when loading libtest.so on android
2011-08-09 13:56:09 +08:00
Walzer
945e5fde00
issue #633 , add test case for play effect repeatly, force the volume of effect&bgm between 0.0~1.0 in SimpleAudioEngine.mm.
2011-08-08 21:40:33 +08:00
minggo
2b5635898a
fixed #665 : add test of RenderTextureSave
2011-08-08 14:06:03 +08:00
minggo
7a0e8b4a0a
Merge pull request #457 from minggo/iss642
...
fixed #642 : CCRenderTexture::saveBuffer() works ok on iOS
2011-08-07 20:08:16 -07:00
minggo
41ea2e98a1
fixed #642 : CCRenderTexture::saveBuffer() works ok on iOS
2011-08-08 11:01:47 +08:00
RongHong
5f08bb24fe
Merge branch 'master' into 608
2011-08-05 10:59:40 +08:00
minggo
76da5f2e84
fixed #656 : remove unneeded methods & android can let user set resource path
2011-08-04 17:19:58 +08:00
minggo
ee0c6e56d7
Merge pull request #447 from minggo/master
...
[android] fixed #655 : fix a bug that CCLabelTTF lost the last characters
2011-08-03 21:13:12 -07:00
minggo
7fc0dae3d9
[android] fixed #655 : fix a bug that CCLabelTTF lost the last characters
2011-08-04 12:08:12 +08:00
liswei
897dd54b12
fixed #347 add ttf support in win32
2011-08-04 11:23:59 +08:00
minggo
90f403d8a2
Merge pull request #441 from liswei/issue347
...
issue #347 add ttf support in wophone
2011-08-02 03:16:06 -07:00
liswei
79cf8167dc
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into issue347
2011-08-02 18:04:23 +08:00
liswei
188b168d30
issue #347 add ttf support in wophone
2011-08-02 18:02:27 +08:00
minggo
906e6ba519
issue #645 : fix a bug of animation test
2011-08-02 15:57:04 +08:00
minggo
09dc164fff
issue #645 : update to v1.0.1
2011-08-02 15:45:27 +08:00
minggo
a3b4043755
issue #347 : add tests for FontTest & it works ok on android
2011-07-29 15:57:27 +08:00
RongHong
c1fdf9afb5
issue #608 rendertexture disappears after going to background
2011-07-28 17:32:09 +08:00
minggo
648117ebb5
issue #347 : android can use ttf file
2011-07-28 17:20:37 +08:00
RongHong
8afa3a9be1
fixed #619 CCFadeTo may crashed on android
2011-07-27 16:21:00 +08:00
minggo
657fe9a17d
[android] fixed #625 : remove gz file in assets & use uncompressed pvr file instead
2011-07-27 11:51:19 +08:00
minggo
d446702f14
issue #633 : revert CocosDenshionTest
2011-07-26 16:16:34 +08:00
minggo
1bb9e8139a
issue 33: iOS & Android support looping playing effect
2011-07-26 15:52:41 +08:00
minggo
b308effdc5
[android] fixed #631 : Send \n to engine when user input nothing
2011-07-26 11:41:28 +08:00
minggo
13a1629299
fixed #624 : insert white space in front of \n
2011-07-22 12:10:41 +08:00
minggo
eb2cf3afd0
[win32] add Texture2DTest to vs2010
2011-07-20 16:00:21 +08:00
natural-law
32e7ee6e2f
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
2011-07-20 15:35:52 +08:00
natural-law
6a8b563feb
fixed #621 , Add Texture2dTest in tests project.
2011-07-20 15:35:20 +08:00
minggo
0c495628ea
Merge pull request #405 from minggo/iss618
...
invoke java code(System.exit()) to finish programe
2011-07-19 02:20:36 -07:00
minggo
640d811809
[android] fixed #618 : invoke java code(System.exit()) to finish programe
2011-07-19 16:01:22 +08:00
Walzer
bc44855091
issue #536 , integrate the CCTexturePVR to project, update from 0.99.5 to 1.0.0, compile successfully on ios & android. Haven't test on other platforms yet.
2011-07-19 15:14:59 +08:00
minggo
dd42936bb3
[android] fixed #610 : remove the support of ndk-r4
2011-07-14 10:37:40 +08:00
Walzer
679f4afe06
fixed #604 . When I modify the sdk from "iphonesimulator4.1" to "Lastest iOS", the summary & info come out. How magic... It case waste me 4 hours!!!
2011-07-13 18:04:53 +08:00
minggo
1a25dd83a5
Merge pull request #398 from natural-law/master
...
fixed #599
2011-07-13 01:35:41 -07:00
natural-law
8ad7236ca2
fixed #599 , Resolve the wrong orientation when exit the TouchesTest.
2011-07-13 16:17:50 +08:00
Walzer
62b52b37be
Merge remote branch 'origin/master'
2011-07-13 16:13:20 +08:00
Walzer
1b1fd7446c
[maramalade] add new test cases (bugs, DirectorTests) into test.mkb. Both HelloWorld & Tests are tested on marmalade
2011-07-13 16:00:22 +08:00
minggo
692d8450c2
Merge pull request #397 from minggo/master
...
fix a bug of orientation
2011-07-13 00:36:52 -07:00
minggo
a26fb13604
fix a bug of orientation
2011-07-13 15:32:03 +08:00
natural-law
9755ff59aa
When click the "BACK" button in test case Bug-899. The button "MainMenu" is not visible if the device support retina.
2011-07-13 14:37:06 +08:00
minggo
d5850224e4
[win32] modify configuration of vs2101 release version
2011-07-13 12:05:02 +08:00
minggo
fcb2006fdc
Merge pull request #392 from natural-law/master
...
fixed #599
2011-07-12 03:10:27 -07:00
minggo
faa1c8ee16
Merge pull request #393 from minggo/master
...
[win32] modify for vs2010
2011-07-12 03:09:44 -07:00
minggo
760ec3201e
[win32] modify for vs2010
2011-07-12 18:05:44 +08:00
natural-law
7b10874d5e
The menu of BugsTest position is wrong when exit one bug test.
2011-07-12 18:02:40 +08:00
natural-law
d4e575c4b2
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
2011-07-12 17:47:24 +08:00
natural-law
e6bc8d7c98
fixed #599 , Resolve the wrong orientation when exit the TouchesTest.
2011-07-12 17:46:57 +08:00
liswei
21ce679992
resolve the effect of PageTransitionForward&PageTransitionBackward ,via to add setDepthTest.
2011-07-12 17:35:15 +08:00
natural-law
e8ac968b3b
Add the resource files to the ios project which used by BugsTest. And clean a warning in TileMapTest.cpp.
2011-07-12 15:56:42 +08:00
natural-law
8b5282a0cf
fixed #603 , The test case TMXGIDObjectsTest in TileMapTest not crash any more.
2011-07-12 14:21:29 +08:00
minggo
d48c3fdfb1
upgrade to 1.0.0-final 07-11
2011-07-12 11:20:41 +08:00
natural-law
58733417e0
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
2011-07-11 15:17:24 +08:00
natural-law
fcbe0443be
Resolve a bug in ZipUtils.cpp. And modify the Makefile of tests on wophone.
2011-07-11 15:16:29 +08:00
minggo
21b1af5f1c
Merge pull request #377 from minggo/master
...
[Android] break string & wrap word
2011-07-11 00:09:43 -07:00
minggo
fb436a6339
[Android] break string & wrap word
2011-07-11 15:02:41 +08:00
Walzer
28bf48f665
issue #569 #601 , fix ChipmunkTest/Sensors crash after update to Chipmunk v5.3.5
2011-07-11 11:21:11 +08:00
Walzer
aa12ea838e
Merge remote branch 'origin/master'
2011-07-11 10:34:47 +08:00
Walzer
63ffc574d7
fixed #601 , update Chipmunk from 5.3.4 to 5.3.5. Only tested on iOS now.
2011-07-11 10:34:03 +08:00
natural-law
7bc3983f04
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
2011-07-11 10:12:07 +08:00
natural-law
36474b2131
Add DirectorTest and BugsTest on wophone.
2011-07-11 10:11:40 +08:00
Walzer
4e12ba3015
Merge pull request #374 from axmx/master
...
[airplay] fix - it solves the problems related to incorrect memory allocation..
2011-07-10 00:44:30 -07:00
Max Aksenov
7f07574630
[airplay] fix - if you do not use this "MemFlags0 = USE_STACK_ALLOCATOR" then it solves the problems related to incorrect memory allocation ... I tested it on Marmalade Mac Simulator and IPad device. Not tested on Maramlade Windows Simulator....
2011-07-09 13:05:22 -07:00
minggo
2066cebd08
Merge pull request #371 from natural-law/master
...
Add DirectorTest and BugsTest on android.
2011-07-08 03:49:30 -07:00
minggo
487ba5c02d
merge confict
2011-07-08 18:29:03 +08:00
minggo
87adeb6f92
upgrade xcode3 template
2011-07-08 18:24:58 +08:00
natural-law
1ffa7fbc19
Add DirectorTest and BugsTest on android.
2011-07-08 18:13:03 +08:00
Walzer
e39fca389f
Merge remote branch 'origin/master'
2011-07-08 18:01:52 +08:00
Walzer
944b03df5c
issue #599 orientation is wrong in ios tests. Most test cases are ok now, but it still have problem when TouchesTest back to MainMenu.
2011-07-08 18:01:28 +08:00
natural-law
1bdce00740
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
...
Conflicts:
cocos2dx/include/ccConfig.h
2011-07-08 17:08:57 +08:00
minggo
6c37f42414
Merge pull request #368 from minggo/master
...
fixed #586
2011-07-08 01:46:54 -07:00
minggo
4e5306a46b
fixed #596
2011-07-08 16:27:13 +08:00
natural-law
cba538d5d0
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
2011-07-08 15:58:14 +08:00
natural-law
602c5f1894
fixed #595
2011-07-08 15:57:46 +08:00
Walzer
5c8b04bc25
fixed #585
2011-07-08 14:48:25 +08:00
Walzer
08b26402d5
fixed #594 , but find a new bug #597
2011-07-08 14:27:37 +08:00
natural-law
0cb3b0ce06
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
2011-07-08 11:23:03 +08:00
natural-law
ca4281904a
fixed #574 , Add bugs test case.
2011-07-08 11:22:35 +08:00
minggo
b08788d810
change the return value of CCSkewBy::reverse() & CCScaleBy::reverse() to CCActionInterval*
2011-07-07 15:41:42 +08:00
minggo
8ca8f4d9bc
fixed #569 : change the free sequence to avoid bug
2011-07-07 15:20:13 +08:00
natural-law
26513d6b7e
issue #574 , Add DirectorTest for win32.
2011-07-07 14:55:11 +08:00
minggo
211878dc44
add animation
2011-07-07 10:24:01 +08:00
minggo
ff50997eb0
issue #574
2011-07-06 14:56:05 +08:00
Walzer
80c819d8b6
Merge remote branch 'origin/master'
2011-07-04 16:25:29 +08:00
Walzer
d325f1991e
[ios] 1. debug builds can run on device (add “Valid Architectures") 2. add correct header search paths for HelloLua release build
2011-07-04 16:25:11 +08:00
natural-law
7d7f3a9241
fixed #562 , Upgrade folder sprite_nodes to rc3.
2011-07-01 16:11:31 +08:00
natural-law
4d5dab4a40
fixed #558 , Upgrade folder layers_scenes_transitions_nodes to rc3.
2011-07-01 11:26:26 +08:00
minggo
25b3b15151
Merge pull request #339 from minggo/iss549
...
[Android] fixed #549 : Add comments for playEffect()
2011-06-30 18:28:08 -07:00
minggo
67b85322ed
[Android] fixed #549 : Add comments for playEffect()
2011-07-01 09:24:40 +08:00
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
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
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
2b12ef4f56
issue #411 , add Zwoptex.cpp/.h & test resource into tests.xcodeproj
2011-03-30 14:54:42 +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
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
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
5f7357bf09
fixed #391,CCSpriteFrameCache support *.plist files with format value is not 0.
2011-03-29 11:56:14 +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
natural-law
e38d3a2277
Merge branch 'master' into iss434
...
Conflicts:
cocos2dx/platform/airplay/CCFileUtils_airplay.h
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
2011-03-28 17:06:32 +08:00
walzer
2f573a784e
fixed #435 , CocosDenshion crashes at foreground/background switching
2011-03-27 22:17:18 +08:00
natural-law
cee82fe9fa
issue #434,refactor class CCFileUtils on android and ios.
2011-03-26 17:24:37 +08:00
yangws
cd6352adec
add new files to vc2010 project.
2011-03-25 17:41:54 +08:00
walzer
2bd28bd2dd
issue #390 , add PerformanceTest into airplay port. But, oops, I cannot see anything in these test except "back to mainmenu".
2011-03-25 16:46:36 +08:00
walzer
9c1d462275
Merge branch '430' of https://github.com/yangws/cocos2d-x into yangws-430
2011-03-25 14:23:05 +08:00
walzer
a205df20a4
issue #390 , manually merge from Bin's work.
2011-03-25 13:59:08 +08:00
yangws
be966dbddb
fixed #430 Solved bug by replacing glColor4ub with glColor4f.
2011-03-25 13:50:57 +08:00
walzer
db4fb7cc9c
issue #427 , refactor ios port ok.
2011-03-24 17:51:29 +08:00
walzer
b9c56f1728
issue #427 , try to add CCSAXParser.h
2011-03-24 16:16:49 +08:00
natural-law
55143e3b9e
issue #391,implement functions:CCRectFromString, CCPointFromString and CCSizeFromString.
2011-03-24 10:38:08 +08:00
walzer
ef7fe5afd1
[airplay] issue #379 , fix search header paths with cause compilation error on release build
2011-03-24 10:19:52 +08:00
walzer
ed492bbd1e
[airplay] first commit of airplay port. Thanks for Аксёнов Максим's contribution!
2011-03-23 22:16:20 +08:00
natural-law
96d7cedadb
issue #411,implement the zwoptex test.
2011-03-22 14:59:10 +08:00
walzer
594dab24fc
Merge branch 'iss419' of https://github.com/natural-law/cocos2d-x into natural-law-iss419
2011-03-21 17:29:09 +08:00
natural-law
09be3e8fe5
[ios]fix #419,Enable the depth test when EAGLView is created.
2011-03-21 17:15:20 +08:00
walzer
9854370db3
fixed #410 , recheck the search header paths & libraries paths in xcode3 templates
2011-03-21 12:00:48 +08:00
walzer
ffeb116542
Merge branch 'issue_400' of https://github.com/minggo/cocos2d-x into minggo-issue_400
2011-03-18 16:32:20 +08:00
minggo
7b71a565ed
fixed #400 : change project.pbxproj of HelloWorld and test to include CCCamera.cpp
2011-03-18 16:09:21 +08:00
walzer
d8c28d3754
Merge branch 'issue_409' of https://github.com/minggo/cocos2d-x into minggo-issue_409
2011-03-18 15:59:01 +08:00
minggo
47173778cc
fixed #409 : rename NSArray UIAlignment
2011-03-18 14:31:29 +08:00
walzer
e62ff6c815
Merge branch 'issue_405' of https://github.com/minggo/cocos2d-x into minggo-issue_405
2011-03-18 14:08:52 +08:00
walzer
c15c1719ba
fixed #410 , recheck the header search path & library search path in HelloWorld, Tests, and all xcode3 templates
2011-03-18 14:06:04 +08:00
minggo
617d484257
[android] fixed #405 : pause BMG music when tap HOME and resume it when it is active
2011-03-18 11:12:06 +08:00
walzer
724ac1d0a9
Merge branch 'issue_403' of https://github.com/minggo/cocos2d-x into minggo-issue_403
2011-03-18 10:08:43 +08:00
minggo
7c52a521fa
fixed #403 : change UIEvent to CCEvent
2011-03-18 09:39:34 +08:00
yangws
12254f95f0
fixed #395 Add initInstance code for all platform in msvc templates.
2011-03-17 11:27:51 +08:00
yangws
61e2f56439
Add Retina display resource for tests.
...
Modify CCDrawingPrimitives.cpp for retina display support.
2011-03-15 15:12:50 +08:00
minggo
7571e1a51c
Merge branch 'dev' of https://github.com/natural-law/cocos2d-x into natural-law-dev
2011-03-15 09:29:47 +08:00
walzer
db1f54ee45
[ios] HelloWorld.jpg ->.png, xcode project from iOS4.1 to 4.2 "Lastest iOS"
2011-03-14 18:31:16 +08:00
natural-law
6d028007c2
Fix the bug of CCAnimationCache and CCSpriteFrame.Run SpriteTest successful.
2011-03-11 17:00:10 +08:00
minggo
723dd89fb7
Merge branch 'dev' of https://github.com/minggo/cocos2d-x into dev
2011-03-11 12:03:53 +08:00
minggo
69dcaddb51
Merge branch 'dev' of https://github.com/yangws/cocos2d-x into yangws-dev
2011-03-11 12:01:58 +08:00
minggo
9fa282c65c
[android] fix some bug and remove unneeded files
2011-03-11 11:56:33 +08:00
yangws
f0661a2679
fix 4 bugs:
...
1 call CCTextureCache::purgeSharedTextureCache() to release cached texture when enableRetinaDisplay is called.
2 enableRetinaDisplay performence correctly.
3 Modify libcocos2d project pre-link event performence corretly when the source in the path which contain white blacks.
4 Modify HiResTest, that can switch resouce dynamicly now.
2011-03-11 11:04:22 +08:00
unknown
8e429c422d
Build-win32.bat OK on win7
2011-03-10 21:11:14 +08:00
unknown
795f1b985f
Add VC2010 project files on win32
2011-03-10 19:50:17 +08:00
minggo
9a67fa6df1
Merge branch 'dev' of https://github.com/yangws/cocos2d-x into yangws-dev
2011-03-10 17:16:15 +08:00
natural-law
93aebbc469
[wophone]fixed #386,Resolve the compile conflict on wophone sdk.Modify the makefiles for wophone.
2011-03-10 14:24:13 +08:00
yangws
3fc701f1d2
fixed #300 Cocos2d-win32 application wizard for vs ok.
2011-03-10 12:00:29 +08:00
minggo
cb24e03466
Merge branch 'iss377' of https://github.com/natural-law/cocos2d-x into natural-law-iss377
2011-03-10 09:37:26 +08:00
natural-law
7c6147421b
[wophone]fixed #377,Replace the word "uphone" with "wophone".
2011-03-09 17:28:35 +08:00
minggo
12981fac89
fixed #375
2011-03-09 16:19:20 +08:00
minggo
75e2ecc16d
issue #387 : move platform_support into cocos2dx/platform
2011-03-09 14:40:05 +08:00
minggo
63d283d3e8
delete ccxString.h
2011-03-09 12:00:04 +08:00
minggo
f1d13ca2e1
issue #375 : android compiled ok
2011-03-08 13:49:58 +08:00
minggo
7a331e1e14
issue #375 : wophone compiled ok
2011-03-07 18:20:48 +08:00
minggo
b5a99f90df
issue #375 : rename file names and object names
2011-03-07 17:11:57 +08:00
minggo
aaf898cb72
merge master into dev
2011-03-07 09:52:45 +08:00
minggo
69edcb16af
fix a mergeing bug
2011-03-04 17:17:53 +08:00
minggo
661bae2797
merge natural-law-iss370
2011-03-04 16:32:54 +08:00
minggo
8e2f9c96b8
remove unneeded files
2011-03-04 16:22:53 +08:00
natural-law
aef83b2660
[uphone]Move Application from Application code to Cocos2dx/platform/ccxApplication.
2011-03-02 17:45:04 +08:00
yangws
395a0b3d47
AtlasTest rename to LabelTEst on win32.
2011-03-02 17:34:26 +08:00
minggo
4379a1c96f
Move ccxApplication to cocos2dx/platform on ios.
2011-03-02 17:05:22 +08:00
minggo
f58d2f8b32
[andriod] fixed #247 : support multitouch on android
2011-03-02 10:40:02 +08:00
minggo
0a5ec4c12b
[android] move MultiTouchController.java to cocos2dx/lib/touch
2011-03-02 10:34:49 +08:00
minggo
f7b401163b
Merge branch 'multitouchController' of https://github.com/Macarse/cocos2d-x into Macarse-multitouchController
2011-03-02 09:38:23 +08:00
minggo
e00222104f
merge yangws-issue360 into dev
2011-03-02 09:31:47 +08:00
minggo
89b4d07ed8
[android] fixed #368 : move Application code to cocos2dx/platform/ccxApplication
2011-03-01 19:53:39 +08:00
yangws
b54de8a3ef
fixed #360 Modify CCXAppWiz for win32, add initInstance function in class AppDelegate
2011-03-01 14:28:39 +08:00
minggo
b65d84551b
resolve confict when merging branch yangws-issue366
2011-03-01 14:08:18 +08:00
yangws
7bc7d32001
fixed #366 [win32] Move Application from Application code to Cocos2dx/platform/ccxApplication
2011-03-01 12:41:57 +08:00
minggo
1b6602f582
Merge branch 'WVGA_scale_android' of https://github.com/minggo/cocos2d-x into minggo-WVGA_scale_android
2011-02-28 10:00:55 +08:00
minggo
f504211e56
merge natural-law-iss332 to dev
2011-02-28 09:48:14 +08:00
minggo
498e0072e1
[android] fixed #358 : autoscale HVGA resource to WVGA
2011-02-26 15:52:57 +08:00
minggo
1428480c7f
[android] fixed #338:refactor platform_support
2011-02-25 13:35:27 +08:00
natural-law
6c54eb0a86
Update the tests from 0.99.4 to 0.99.5.
2011-02-25 11:31:49 +08:00
yangws
63cedd1317
Merge code of Platform_support for IOS.
2011-02-23 18:22:05 +08:00
natural-law
949c1000a8
update tests to 0.99.5.
2011-02-23 16:47:25 +08:00
Macarse
b52eed0782
blah
2011-02-22 22:32:24 -03:00
yangws
4d47babf9e
add ; after NS_CC_BEGIN
2011-02-19 18:16:45 +08:00
natural-law
4362a5f381
[uphone]issue #316,Resolution auto adjustment.
2011-02-19 17:44:43 +08:00
natural-law
60e9ae873c
Merge branch 'dev-retina' of https://github.com/yangws/cocos2d-x into iss316
...
Conflicts:
HelloWorld/AppDelegate.cpp
tests/AppDelegate.cpp
2011-02-19 10:19:14 +08:00
yangws
85b9c9ae21
Retina display support and scale with keep w/h rate ok on win32.
2011-02-18 18:30:22 +08:00
natural-law
245155e66a
[uphone]issue #340,Refactor platform_support on uphone,and run tests successful on both simulator and device.
2011-02-18 10:44:49 +08:00
Macarse
c6f4eab602
typo
2011-02-17 23:44:14 -03:00
Macarse
43a437a978
fixed small error
2011-02-17 23:28:17 -03:00
Macarse
4267593bf9
Used an array approach
2011-02-17 23:23:36 -03:00
natural-law
0a2ceee2c5
Merge branch 'dev' of https://github.com/cocos2d/cocos2d-x into dev
2011-02-12 17:24:41 +08:00
minggo
043d771f1a
Merge branch 'dev' of https://github.com/natural-law/cocos2d-x into natural-law-dev
2011-02-12 17:23:50 +08:00
natural-law
20409e7a58
delete the code for debug in cocos2d-android.
2011-02-12 17:20:13 +08:00
natural-law
8fcb9d017c
delete the code for debug in cocos2d-android.
2011-02-12 17:18:25 +08:00
yangws
8458476597
Merge branch 'dev' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5
...
Conflicts:
.gitignore
2011-02-12 16:42:47 +08:00
Macarse
24c4a477e3
Fixed issue for tests
2011-02-11 00:48:46 -03:00
Macarse
e1dfb21dd4
Added logic for POINTER_UP and POINTER_DOWN
2011-02-06 19:02:03 -03:00
Macarse
8d5995d5a6
First approach
2011-02-06 17:05:56 -03:00
Macarse
ab44dafc6c
Use SENSOR_DELAY_GAME for the SensorManager
2011-02-06 09:11:24 -03:00
Macarse
66038230eb
Added logic to disable sensors from the c++ code
2011-02-05 20:17:24 -03:00
Macarse
284c330569
Added code from walzer's comment
2011-02-01 00:11:42 -03:00
Macarse
fce540989d
First approach
2011-01-30 20:05:30 -03:00
yangws
34a6ca5208
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5
...
Conflicts:
cocos2dx/platform/win32/CCXUIImage_win32.cpp
cocos2dx/platform/win32/CCXUIImage_win32.h
tests/test.win32/test.win32.vcproj
2011-01-28 14:33:47 +08:00
yangws
76ea63da7f
Change prefix CCX to ccx.
2011-01-27 17:07:36 +08:00
minggo
d68d33b029
Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master
2011-01-27 09:56:45 +08:00
minggo
31f9969674
fixed #333 : fix compiling issue under linux
2011-01-27 09:49:06 +08:00
Macarse
89f012023e
Fix display issue with Samsung Galaxy Tab
2011-01-26 19:03:14 -03:00
minggo
046668c3f1
Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master
2011-01-26 10:02:26 +08:00
minggo
052e8634dc
[android]fix a bug of SimpleAudioEngine::playEffect()
2011-01-26 09:46:34 +08:00
minggo
9e2587c26c
Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master
2011-01-25 17:09:11 +08:00
minggo
acb6b67bd9
Merge branch 'master' of https://github.com/natural-law/cocos2d-x into natural-law-master
2011-01-25 17:08:04 +08:00
walzer
5d051a14fa
[iphone] fix the build error in SchedulerTest.cpp, use CCLOG instead of CCXLog
2011-01-25 16:56:46 +08:00
minggo
4fae086e8b
[android]: fps controller
2011-01-25 15:26:16 +08:00
natural-law
6a1b8d64aa
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
2011-01-25 15:09:34 +08:00
natural-law
d56575dd5a
[uphone]change the parameter order of function setResource.And add default value of the parameter pszResPath.
2011-01-25 14:26:26 +08:00
walzer
04aab22145
Merge branch 'natural-law-master'
2011-01-25 11:43:57 +08:00
minggo
59edc619a8
[android] to prevent preload effect many times
2011-01-25 11:30:25 +08:00
minggo
38b7e054bd
[android]fix the error of preloadEffect()
2011-01-25 11:29:15 +08:00
natural-law
800033d98b
fixed #329,use std::string to implement function CCBMFontConfiguration::parseConfigFile.
2011-01-24 15:53:52 +08:00
yangws
09748e88a1
SchedulerTest can output log now.
2011-01-24 14:52:16 +08:00
yangws
1a17f3ea55
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5
...
Conflicts:
cocos2dx/platform/win32/CCXApplication_win32.cpp
tests/test.win32/test.win32.vcproj
2011-01-22 17:52:06 +08:00
yangws
6ad3ec6bf0
HelloWorld and tests can run after move ccxApplication.
2011-01-22 17:30:00 +08:00
minggo
e23c1eb2f6
Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master
2011-01-22 16:45:26 +08:00
natural-law
5cf0ee5d90
[uphone]Modify the param of function get/set volume in SimpleAudioEngine from int to float.The Max/Min value changed to 1.0/0.0
2011-01-22 16:22:26 +08:00
minggo
4a4c0d3485
[android] fixed #321 : Frame control of android. It is not so accuracy.
2011-01-22 15:10:18 +08:00
minggo
882b473291
[iphone]: font support
2011-01-21 18:15:12 +08:00
minggo
b3fe7f5b6c
fixed #307:merge TestAudioEngine into tests
2011-01-21 16:26:51 +08:00
minggo
01a3e37db8
[android] fix bug of build_native.sh
2011-01-21 15:45:55 +08:00
minggo
cffc61d426
issue #307 : add music resource
2011-01-21 15:17:23 +08:00
minggo
e92970ec69
[android] fixed #311 : implement cocosdenshin on android
2011-01-21 15:15:09 +08:00
minggo
f9d0db48e1
issue #307 : merge TestAudioEngine into tests
2011-01-21 15:11:15 +08:00
yangws
333f0b5574
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5
...
Conflicts:
HelloWorld/AppDelegate.cpp
cocos2dx/particle_nodes/CCParticleSystem.cpp
cocos2dx/proj.win32/cocos2d-win32.vcproj
tests/AppDelegate.cpp
2011-01-20 11:18:35 +08:00
minggo
14fa024e48
Merge https://github.com/cocos2d/cocos2d-x into merger
2011-01-20 09:22:29 +08:00
walzer
9041d03d3b
[uphone] issue #307 , config test.vcproj uphone for TestAudioEngine merger.
2011-01-19 18:02:35 +08:00
minggo
d64ac9fdb8
issue #311 : cocosdenshion for android
2011-01-19 16:00:19 +08:00
yangws
804dc4ef7c
Merge branch 'upto-0.99.5' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5
...
Conflicts:
cocos2dx/platform/CCArchOptimalParticleSystem.h
cocos2dx/platform/win32/CCXBitmapDC.cpp
cocos2dx/proj.win32/cocos2d-win32.vcproj
2011-01-19 15:29:08 +08:00
yangws
79b711a758
move CCXBitmapDC from cocos2d/platform to platform_support.
2011-01-19 14:23:26 +08:00
natural-law
ec7c24ad8d
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into merge
2011-01-19 10:03:39 +08:00
natural-law
f992838f96
[uphone]fixed #293,Modify the absolute path method in CCFileUtils.
2011-01-18 18:21:06 +08:00
walzer
a58acc79f3
[iphone] fixed #301 , add info.plist for HelloWorld & tests
2011-01-18 12:02:27 +08:00
natural-law
c682dd7084
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into merge
2011-01-18 10:16:35 +08:00
natural-law
acb4a6a369
[uphone]fixed #293,modify the absolute path method in CCFileUtils.
2011-01-18 10:14:44 +08:00
walzer
04c685b95a
issue #289 , fix some warnings
2011-01-17 21:16:25 +08:00
walzer
b60e1e1ff8
Merge branch 'master' of https://github.com/yangws/cocos2d-x into yangws-master
2011-01-17 20:37:23 +08:00
yangws
d2a116b001
fixed bug: Post build error on win32 when compiled project which the project's path string has space.
2011-01-17 18:01:20 +08:00
walzer
ad5ee3c9f6
Merge remote branch 'remotes/origin/upto-0.99.5' Fix some conflicts manually.
2011-01-17 16:21:11 +08:00
yangws
67c0ad6332
add platform support project on win32.
...
Move macros, CCXUIImage, ccxCommon, CCXCocos2dDefine, 3rd party libraries, glu, NSLock, ccxConfig from platform/win32 to platform_support.
2011-01-15 18:05:35 +08:00
natural-law
9ccbb62f6e
fixed #313,Modify the main menu of tests project from page-turning to scroll.
2011-01-12 18:00:11 +08:00
natural-law
237042f7dd
fixed #309,App will not crash any more when surface re-created.
2011-01-10 17:54:44 +08:00
minggo
78a7329054
Merge branch 'upto-0.99.5' of https://github.com/natural-law/cocos2d-x into natural-law-upto-0.99.5
2011-01-08 09:27:58 +08:00
natural-law
c02a9a4dd5
Setting apk file path at runtime in cocos2d-android.
2011-01-07 16:29:06 +08:00
minggo
321c8098f3
make tests runs ok on iphone
2011-01-07 11:49:17 +08:00
natural-law
ec7fbd0e69
Fix bugs.
...
1. Run tests and HelloWorld in cocos2d-android.
2. Modify the makefile of cocos2d-uphone.
2011-01-07 11:30:19 +08:00
natural-law
0d2d746aec
Fix bugs.Run tests in cocos2d-uphone successful.
2011-01-05 17:01:08 +08:00
natural-law
25e9721678
fix bugs.
2011-01-04 17:46:23 +08:00
Walzer
4a6989b6ff
[uphone] add keyMenuBack to CCKeypadDelegate
2010-12-31 18:15:30 +08:00