Commit Graph

39 Commits

Author SHA1 Message Date
YuLei Liao 4bf68e79fd * merge upstream/master to master 2011-11-29 19:56:20 +08:00
minggo f0d22ae504 issue #879: replase assert with CCAssert 2011-11-28 17:28:43 +08:00
YuLei Liao 7a6253d9aa * merge cocos2d-1.0.1-x-0.9.2-luafix to master 2011-11-21 16:38:00 +08:00
YuLei Liao 09d12be875 * format cocos2d-x source files 2011-11-18 21:23:54 +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 #686: 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 #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
minggo 70ce4f877f fixed #565: upgrade tileMap_parallax_nodes to 1.0.0-rc3 2011-07-04 14:11:43 +08:00
natural-law 7d7f3a9241 fixed #562, Upgrade folder sprite_nodes to rc3. 2011-07-01 16:11:31 +08:00
liswei 1591c7edc8 fixed #512 fix warnings in /Wall flag 2011-06-10 17:51:37 +08:00
natural-law 5d2ac1fc0c fixed #428, Use CCArray instead of CCMutableArray as the parameter type of CCNode::m_pChildren. 2011-04-21 14:46:15 +08:00
minggo 7d52161804 fixed #441: Initialize pointer in contruction & detect pointer value in destruction 2011-04-01 16:06:53 +08:00
walzer 81fa070125 fixed #418, add copyright of original authors, merge Bin's commit 2011-03-19 14:45:51 +08:00
minggo b5a99f90df issue #375: rename file names and object names 2011-03-07 17:11:57 +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 a48b4b762b update tileMap_parallax_nodes to 0.99.5. 2010-12-28 15:17:59 +08:00
Walzer 820c2f0714 issue #211 cocos2d-x back to cocos2dx 2010-11-18 15:01:42 +00:00
Walzer b4328354af issue #211 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 #154 2010-09-24 10:10:32 +00:00
Walzer b2d950743b issue 136, use NSDictionary in CCSpriteFrameCache 2010-09-10 06:08:25 +00:00
Walzer 43672e1770 issue #114, CCTMXTiledMap debug 2010-09-07 03:26:28 +00:00
Walzer 1c1971255e fixed #129, use NSString to make dictionary 2010-09-06 12:26:19 +00:00
Ming 515acaa4cf issue #61: 2010-09-06 03:06:57 +00:00
Walzer 4226dcede9 issue #61, add retain for member variable 2010-09-04 10:06:26 +00:00
Ming 41d9386ad3 issue #61: 2010-09-04 09:13:34 +00:00
Walzer 88888f7f63 issue #114, CCTMXTiledMap debug 2010-09-04 06:51:16 +00:00
Walzer e7ae3ff710 issue #114, CCTMXTiledMap debug 2010-09-03 02:37:34 +00:00
Walzer fea395cc79 issue #116, remove include "support/data_support/CCArray.h" in CCTMXLayer.h 2010-09-02 07:48:47 +00:00
Walzer 43a4664534 issue #114, CCTMXTiledMap debug 2010-09-02 07:31:37 +00:00
Ming 59afd38192 issue #116: remove __super 2010-09-02 06:54:42 +00:00
Walzer ff3d907846 issue 67, modify constructor 2010-08-31 10:11:31 +00:00
Walzer a0ec92f6c4 fixed #71, complete CCTMXTiledMap 2010-08-31 08:48:42 +00:00
Walzer 92f2528ede fixed #69, complete CCTMXLayer 2010-08-31 07:11:13 +00:00