Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
2,567 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

521 Commits

Author SHA1 Message Date
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