Commit Graph

371 Commits

Author SHA1 Message Date
James Chen 3bdfb82e9c Merge branch 'gles20' of https://github.com/jpridavok/cocos2d-x into win32-editbox
Conflicts:
	samples/Cpp/TestCpp/proj.win32/TestCpp.vcxproj.filters
2013-01-30 22:31:19 +08:00
James Chen 001d3382a9 [TestCpp/EffectsAdvancedTest] Adding getPosition method for Len3DTarget. 2013-01-29 12:59:43 +08:00
James Chen 2694cb150b CCFileUtils::s|gSearchPath -> CCFileUtils::s\gSearchPaths. 2013-01-29 09:56:38 +08:00
minggo 249b935be8 fix some warnins 2013-01-28 20:34:52 +08:00
James Chen e736ed487f issue #1683: Adding default search path if developer didn't pass it. 2013-01-28 17:44:53 +08:00
James Chen 16ef70c069 issue #1683: Updating FileUtilsTest.cpp. 2013-01-28 17:43:53 +08:00
James Chen f69ef6182c issue #1683: Adding FileUtilsTest. 2013-01-28 15:17:20 +08:00
James Chen eec0ba3c19 Getting full path in before playing sound. 2013-01-27 19:20:49 +08:00
James Chen 2b9f79efc0 Merge pull request #1882 from dumganhar/memoryleak-action
Fixed memory leaks in CCActionCatmullRom class.
2013-01-22 22:41:44 -08:00
James Chen b5efd699bf Fixed a memory leak in ActionsTest. 2013-01-23 14:40:11 +08:00
PickleMan c4d5bf8c85 Added test for rotation is dir in particle system 2013-01-21 12:35:59 -05:00
James Chen c0d568da9b fixed #1639: Added custom property support for CCBReader. 2013-01-21 18:37:17 +08:00
minggo a7dca5c05a fixed #1547:set selected menu item to null when it is removed from a menu 2013-01-17 15:04:48 +08:00
Jozef Prídavok 9889b4f9fd Added the very first implementation of CCEditBox for Win32. 2013-01-10 23:59:21 +01:00
Jozef Prídavok 229ad55dfa Fixed and refactored Mac Implementation. 2013-01-09 15:34:53 +01:00
James Chen 8fa2eb080b issue #1640: Updated Box2dTest and ChipmunkTest. 2013-01-06 10:22:07 +08:00
James Chen 0c28510513 issue #1640: Updated ChipmunkTest.cpp. 2013-01-06 10:13:59 +08:00
James Chen b120874a87 fix compilation errors. 2012-12-29 11:23:31 +08:00
James Chen c68884a121 issue #1625: Updated EffectsTest.cpp and EffectsTest.lua. 2012-12-27 11:48:46 +08:00
James Chen 7d9f06b48c fixed #1625: Updated TestCpp. 'ccg' --> 'CCSizeMake' . And exchanged the parameter order for 3D action tests. 2012-12-27 10:55:25 +08:00
James Chen 4660e72eda issue #1603: Moved the position of some projects. 2012-12-20 12:58:21 +08:00