Commit Graph

94 Commits

Author SHA1 Message Date
minggo fb7642a332 issue #1686:change font size and fix a small bug in ActionTest 2013-03-01 11:25:40 +08:00
minggo 27b62952a4 issue #1686:draw polygon in CCFollowAction test case 2013-03-01 11:12:23 +08:00
minggo 70a70d38fc Merge pull request from dumganhar/iss1686-synchronize
issue : Synchronizing LayerTest, LabelTest.
2013-02-28 00:48:32 -08:00
James Chen 3b3adc3eea issue : Synchronizing LayerTest. 2013-02-28 16:45:59 +08:00
minggo b952634d8e issue #1686:synchronized NodeTest 2013-02-28 16:41:39 +08:00
minggo dbd5a4069e issue #1686:synchronized ParticleTest 2013-02-28 16:40:32 +08:00
minggo 738b96e478 Merge branch 'iss1686-synchronize' of https://github.com/minggo/cocos2d-x into iss1686-synchronize 2013-02-28 16:37:00 +08:00
minggo c75e440e22 issue #1686:synchronized RenderTexture 2013-02-28 16:35:42 +08:00
James Chen 9d4c128391 tab ~> 4 spaces 2013-02-28 16:06:07 +08:00
James Chen 16422d7194 issue : Updated LayerTest. 2013-02-28 16:03:55 +08:00
James Chen 69a746fc8b issue : Synchronizing LabelTest 2013-02-28 15:57:15 +08:00
James Chen dbe1e2e427 Merge branch 'iss1686-synchronize' of https://github.com/minggo/cocos2d-x into iss1686-synchronize 2013-02-28 15:37:15 +08:00
James Chen 88fe33e927 Sync ActionsTest. 2013-02-28 15:32:27 +08:00
minggo 545882cb81 issue #1686:synchronized ShaderTest 2013-02-28 15:01:41 +08:00
minggo f5e334d9e3 issue #1686:synchronized Texture2DTest 2013-02-28 14:54:09 +08:00
James Chen 5abec07fb5 Updated ActionsTest. 2013-02-28 14:42:45 +08:00
James Chen e4b6495aac Updated ActionEaseTest. 2013-02-28 14:42:32 +08:00
James Chen d572a53a1d Merge pull request from dumganhar/tableview-touch-fix
fixed : Clicking outside of CCTableViewCell will also get response when container size is smaller than view size.
2013-02-26 06:56:08 -08:00
James Chen 87935ac436 tableview touch area fix. 2013-02-26 19:59:14 +08:00
James Chen efdb9180e4 fixed : [iOS] CCEditBox's position is incorrect when it's added to a non-fullscreen CCNode. 2013-02-26 11:16:26 +08:00
James Chen 0ece3056ee fixed : Fixed compilation errors for win32. 2013-02-25 22:50:15 +08:00
James Chen 5fafaa8b67 Merge branch 'master' of https://github.com/neokim/cocos2d-x
Conflicts:
	scripting/javascript/bindings/generated
2013-02-25 22:18:57 +08:00
Neo Kim 93195ebe17 Modified a preprocessor line which distinguishes device platform in CCEditBox test code. 2013-02-25 15:44:38 +09:00
James Chen b50515c5bc Merge pull request from ThePickleMan/master
fixed : Added 'rotationIsDir' property to ParticleSystem.
2013-02-21 19:02:39 -08:00
Neo Kim a7c87f3b38 Add 'setFont' and 'setAnchorPoint' to CCEditBox 2013-02-20 22:41:08 +09:00
James Chen 60ab4c4886 issue : Updated linux makefile. 2013-02-19 18:06:30 +08:00
James Chen fc1848eb02 issue : Updated linux makefile. 2013-02-19 17:39:27 +08:00
James Chen a94aa15031 issue : Adding extension project for linux. 2013-02-19 17:28:49 +08:00
James Chen 2626005d20 issue : Updating project setting for blackberry. 2013-02-17 16:26:08 +08:00
minggo ba8f26fed9 Merge pull request from minggo/iss1702-writablePath
modify writable path for iOS and Android
2013-02-06 22:16:46 -08:00
fape 96b92e2bd7 Group tests under test "folder" 2013-02-06 14:52:18 +01:00
minggo 0c5bcb3f7b issue #1702:fix a typo error 2013-02-06 18:04:40 +08:00
James Chen fb9ac31d08 fixed bugs in CCUserDefault.cpp after using tinyXML2, fixed warnings in SpriteTest.cpp. 2013-02-06 17:20:54 +08:00
James Chen cc690c5a86 issue : Adding webp support for mac port. 2013-02-06 13:06:48 +08:00
James Chen 1e5431bcc5 issue : Adding webp support for blackberry and marmalade. 2013-02-06 10:52:13 +08:00
James Chen 64248386a2 issue : Updating iOS project configuration and adding WEBP test demo. 2013-02-05 11:37:13 +08:00
James Chen c362f7e439 issue : Adding new test - Checking whether file exists. 2013-02-01 22:18:43 +08:00
James Chen 157e229f8c fixed : Added the very first implementation of CCEditBox for Win32. 2013-01-31 14:04:49 +08:00
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
James Chen 2e421304ca Merge pull request from dumganhar/iss1683-ccfileutils
issue : Updating CCFileUtils for Blackberry and Marmalade.
2013-01-28 05:43:41 -08:00
minggo 05363ee8dd Merge pull request from minggo/master
fix some warnings
2013-01-28 04:36:01 -08:00
minggo 249b935be8 fix some warnins 2013-01-28 20:34:52 +08:00
James Chen 59f2ae13f8 issue : Updating CCFileUtils for Blackberry and Marmalade. 2013-01-28 20:12:48 +08:00
James Chen 031380d4e9 issue : Updating CCFileUtils.cpp for Win32. 2013-01-28 19:49:34 +08:00
James Chen 733a334ec2 issue : Fixed compilation errors for linux. 2013-01-28 18:32:34 +08:00
James Chen 632f99b611 issue : Updating CCFileUtils for MAC. 2013-01-28 17:54:49 +08:00
James Chen e736ed487f issue : Adding default search path if developer didn't pass it. 2013-01-28 17:44:53 +08:00
James Chen 16ef70c069 issue : Updating FileUtilsTest.cpp. 2013-01-28 17:43:53 +08:00