Commit Graph

84 Commits

Author SHA1 Message Date
Didiet Noor 00e504356a Fixing Warning on CLang 3.0 on XCode 4.2 2011-12-15 01:46:55 +08:00
Giovanni Zito 0a7a000c2d Changed symbols from "airplay" to "marmalade", added files and folders for marmalade 2011-12-08 12:21:48 +01:00
minggo f0d22ae504 issue : replase assert with CCAssert 2011-11-28 17:28:43 +08:00
Leon 77b3a32e16 fix compile error on 64 bit Linux 2011-10-19 15:12:38 +08:00
minggo a56034f177 fixed a assert error 2011-09-29 16:07:18 +08:00
dumganhar eadaba8930 modify CCRect::CCRectMake to CCRectMake in CCTMXLayer.cpp
modify HelloWorld project setting, use relative path
remove lib/linux/Debug/*.so and lib/linux/Release/*.so
remove some temp files
2011-09-19 10:51:05 +08:00
minggo e2bb1d49e5 fixed : set z tag of appended tile 2011-09-06 14:01:08 +08:00
moadib a8d87a9976 Non-trivial arguments passed by reference now.
Removed unnecessary cocos2d:: prefix inside namespace.
2011-08-17 17:26:26 +04:00
Walzer 0881668cc2 fixed . 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 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
minggo 09dc164fff issue : update to v1.0.1 2011-08-02 15:45:27 +08:00
natural-law 8b5282a0cf fixed , The test case TMXGIDObjectsTest in TileMapTest not crash any more. 2011-07-12 14:21:29 +08:00
minggo 70ce4f877f fixed : upgrade tileMap_parallax_nodes to 1.0.0-rc3 2011-07-04 14:11:43 +08:00
natural-law 0378a6a36d Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
Conflicts:
	cocos2dx/include/CCNode.h
2011-07-01 16:24:23 +08:00
natural-law 7d7f3a9241 fixed , Upgrade folder sprite_nodes to rc3. 2011-07-01 16:11:31 +08:00
liswei 1591c7edc8 fixed fix warnings in /Wall flag 2011-06-10 17:51:37 +08:00
natural-law 5d2ac1fc0c fixed , Use CCArray instead of CCMutableArray as the parameter type of CCNode::m_pChildren. 2011-04-21 14:46:15 +08:00
natural-law da7c608ab8 fixed . Modify the location of allocate memory for m_pTMXLayers. 2011-04-12 15:31:54 +08:00
natural-law ba933f9456 fixed , modify the implementation of function CCTMXTiledMap::layerNamed(). 2011-04-11 15:59:59 +08:00
minggo 7d52161804 fixed : Initialize pointer in contruction & detect pointer value in destruction 2011-04-01 16:06:53 +08:00
natural-law e38d3a2277 Merge branch 'master' into iss434
Conflicts:
	cocos2dx/platform/airplay/CCFileUtils_airplay.h
	template/xcode3/cocos2d-x_app/___PROJECTNAME___.xcodeproj/project.pbxproj
	template/xcode3/cocos2d-x_box2d_app/___PROJECTNAME___.xcodeproj/project.pbxproj
	template/xcode3/cocos2d-x_chipmunk_app/___PROJECTNAME___.xcodeproj/project.pbxproj
2011-03-28 17:06:32 +08:00
natural-law 28a940ab57 issue #434,refactor class CCFileUtils on win32 and wophone. 2011-03-26 13:52:33 +08:00
walzer 326bc998da typo fixed, sorry :( 2011-03-25 16:13:18 +08:00
walzer 95d672a858 add copyright & author name for airplay port 2011-03-25 15:30:10 +08:00
walzer db4fb7cc9c issue , refactor ios port ok. 2011-03-24 17:51:29 +08:00
walzer b9c56f1728 issue , try to add CCSAXParser.h 2011-03-24 16:16:49 +08:00
walzer ed492bbd1e [airplay] first commit of airplay port. Thanks for Аксёнов Максим's contribution! 2011-03-23 22:16:20 +08:00
walzer 2b7a324c47 fix compilation error when COCOS2D_DEBUG = 2 2011-03-21 10:50:24 +08:00
walzer 81fa070125 fixed , add copyright of original authors, merge Bin's commit 2011-03-19 14:45:51 +08:00
minggo 47173778cc fixed : rename NSArray UIAlignment 2011-03-18 14:31:29 +08:00
minggo 7a331e1e14 issue : wophone compiled ok 2011-03-07 18:20:48 +08:00
minggo b5a99f90df issue : rename file names and object names 2011-03-07 17:11:57 +08:00
minggo 4379a1c96f Move ccxApplication to cocos2dx/platform on ios. 2011-03-02 17:05:22 +08:00
yangws 67c0ad6332 add platform support project on win32.
Move macros, CCXUIImage, ccxCommon, CCXCocos2dDefine, 3rd party libraries, glu, NSLock, ccxConfig from platform/win32 to platform_support.
2011-01-15 18:05:35 +08:00
natural-law 711f3a2906 modify YES to true,and No to false. 2010-12-31 17:56:46 +08:00
natural-law 34f45c8faa Implement CCEventDispatcher. 2010-12-31 09:36:53 +08:00
natural-law 05bf58b488 Merge branch 'upto-0.99.5' of https://github.com/cocos2d/cocos2d-x into merge 2010-12-28 17:24:56 +08:00
natural-law a48b4b762b update tileMap_parallax_nodes to 0.99.5. 2010-12-28 15:17:59 +08:00
minggo b2b8591b26 fixed 2010-12-28 10:23:14 +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
yangws caf518f97d fixed: helloworld win32 release configure build error, CCTMXTiledMap.cpp Access NULL pointer error. 2010-12-17 17:20:39 +08:00
minggo e287466c2f fixed 2010-12-17 11:39:25 +08:00
minggo 7fa8d72076 commit before merging the code from https://walzer@github.com/cocos2d/cocos2d-x.git 2010-11-29 15:54:32 +08:00
natural-law b1d3e66e68 1. Check the return value of FileData::getFileData()
2. Fix a bug of CCBitmapFontConfiguration::parseConfigFile()
3. Move the function CCFileUtils::getFileDataFromZip() to class of FileUtils.
2010-11-29 14:21:33 +08:00
natural-law 4d98faabc5 fixed add support read resource file from zip file in cocos2d-uphone 2010-11-29 10:49:43 +08:00
Walzer 820c2f0714 issue cocos2d-x back to cocos2dx 2010-11-18 15:01:42 +00:00
Walzer b4328354af issue cocos2dx -> cocos2d-x 2010-11-18 14:07:17 +00:00
Walzer a279e5dc9b issue 169, we should retain the new variable first, and then release the old one. assignment at last. 2010-09-27 10:19:10 +00:00
Ming 12d6df9717 issue 2010-09-24 10:10:32 +00:00
natural-law 4db7ac0e9b issue
Clear memory leaks of the test_uphone project
2010-09-16 03:18:09 +00:00