17 Commits

Author	SHA1	Message	Date
Rene Klacan	b040addd53	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into tilemap_plain_xml_format_support	2013-07-03 16:55:32 +02:00
Rene Klacan	47e2421d77	the latest develop code merged	2013-06-29 02:42:47 +02:00
James Chen	93b6328303	issue #2129: Removing CC prefix for cocos2dx module.	2013-06-20 14:13:12 +08:00
James Chen	c0d44cb2e4	fixed #2129: Rename m_iVar to _var, remove CC prefixes.	2013-06-15 14:03:30 +08:00
Ricardo Quesada	479062fdb7	on dealloc, log "this" with %p, not %x. ... Also adds %p where it was missing. And make a few fixes on the iOS project	2013-06-05 18:21:05 -07:00
Rene Klacan	82a64ed2c7	tilemap supports XML layer format	2013-06-05 20:29:52 +02:00
James Chen	2418e72a0e	Fix compilation errors for linux port.	2013-05-07 14:36:01 +08:00
Sam Clegg	38878b084b	Fix all compiler warnings produced by gcc. ... This allows the linux and NaCl builds (and perhaps others) to be compiles with -Wall and -Werror, and it makes the build output much less noisy.	2013-03-05 17:01:00 -08:00
minggo	9d07778bb0	issue #1686:synchronize CCTMXXMLParser.cpp	2013-02-26 17:42:18 +08:00
Nat Weiss	9b98e4548f	Added TMX polygon parsing.	2013-01-29 14:45:41 -08:00
James Chen	6f3b22031f	Using new API of getting full path for file name.	2013-01-25 20:51:52 +08:00
walzer	06f639edab	update copyright to 2012, update cocos2d version to 2.0.3 ... 1. update all copyright from 2010-2011 to 2010-2012 cocos2d-x.org 2. update COCOS2D_VERSION to 0x00020003 3. update const char* cocos2dVersion() to "cocos2d-2.0-x-2.0.3"	2012-09-24 21:22:20 +08:00
Donald Alan Morrison	4cbd993091	Minor English Spelling Corrections. A few grammar corrections.	2012-09-17 00:02:24 -07:00
Nat Weiss	53e4da5d5c	Fixes a bug in the TMX parser which caused tileset images not to load on Android.	2012-09-15 15:59:15 -07:00
minggo	d83cdbda09	fixed #1441: put hd and ipad resources into separate directory	2012-08-23 14:20:32 +08:00
Walzer	685b70e6fb	fixed #1402, résolve conflicting "create" functions ... 1. Following https://docs.google.com/document/d/1eqvYjVah0R9nkjzJ_ga1-_cyjHnizVQ5dyESYNpYM0s/edit?pli=1 2. use CCSequence/CCSpawn::initWithTwoActions, createWithTwoActions instead of initOneTwo, create(one, two). 3. haven't re-generate lua-binding to resolve the conflicts yet.	2012-07-23 22:49:11 +08:00
James Chen	77f1fba566	issue #1399: Adjust folder structure, made it built successfully on win32.	2012-07-20 14:05:52 +08:00