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

788 Commits

Author SHA1 Message Date
minggo dc55c164ba fixed #292 2010-12-29 18:01:37 +08:00
minggo 355570ea8f issue #292 2010-12-28 15:05:55 +08:00
minggo b2b8591b26 fixed #279 2010-12-28 10:23:14 +08:00
minggo 33ad2881b7 merge mingo-upto-0.99.5 to upto-0.99.5 2010-12-27 11:06:44 +08:00
minggo 28a3857f95 Merge branch 'natural-law-upto-0.99.5' into upto-0.99.5 2010-12-27 10:59:03 +08:00
minggo 4e35a660dc Merge branch 'upto-0.99.5' of https://github.com/yangws/cocos2d-x into yangws-upto-0.99.5 2010-12-27 10:55:59 +08:00
minggo 4cd3e59e2b fixed #278 2010-12-27 10:26:56 +08:00
natural-law 46e78ab7a1 update layers_scenes_transition_nodes to 0.99.5. 2010-12-25 18:07:34 +08:00
yangws c142070c2c misc_node upto-0.99.5. 
Signed-off-by: yangws <yangws@cocos2d-x.org>
 2010-12-25 15:09:42 +08:00
natural-law 6ee16ce878 update menu_nodes to 0.99.5 2010-12-25 11:15:19 +08:00
minggo 07b774bc6f Merge branch 'natural-law-upto-0.99.5' into upto-0.99.5 2010-12-25 09:24:15 +08:00
natural-law 969e65b959 Merge branch 'upto-0.99.5' of https://github.com/cocos2d/cocos2d-x into merge 2010-12-24 17:33:18 +08:00
natural-law 4a64f899fe update label_nodes to 0.99.5. 2010-12-24 17:07:31 +08:00
minggo e7231f232c fixed #276 2010-12-24 15:53:51 +08:00
minggo c6b7fd82a9 Merge branch 'upto-0.99.5' of https://github.com/cocos2d/cocos2d-x into merger 2010-12-24 15:25:28 +08:00
minggo d6fb209861 merged from minggo-upto-0.995 to upto-0.99.5 2010-12-24 15:21:57 +08:00
minggo f92b0d514e fixed #273 2010-12-24 15:04:26 +08:00
natural-law 0f0a8ed956 rename the files related to label_nodes. 2010-12-24 14:00:49 +08:00
natural-law e11ccb50fe fixed #283 Add member data m_positionInPixels for some classes. 2010-12-24 11:40:44 +08:00
minggo e3b49d7504 merge from minggo and natual-raw 2010-12-23 17:40:23 +08:00
natural-law 3c6d1d8317 update actions to 0.99.5 2010-12-23 16:47:29 +08:00
minggo 6d98bc7b5d Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into merge 2010-12-23 16:22:37 +08:00
minggo 7e4d8b9d1c set up base environment 2010-12-23 16:16:11 +08:00
minggo 3692d01c5a fixed #288 2010-12-23 14:18:08 +08:00
minggo 994a3b05ea fixed #273 2010-12-23 11:19:56 +08:00
natural-law eeb4e99804 rename the action classes. 2010-12-22 15:43:54 +08:00
natural-law 4a765d33a3 rename the CCXXXAction files to CCActionXXX. 2010-12-22 15:15:04 +08:00
Walzer f65a6eb90b [iphone-cpp] load image from buffer, support some PD formats 2010-12-20 18:46:58 +08:00
walzer 02bbc49111 Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master 2010-12-18 16:47:27 +08:00
Walzer 639d75e6eb Merge branch 'master' of https://github.com/yangws/cocos2d-x into yangws-master 2010-12-18 16:36:08 +08:00
minggo 9aa7e1bc84 fixed #245 2010-12-18 16:12:59 +08:00
minggo 87b926c74f match the declaration of cocos2dVersion 2010-12-18 16:08:57 +08:00
yangws 6d71a5b0f2 if defined COCOS2D_DEBUG, show messagebox when UIImage can't find resource file on disk. 2010-12-18 15:00:26 +08:00
natural-law 792781f5d6 fixed #266 fix a bug of message box in cocos2d-uphone pop-up at the wrong time. 2010-12-18 14:44:24 +08:00
Walzer 5c858b182c issue #243, fix warnings 2010-12-18 12:02:57 +08:00
Walzer edc742d41b Merge branch 'master' of https://github.com/leon-li/cocos2d-x into leon-li-master 2010-12-18 10:26:22 +08:00
Walzer 5f563102e9 fixed #265 2010-12-18 08:17:53 +08:00
Walzer 6de3f0f404 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2010-12-18 08:10:14 +08:00
Leon 96f4f5c9fd fix some compiling warning for iOS 2010-12-17 23:44:19 +08:00
Walzer 641bea0abc fixed #265 compile error when enable CC_XXX_DEBUG_DRAW switchs in ccConfig.h 2010-12-17 23:18:03 +08:00
Walzer 988d7289b8 Merge branch 'master' of https://github.com/yangws/cocos2d-x into yangws-master 2010-12-17 20:40:16 +08:00
Walzer 63bfa195db Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master 2010-12-17 20:36:24 +08:00
yangws 53bc90f634 fix UImage Constructor error 2010-12-17 18:16:31 +08:00
yangws caf518f97d fixed: helloworld win32 release configure build error, CCTMXTiledMap.cpp Access NULL pointer error. 2010-12-17 17:20:39 +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 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