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

3004 Commits

Author SHA1 Message Date
minggo 4d8558eec9 Merge pull request #430 from natural-law/master 
fixed #636
 2011-07-28 03:07:30 -07:00
minggo 50038b7cc2 Merge https://github.com/cocos2d/cocos2d-x into iss347 2011-07-28 18:06:20 +08:00
RongHong c7aa948817 fixed #640 the image read from render texture is upseted 2011-07-28 18:02:25 +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
natural-law a7404dc2bf fixed #639, Initialize the m_tPosition of CCParticleSystem with the setter. 2011-07-28 16:16:51 +08:00
natural-law d4db9eb566 fixed #636, Modify the implementation of method CCTextureCache::textureForKey(). 2011-07-28 15:08:07 +08:00
minggo 4d92b15152 Merge pull request #429 from leon-li/master 
add CCMenu::init() and CCMenu::menu() to create empty menus
 2011-07-27 23:45:49 -07:00
Leon a8e4d5ea89 rename CCMenu::menu() -> CCMenu::node() 2011-07-28 14:24:24 +08:00
Leon 4c06cb853b Merge remote branch 'upstream/master' 2011-07-28 12:27:07 +08:00
minggo ec2ef97be2 Merge pull request #426 from flyingpacer/630 
fixed #630 To realize the buffer-saving function in CCRenderTexture
 2011-07-27 20:19:14 -07:00
RongHong 0f94423b9b fixed #630 To realize the buffer-saving function in CCRenderTexture 2011-07-28 10:52:09 +08:00
Leon 4510101e96 add CCMenu::init() and CCMenu::menu() to create empty menus 2011-07-28 10:45:32 +08:00
RongHong aec1ddc4b4 Merge branch 'master' into 630 2011-07-28 10:10:47 +08:00
RongHong eda6228374 fixed #630 To realize the buffer-saving function in CCRenderTexture 2011-07-28 10:09:56 +08:00
minggo f88f0c042b Merge pull request #427 from liswei/issue633 
fixed #633 add playeffect looply,in win32
 2011-07-27 19:04:17 -07:00
minggo 3b60111662 Merge pull request #428 from minggo/iss625 
fixed #637: rename derectory name from Resource to Resources
 2011-07-27 19:03:06 -07:00
minggo 65f3d53aae fixed #637: rename derectory name from Resource to Resources 2011-07-28 09:58:44 +08:00
liswei 52cdcbcbe4 fixed #633 add playeffect looply,in win32 2011-07-28 09:58:10 +08:00
RongHong a253909030 fixed #630 To realize the buffer-saving function in CCRenderTexture 2011-07-27 16:55:04 +08:00
minggo ec416cf674 Merge pull request #425 from flyingpacer/619 
fixed #619 CCFadeTo may crashed on android
 2011-07-27 01:28:37 -07:00
RongHong 8afa3a9be1 fixed #619 CCFadeTo may crashed on android 2011-07-27 16:21:00 +08:00
minggo fb1132bbf8 Merge pull request #424 from natural-law/master 
issue #632
 2011-07-26 23:50:25 -07:00
natural-law 01841b67bb issue #632, Modify the template vcproj file. 2011-07-27 14:47:56 +08:00
minggo 18eeb4a642 Merge pull request #423 from natural-law/master 
fixed #632
 2011-07-26 23:36:57 -07:00
natural-law 2e9d813628 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2011-07-27 14:29:14 +08:00
natural-law d905e7d475 fixed #632. Update the visual studio template for lua supported. 2011-07-27 14:28:22 +08:00
minggo b4cb43913b Merge pull request #422 from minggo/iss625 
[android] fixed #625
 2011-07-26 20:56:27 -07: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 33e85bdc53 Merge pull request #421 from leon-li/master 
add CCMenuItem::setTarget
 2011-07-26 18:48:24 -07:00
Leon c5f7036f7b add CCMenuItem::setTarget 2011-07-26 18:41:58 +08:00
minggo a9033e30a8 Merge pull request #420 from liswei/issue633 
issue #633 add  playeffect loop in wophone
 2011-07-26 02:20:47 -07:00
liswei 1e8e036da7 issue #633 add playeffect loop in wophone 2011-07-26 17:04:39 +08:00
minggo ef02190b47 Merge pull request #419 from minggo/iss633 
issue 633: iOS & Android support looping playing effect
 2011-07-26 01:21:11 -07: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 9e6bac803e Merge pull request #418 from minggo/master 
[android] fixed #631: Send \n to engine when user input nothing
 2011-07-25 20:45:40 -07:00
minggo b308effdc5 [android] fixed #631: Send \n to engine when user input nothing 2011-07-26 11:41:28 +08:00
minggo ccb46d7c9b Merge pull request #417 from natural-law/master 
fixed #632
 2011-07-25 20:25:25 -07:00
natural-law 0a8c1cada4 fixed #632, [win32] Update the visual studio template for lua supported. 2011-07-26 11:15:12 +08:00
Walzer 20bba80c73 Merge remote branch 'origin/master' 2011-07-25 15:02:41 +08:00
Walzer 059e5ebc0b add "virtual" keyword to the destructor of CCMutableArray, to prevent someone delete it as a CCObject and cause memory leak 2011-07-25 15:00:00 +08:00
minggo 912ac3c8fe Merge pull request #415 from minggo/iss623 
[android] fixed #623: refactor Cocos2dJni.cpp
 2011-07-24 23:23:00 -07:00
minggo ab4ef0f180 Merge https://github.com/cocos2d/cocos2d-x into iss623 2011-07-25 14:13:20 +08:00
minggo b105b6005e [android] fixed #623: refactor Cocos2dJni.cpp 2011-07-25 14:12:30 +08:00
minggo 461fb43f1f Merge pull request #412 from minggo/iss624 
[android]fixed #624: insert white space in front of \n
 2011-07-24 18:48:45 -07:00
Walzer f47ff921e2 Merge pull request #414 from leon-li/master 
fix warning under android
 2011-07-24 06:12:25 -07:00
Leon 9ce402655d Merge remote branch 'upstream/master' 2011-07-24 12:24:16 +08:00
Leon 864878d15a fix warning on android 2011-07-24 12:16:40 +08:00
Walzer b43d233c08 issue #629, pass eImgFmt param to initWithImageData. But still haven't add test case for this. 2011-07-24 09:04:08 +08:00