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

2674 Commits

Author SHA1 Message Date
minggo 63839de12a Merge https://github.com/cocos2d/cocos2d-x into iss347 2011-08-01 18:23:14 +08:00
minggo 895d4992e4 issue #347: FontTest runs ok on iOS 2011-08-01 18:22:47 +08:00
Walzer 44ffdfde60 Merge pull request #435 from natural-law/master 
fixed #644
 2011-07-31 20:28:05 -07:00
natural-law 5b0f25466a Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2011-08-01 10:45:40 +08:00
natural-law bf44d13bc9 fixed #644, m_bUseBatchNode of all sprite drawn by CCSpriteBatchNode should be false after CCSpriteBatchNode::removeAllChildrenWithCleanup() invoked. 2011-08-01 10:44:18 +08:00
minggo 52df611822 Merge pull request #434 from flyingpacer/641 
fixed #641 the user could save buffer to any path
 2011-07-31 18:20:28 -07:00
minggo 9aaae1007c Merge pull request #433 from natural-law/master 
Resolve the cocos2d compile error on wophone.
 2011-07-31 18:19:36 -07:00
Eli Yukelzon 41bdb281dc corrected bug and leak in getBool 2011-07-31 15:31:39 +03:00
Eli Yukelzon af61a7c650 added support for optional default values in CCUserDefault getters 2011-07-31 15:08:25 +03:00
Eli Yukelzon 9c5fa51e6b usuful macros for defining scene() and node() methods with params 2011-07-30 11:55:38 +03:00
Eli Yukelzon b2dce6ab80 Merge remote-tracking branch 'upstream/master' 2011-07-30 09:32:44 +03:00
minggo a3b4043755 issue #347: add tests for FontTest & it works ok on android 2011-07-29 15:57:27 +08:00
RongHong a54fda812b fixed #641 the user could save buffer to any path 2011-07-29 11:36:04 +08:00
minggo 21737d2ce0 issue #347: update xcode3 template for ttf support 2011-07-29 10:27:49 +08:00
minggo cfb3765035 issue #347: iOS support font defined by ttf file 2011-07-29 10:15:10 +08:00
natural-law d37a694529 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 
Conflicts:
	cocos2dx/platform/CCImage.cpp
 2011-07-29 09:51:43 +08:00
natural-law 5ad318fa71 Resolve the cocos2d compile error on wophone. 2011-07-29 09:50:06 +08:00
minggo 87f0b6c63f Merge pull request #431 from flyingpacer/640 
fixed #640 the image read from render texture is upseted
 2011-07-28 18:42:14 -07:00
Eli Yukelzon 41ec0ba945 modification to support radio menu 2011-07-28 22:18:45 +03:00
Eli Yukelzon 9d2b0664fa parallel build 2011-07-28 21:03:30 +03:00
reflog ae945f4880 changes to support CCScrollLayer 2011-07-28 17:09:06 +03:00
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