Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
4,386 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

4386 Commits

Author SHA1 Message Date
minggo 9fbe1fef96 issue #1310: synchronize some codes 2012-06-12 16:56:34 +08:00
James Chen a7e2fef3d4 Merge pull request #1006 from dumganhar/gles20 
issue #1310: Updated RotateWorldTest and SceneTest.
 2012-06-12 01:23:37 -07:00
James Chen c8b5ad0440 issue #1310: Updated RotateWorldTest and SceneTest. 2012-06-12 16:22:25 +08:00
James Chen afba11abb7 Merge pull request #1005 from dumganhar/gles20 
issue #1310: Updated ParallaxTest and RenderTextureTest.
 2012-06-12 00:56:36 -07:00
James Chen 23519ef85c issue #1310: Updated ParallaxTest and RenderTextureTest. 2012-06-12 15:55:23 +08:00
James Chen ea99de351a Merge pull request #1004 from dumganhar/gles20 
issue #1310: Updated ParticleTest.
 2012-06-12 00:41:21 -07:00
James Chen 1c0f391e03 issue #1310: Updated ParticleTest. 2012-06-12 15:40:31 +08:00
James Chen 94a7be82b4 Merge pull request #1003 from dumganhar/gles20 
issue #1310: Updated NodeTest.
 2012-06-12 00:23:27 -07:00
James Chen ae1ea76ca1 issue #1310: Updated NodeTest. 2012-06-12 15:22:42 +08:00
James Chen ecdd9f0072 Merge pull request #1002 from dumganhar/gles20 
issue #1310: Updated LayerTest.
 2012-06-12 00:15:37 -07:00
James Chen f5b2a5d33d issue #1310: Updated LayerTest. 2012-06-12 15:14:01 +08:00
James Chen 14386b06cd Merge pull request #1001 from dumganhar/gles20 
issue #1310: Synchronize to RC2, updated something as follows:
1.Added some resources for tests project;
2.Updated LabelTest;
3.Added init method for CCLabelBMFont;
4.Fixed a bug in CCLabelAtlas::initWithString;
5.In CCSpriteBatchNode::initWithTexture, when capacity is equal to 0, set it to default value.
 2012-06-11 23:39:53 -07:00
James Chen 94a389ad06 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-06-12 14:34:17 +08:00
James Chen b770010c41 issue #1310: Updated LabelTest. Added init method for CCLabelBMFont. Fixed a bug in CCLabelAtlas::initWithString. 
In CCSpriteBatchNode::initWithTexture, when capacity is equal to 0, set it to default value.
 2012-06-12 14:33:53 +08:00
James Chen ef8ec1a941 issue #1310: Added some resources for tests project. 2012-06-12 14:32:57 +08:00
James Chen 9185f771f1 issue #1310: Added some resources for tests project. 2012-06-12 14:29:15 +08:00
minggo fbfc508f98 Merge pull request #1000 from minggo/gles20 
issue #1310: synchronize CCTexturePVR
 2012-06-11 21:04:15 -07:00
minggo 916b276607 issue #1310: synchronize CCTexturePVR 2012-06-12 12:02:15 +08:00
James Chen b676065e04 Merge pull request #999 from dumganhar/gles20 
issue #1310: Updated FontTest. And fixed a compilation error in FontTest.
 2012-06-11 20:22:58 -07:00
James Chen 84d6f5317c Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-06-12 11:21:04 +08:00
James Chen 974f0d714d issue #1310: Updated FontTest. And fixed a compilation error in FontTest. 2012-06-12 11:16:31 +08:00
minggo 36455a90e1 Merge pull request #998 from minggo/gles20 
set font size when changed
 2012-06-11 18:44:20 -07:00
minggo 9c58f13abb set font size when changed 2012-06-12 09:43:27 +08:00
James Chen 06d7417f62 Merge pull request #997 from dumganhar/gles20 
issue #1310: Sync Chipmunk to v6.1.1.Some typo fixes. Updated CCTexture2D.h/.cpp.
 2012-06-11 18:42:33 -07:00
James Chen b2ae75e90b Merge branch 'gles20' of https://github.com/dumganhar/cocos2d-x into gles20 2012-06-12 09:40:06 +08:00
James Chen 8336270b3d Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-06-12 09:39:18 +08:00
James Chen a8222b9757 issue #1310: Sync Chipmunk to v6.1.1 2012-06-12 09:38:38 +08:00
Nicolas Gramlich e52d5ae223 CCSpriteFrameCache: Minor optimization. 2012-06-11 18:31:36 -07:00
Nicolas Gramlich 1f2652a8d7 Made CCBIReaderTest finally work completely. =) Also added support for having a root path when loading a ccb-file (i.e. when you have the two directories, one for the ccb files, one for the spritesheets. <- With a common ancestor.) 2012-06-11 18:31:11 -07:00
Nicolas Gramlich 4c8351f304 Removed Zombie files. 2012-06-11 15:00:11 -07:00
Nicolas Gramlich 342c65e293 Added CCBIReaderTest, which doesn't work since XCode sucks big time, not finding a simple file. 2012-06-11 14:57:30 -07:00
Nicolas Gramlich 58b53be708 Merge with gles20. 2012-06-11 11:50:32 -07:00
Nicolas Gramlich 9c52fce5d2 Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20 2012-06-11 10:43:27 -07:00
Nicolas Gramlich 4378731418 Merge with gles20. 2012-06-11 10:43:07 -07:00
James Chen be362bef9b issue #1310: Some typo fixes. Updated CCTexture2D.h/.cpp. 2012-06-11 21:58:04 +08:00
James Chen c0946a9b99 Merge pull request #996 from dumganhar/gles20 
issue #1310: Exported class -- CCCatmullRomTo  and function -- ccCardinalSplineAt
 2012-06-11 05:05:18 -07:00
James Chen 62f87c18a2 issue #1310: Exported CCCatmullRomTo class and ccCardinalSplineAt function. 2012-06-11 20:02:40 +08:00
minggo ea613be58a Merge pull request #995 from minggo/gles20 
Synchronize some codes
 2012-06-11 03:27:12 -07:00
minggo ccbfd24c21 issue #1310: synchronize ActionManagerTest ActionEaseTest ActionsProgressTest ActionsTest 2012-06-11 18:25:57 +08:00
minggo 77f51b5c48 issue #1310:synchronize CocosDenshion 2012-06-11 15:01:23 +08:00
James Chen 980b40e9dd Merge pull request #994 from dumganhar/gles20 
fixed #1315: TileMapTest can't be shown correctly in retina mode.
 2012-06-10 23:51:11 -07:00
James Chen b61ad6cdba Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-06-11 14:45:09 +08:00
James Chen 2ce7c86c50 fixed #1315: TileMapTest can't be shown correctly in retina mode. 2012-06-11 14:44:32 +08:00
minggo 55ee220245 Merge pull request #993 from minggo/gles20 
issue #1310: synchronize CCLabelTTF
 2012-06-10 23:37:31 -07:00
minggo b4899ae46d issue #1310: synchronize CCLabelTTF 2012-06-11 14:36:25 +08:00
James Chen 2cabbcfaaa Merge pull request #992 from dumganhar/gles20 
issue #1310: Fixed a bug that 3d effect can't be displayed correctly in retina mode.
 2012-06-10 20:55:14 -07:00
James Chen bd535c3c1c issue #1310: Fixed a bug that 3d effect can't be displayed correctly in retina mode. 2012-06-11 11:53:17 +08:00
James Chen ed09baeeb0 Merge pull request #991 from dumganhar/gles20 
issue #1310: Synchronize to RC2, updated something as follows.
* Used CCLabelAtlas instead of CCLabelBMFont to display FPS,SPF status.
* Updated CCFileUtils, added some method, such as sharedFileUtils/purgeFileUtils/purgeCachedEntries.
* Fixed a bug in CCDirector, made retina mode work correctly.
 2012-06-10 20:05:32 -07:00
James Chen 33ea7905a5 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 
Conflicts:
	cocos2dx/platform/ios/CCFileUtils.mm
 2012-06-11 11:01:36 +08:00
James Chen c95cbb1774 issue #1310: Used CCLabelAtlas instead of CCLabelBMFont to display FPS,SPF status. 
Updated CCFileUtils, added some method, such as sharedFileUtils/purgeFileUtils/purgeCachedEntries.
Fixed a bug in CCDirector, made retina mode work correctly.
 2012-06-11 10:59:57 +08:00