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

1478 Commits

Author SHA1 Message Date
Walzer 3afe6ebfb2 fixed #638, add support for pvr ccz format. I've tested it on both ios & android, also with instrument memleak detection. But haven't tested on win32 & marmalde, in thoery it will work. 2011-08-16 11:56:17 +08:00
Walzer 0881668cc2 fixed #661. Thanks to GMTDev's previous resolvtion. And I fix the compilation error in the his patch: add float m_fContentScaleFactor declaration into CCTMXLayer.h, fix tile->setPositionIn to tile->setPosition. I just run TiledMapTest in retina mode, it works well 2011-08-15 12:10:11 +08:00
GavT f47df23363 Fixed problems with iPhone Retina mode TMX Tiled map support. Uses "ContentScaleFactor" to divide down some Rect coordinates and changed some "setPositionInPixels" to "setPosition" too. See bug #661 http://www.cocos2d-x.org/issues/661 
Also added "float m_fContentScaleFactor" in the class CCTMXLayer.h
 2011-08-11 20:47:54 -07:00
Walzer 4aa33b0942 Merge pull request #463 from minggo/master 
fixed #668
 2011-08-10 19:32:44 -07:00
Walzer 6d3941ebc1 Merge pull request #464 from leon-li/master 
fix some warnings under xcode 4.0 llvm clang
 2011-08-10 19:32:16 -07:00
Leon 771e2349c5 fix some warnings under xcode 4.0 llvm compiler 2011-08-10 22:39:02 +08:00
minggo 9a884ffda6 [iOS] fixed #668: CCLabelBMFont looks ok in retina mode 2011-08-10 15:07:34 +08:00
Walzer 6eba0b658f fixed #651, add CCFileUtils to doxygen api document 2011-08-08 23:05:47 +08:00
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
liswei 70e19d7245 fixed #347 fixed 'AddFontResource' path error! 2011-08-08 10:32:21 +08:00
Walzer 976d886263 Merge pull request #455 from giom/master 
Lua AddSearchPath issue #647
 2011-08-05 18:43:44 -07:00
minggo 2d5a04b9ca Merge pull request #454 from flyingpacer/608 
fixed #608 rendertexture disappears after going to background
 2011-08-04 23:55:26 -07:00
minggo dd43f16c8e fixed #622: add comment of CCUserDefault 2011-08-05 11:02:42 +08:00
RongHong 5f08bb24fe Merge branch 'master' into 608 2011-08-05 10:59:40 +08:00
minggo 016c463659 Merge pull request #449 from flyingpacer/savecrash 
fixed #657 Latest git version was broken
 2011-08-04 02:39:33 -07:00
minggo 76da5f2e84 fixed #656: remove unneeded methods & android can let user set resource path 2011-08-04 17:19:58 +08:00
RongHong 4745b85af9 fixed #657 Latest git version was broken 2011-08-04 16:37:43 +08:00
liswei bbc4bbeb6c issue #347 lost [] in 'delete array' 2011-08-04 13:47:21 +08:00
liswei 897dd54b12 fixed #347 add ttf support in win32 2011-08-04 11:23:59 +08:00
minggo 78ffea3049 Merge pull request #443 from natural-law/master 
fixed #513
 2011-08-02 23:35:35 -07:00
minggo 6892787afa fixed #653: add CCScheduler::unscheduleScriptFunc() 2011-08-03 14:15:35 +08:00
natural-law 3a80e51d25 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2011-08-03 11:39:03 +08:00
natural-law 94f2d8a5e2 fixed #513, CCProgressTimer support sprite generated from CCSpriteFrame. 2011-08-03 11:38:38 +08:00
minggo 78642a39ac [android] fixed #652: refactor JniHelper::jstringtochar() 2011-08-03 10:44:39 +08:00
minggo b9374663cd Merge pull request #440 from flyingpacer/savecrash 
fixed #649 the user could save any domain of the render texture
 2011-08-02 03:16:20 -07: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 188b168d30 issue #347 add ttf support in wophone 2011-08-02 18:02:27 +08:00
RongHong 4a8e3f468e fixed #649 the user could save any domain of the render texture 2011-08-02 17:22:57 +08:00
minggo 09dc164fff issue #645: update to v1.0.1 2011-08-02 15:45:27 +08:00
RongHong 3a3a52c59a fixed #649 the user could save any domain of the render texture 2011-08-02 14:25:58 +08:00
minggo 730ff63c9f rename scene to node 2011-08-02 14:09:23 +08:00
minggo c4d1dedba8 Merge https://github.com/reflog/cocos2d-x into reflog 2011-08-02 14:03:34 +08:00
minggo 9fe868b881 Merge pull request #438 from natural-law/master 
Use the setter to set the value of m_tAnchorPoint.
 2011-08-01 21:39:43 -07:00
natural-law 9a86582cd2 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2011-08-02 11:06:47 +08:00
natural-law d6221cfa36 Use the setter to set the value of m_tAnchorPoint. 2011-08-02 11:02:02 +08:00
RongHong d575d40ab3 fixed #648 savebuffer may crash on some machines like Motorola Defy 2011-08-02 10:27:52 +08:00
RongHong 335d2d30b4 fixed #648 savebuffer may crash on some machines like Motorola Defy 2011-08-02 10:05:15 +08:00
Guillaume Maury f86da27a38 Merge branch '0.9.0' 2011-08-02 03:49:36 +08:00
Guillaume Maury b789927ca3 added possibility to add a path to the lua search path (package.path/LUA_PATH) 2011-08-02 03:47:39 +08:00
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
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
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 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
reflog ae945f4880 changes to support CCScrollLayer 2011-07-28 17:09:06 +03: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
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
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
RongHong a253909030 fixed #630 To realize the buffer-saving function in CCRenderTexture 2011-07-27 16:55:04 +08:00
RongHong 8afa3a9be1 fixed #619 CCFadeTo may crashed on android 2011-07-27 16:21:00 +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
liswei 1e8e036da7 issue #633 add playeffect loop in wophone 2011-07-26 17:04:39 +08:00
minggo b308effdc5 [android] fixed #631: Send \n to engine when user input nothing 2011-07-26 11:41:28 +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 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
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
Walzer 45e8915963 fixed #628, CCMutableArray::arrayWithObjects & arrayWithArray should set the return object to autorelease. And add CCAnimation::m_pobFrames->retain() after it get value from arrayWithArray. (it's property with retain in -iphone version but we miss the retain) 2011-07-24 08:30:49 +08:00
minggo 62ea6a2d46 issue #623: create JniHelper and use it somewhere 2011-07-22 18:14:29 +08:00
minggo 0dac01b3d8 Merge pull request #409 from natural-law/master 
fixed #621
 2011-07-20 00:43:02 -07:00
minggo 36a1f574b3 Merge pull request #408 from minggo/iss620 
[win32] fixed #620: change the output of lua to a lib
 2011-07-20 00:40:53 -07: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 3e080476f3 [win32] fixed #620: change the output of lua to a lib 2011-07-20 15:21:51 +08:00
minggo 6996ccee95 Merge pull request #407 from leon-li/master 
fix: passing std::string object to CCLOG
 2011-07-19 20:42:29 -07:00
Leon 6426e96f82 Merge remote branch 'upstream/master' 2011-07-20 11:42:00 +08:00
Leon 5f1f63dabf fix: passing std::string object to CCLOG 2011-07-20 08:52:29 +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
Leon d2d02e0c52 fix compile error with android-ndk-r6 2011-07-19 16:54:42 +08:00
Walzer d2b44a203f issue #536, build success on win32 2011-07-19 16:03:42 +08:00
minggo 640d811809 [android] fixed #618: invoke java code(System.exit()) to finish programe 2011-07-19 16:01:22 +08:00
Walzer 768bfa9a9b issue #536, add CCTexturePVR, update from 0.99.5 to 1.0.0, remove _POWERVR_SUPPORT marco, use CC_SUPPORT_PVRTC instead, the plan is to support PVR format on all platforms. Compile successfully on ios & android, but haven't compile on other paltforms. Test case haven't written yet. 2011-07-19 15:22:13 +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 7a12bb9cdc fixed #613: Call executeCallFuncN instead of executeCallFunc in CCMenuItem::activate() 2011-07-18 10:31:41 +08:00