Commit Graph

14 Commits

Author SHA1 Message Date
James Chen 1d8ee016e5 Merge pull request #4596 from boyu0/bug2050_tilemap_firstgid_bug
closed #2050: fix tilemap firstgid bug
2013-12-30 05:42:19 -08:00
boyu0 1f72fafd08 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into bug2050_tilemap_firstgid_bug
Conflicts:
	cocos/2d/CCTMXXMLParser.cpp
	cocos/2d/CCTMXXMLParser.h
2013-12-30 12:30:59 +08:00
boyu0 e6dea295a2 closed #2050: Change tile map test to c++11, change XMLFormatTest name and subtile 2013-12-30 12:01:22 +08:00
boyu0 a76c59f644 closed #2050: add tile map xml format test and fix tile property bug. 2013-12-30 11:33:41 +08:00
Huabing.Xu 8198970421 fix testcase remove commandpool 2013-12-27 14:42:45 +08:00
Huabing.Xu ec8f30b4d5 fix tilemapTest 2013-12-26 11:19:09 +08:00
Ricardo Quesada 7616edd9f3 Improves SpriteTest
Improves SpriteTest.
It is easier to see if Sprite works as SpriteBatchNode (and vice-versa).

Needed for the new renderer.

Also adds `const` to title() and subtitle()
2013-12-18 13:52:10 -08:00
James Chen 9ed263056c Use eventDispatcher to dispatch event. Remove controller codes in Layer. 2013-10-25 10:53:46 +08:00
James Chen da1101beeb [Dispatcher] New event dispatcher, first commit. 2013-09-11 22:09:34 +08:00
Ricardo Quesada 058935aa8d Removes Hungarian notation
Removes Hungarian notation from the code.
2013-07-25 15:53:24 -07:00
James Chen 1fb9f44d15 issue #2129: Removing CC prefix for samples module. 2013-06-20 14:17:10 +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 022dfc0acc CPP Tests migrated to the new C++11 API
Many tests were converted to the C++11 API
and some tests were also simplified by using the "CL" macro
instead of the "CF" macro.
2013-06-07 17:21:11 -07:00
James Chen 4660e72eda issue #1603: Moved the position of some projects. 2012-12-20 12:58:21 +08:00