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

12006 Commits

Author SHA1 Message Date
Walzer 5a4c721f0c modify build_natvie.sh to use unix line feed character 2010-12-17 15:43:36 +08:00
yangws a472ecff0c Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2010-12-17 11:49:09 +08:00
minggo 012812a8f5 Because platform/android/ccx_Common_android.cpp is rename to platform/android/ccxCommon_android.cpp, so the Android.mk should change too. 2010-12-17 11:48:46 +08:00
minggo e287466c2f fixed #246 2010-12-17 11:39:25 +08:00
Walzer c8989c7941 fix a memory leak when invoking png_destroy_read_struct, for uphone & andorid platform 2010-12-17 10:14:56 +08:00
Walzer b55ef3cd69 Merge branch 'master' of https://github.com/mattjesson/cocos2d-x into mattjesson-master 2010-12-17 10:03:57 +08:00
Walzer 91cfae3d54 remove useless win32.vcproj.user 2010-12-16 23:09:48 +08:00
Walzer 0b8d5c96f7 fixed #263, compilation error while enableing CC_SPRITE_DEBUG_DRAW 2010-12-16 22:37:15 +08:00
unknown 31951603a4 Fixed a memory leak in the Win32 version of the PNG reading code. 
The png_info struct wasn't being properly free'd (leaving behind row data).
(looks like it might also apply to the 'uphone' version but I have no way of testing)
 2010-12-16 12:23:27 +00:00
Walzer 063f595e9a Merge branch 'master' of https://github.com/natural-law/cocos2d-x into natural-law-master 2010-12-16 12:03:25 +08:00
natural-law 95e697d316 fixed #262 Add namespace for the project CocosDenshion. 2010-12-15 18:28:18 +08:00
minggo 53753b65b5 merge bada platform 2010-12-15 18:05:02 +08:00
impact 7434748d4a Capitalization changes for building on linux (case-sensitive filesystem) 2010-12-15 01:00:35 -05:00
natural-law 9af3d2874d fixed #261 Fix a bug of function SoundPlayer::PlaySoundFromMem(). 2010-12-14 18:03:31 +08:00
natural-law b8b5c2e8cd fixed #258 Modify the files which include FileUtils.h. 2010-12-14 14:05:35 +08:00
natural-law 2576bbe5b4 Merge branch 'master' into iss258 2010-12-14 13:53:25 +08:00
Walzer 02e95f6b06 issue #243 fix a memory leak point of iphone-cpp version. but the leaks isn't completely clear yet. 2010-12-14 11:21:44 +08:00
unknown acc30e35b1 Merge branch 'master' of https://github.com/natural-law/cocos2d-x into natural-law-master 2010-12-14 11:10:46 +08:00
unknown 57770086e6 Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master 2010-12-14 11:09:36 +08:00
natural-law 2c84b167e0 fixed #258 Move FileUtils.h from path "support/file_support" to path "include". 2010-12-14 10:45:23 +08:00
natural-law 341e7efb27 fixed #251 add a test case for CCKeypadDelegate 2010-12-14 10:23:20 +08:00
minggo a33823706d fixed #259 2010-12-14 09:42:39 +08:00
natural-law 8cb331994d Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into merge 2010-12-13 17:55:02 +08:00
unknown 7cc2498756 Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master 2010-12-13 16:53:16 +08:00
natural-law 2706e3a003 fixed #251 CCKeypadDelegate implement 2010-12-13 14:10:39 +08:00
minggo 4e0d856151 fixed #256 2010-12-13 11:36:35 +08:00
minggo e620bbdfe9 fixed #257 2010-12-13 11:21:58 +08:00
Walzer 0766e7cf35 Merge branch 'master' of https://github.com/yangws/cocos2d-x into yangws-master 2010-12-13 11:05:29 +08:00
Walzer 781ef1b2cb Merge branch 'master' of https://github.com/natural-law/cocos2d-x into natural-law-master 2010-12-13 10:54:02 +08:00
minggo faa3063ad0 Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master 2010-12-11 17:41:33 +08:00
minggo 2f0f89abb1 fixed #255 2010-12-11 17:34:07 +08:00
minggo 3aae3196fa Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master 2010-12-11 14:18:47 +08:00
minggo 9b68538a2a fixed #250 2010-12-11 14:01:32 +08:00
minggo 1f34709c03 Merge branch 'master' of https://github.com/minggo/cocos2d-x 2010-12-11 13:40:16 +08:00
minggo 562930f816 fixed #252 2010-12-11 13:33:53 +08:00
minggo 817af55e1e Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master 2010-12-11 13:26:26 +08:00
minggo b7e78d82ab fixed #254 2010-12-11 13:18:33 +08:00
natural-law 0ab7e88f9f fixed #249 implement read sound data from zip file in SimpleAudioEngine 2010-12-11 11:08:03 +08:00
yangws 3a81cf7208 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2010-12-11 09:51:51 +08:00
yangws c4d0a45f3d add feature header file in CCXAppWiz HelloWorldScene.h 2010-12-11 09:50:46 +08:00
Walzer 9737e908ab Merge branch 'master' of https://github.com/natural-law/cocos2d-x into natural-law-master 2010-12-11 09:49:59 +08:00
yangws 851856d3da add feature header file in CCXAppWiz HelloWorldScene.h 2010-12-10 16:59:59 +08:00
Walzer dec419be71 Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master 2010-12-10 10:34:41 +08:00
Walzer 5babcbca6b fixed #248, crashed in CCSprite::setDisplayFrame 2010-12-10 10:31:14 +08:00
natural-law 6c1eb5d5c0 fixed #227 integrate multi-touch support on uphone 2010-12-09 18:28:16 +08:00
minggo f3126de646 Merge branch 'master' of https://github.com/yangws/cocos2d-x into yangws-master 2010-12-09 13:59:02 +08:00
yangws 1151cea7dd fixed 233 keep the backlight on when the cocos2d-game at foreground. 
Signed-off-by: yangws <yangws@cocos2d-x.org>
 2010-12-09 11:41:32 +08:00
minggo 6b37bc97d4 fixed #220: run tests on android 2010-12-09 10:50:02 +08:00
unknown 9c06a69ed9 Merge branch 'master' of https://github.com/natural-law/cocos2d-x into natural-law-master 2010-12-08 18:05:17 +08:00
unknown 4d22e3b263 Merge branch 'master' of https://github.com/yangws/cocos2d-x into yangws-master 2010-12-08 18:03:35 +08:00