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

3782 Commits

Author SHA1 Message Date
James Chen 3475108953 issue #1056: Updated Android.mk, fixed a bug in CCImage.h. 2012-03-27 13:48:14 +08:00
James Chen cef41dfbc5 issue #1056: Updated opengles2.0 emulator libraries to newest version 2.10@863987. Deleted some files of opengles1.1. 2012-03-27 13:42:35 +08:00
James Chen 0f1ab7ab37 issue #1056: Updated SpriteTest, reverted the last parameter of glDrawElement in CCTextureAtlas.cpp and CCParticleSystemQuad.cpp. 2012-03-27 10:55:13 +08:00
James Chen 4c7fe7c917 Merge branch 'gles20' of https://github.com/dumganhar/cocos2d-x into gles20 2012-03-26 22:37:30 +08:00
James Chen 7d04254855 issue #1056: Updated some files. 2012-03-26 22:37:09 +08:00
James Chen d36933d542 issue #1056: Update ios project. 2012-03-26 20:29:50 +08:00
James Chen d67ea955f2 Delete some shader files. 2012-03-26 20:03:54 +08:00
James Chen 0f5efaffd2 issue #1056: Check bugs of SpriteTest. 2012-03-26 18:44:28 +08:00
James Chen 9ddd5d3879 Merge pull request #809 from dumganhar/gles20 
issue #1056: Added CCTransitionProgress class, Updated Texture2dTest, TileMapTest, TransitionsTest.
 2012-03-26 01:50:54 -07:00
James Chen 8b6de75be6 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-03-26 16:46:40 +08:00
James Chen 85c13998ee issue #1056: Added CCTransitionProgress class, Updated Texture2dTest, TileMapTest, TransitionsTest. 2012-03-26 16:46:23 +08:00
James Chen 6f5603cfe6 issue #1056: Updated CCTexture2dTest. Added CCTextureAsyncTest. 2012-03-23 18:16:47 +08:00
James Chen 98ba5ef203 Merge pull request #807 from dumganhar/gles20 
issue #1056: Updated SpriteTest.
 2012-03-23 02:33:26 -07:00
James Chen 9c9230a43f #issue #1056: Updated SpriteTest. 2012-03-23 17:31:28 +08:00
James Chen 2a459e23a6 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-03-23 10:27:35 +08:00
James Chen 0ef65d1ed5 issue #1056: Renamed CC_COCOSNODE_RENDER_SUBPIXEL to CC_NODE_RENDER_SUBPIXEL in CCNode.cpp 2012-03-23 10:26:36 +08:00
minggo 728835c77b Merge pull request #806 from minggo/SpriteTest 
Sprite test
 2012-03-22 19:25:24 -07:00
minggo ad8d7cdeff SpriteTest 2012-03-23 10:23:02 +08:00
James Chen 5e71f5fc7c Merge pull request #805 from dumganhar/gles20 
issue #1056: Updated ParticleTest.
 2012-03-22 03:31:50 -07:00
James Chen 900de7328a Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-03-22 18:29:26 +08:00
James Chen c5d0b1ca6f issue #1056: Updated ParticleTest. 2012-03-22 18:29:07 +08:00
minggo a8eaf85cfb Merge pull request #804 from minggo/RenderTextureTest 
Rendertexturetest
 2012-03-22 01:37:58 -07:00
minggo 39ba6b4618 issue #1506: RenderTextureTest 2012-03-22 16:36:03 +08:00
minggo 56f27c495b Merge pull request #803 from minggo/MotionStreak 
issue #1506: MotionStreakTest
 2012-03-21 23:33:03 -07:00
minggo 6b7716770e issue #1506: MotionStreakTest 2012-03-22 14:32:32 +08:00
James Chen fb69c14da9 Merge pull request #802 from dumganhar/gles20 
issue #1056: Updated MenuTest. Added CCArray::arrayWithObject function.
 2012-03-21 23:26:35 -07:00
James Chen 3a50022399 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-03-22 14:24:08 +08:00
James Chen b1f293e089 issue #1056: Updated MenuTest. Added CCArray::arrayWithObject function. 2012-03-22 14:22:06 +08:00
minggo d2a6d9981d Merge pull request #801 from minggo/LayerTest 
issue #1506: LyaerTest
 2012-03-21 23:00:25 -07:00
minggo 2aa61bf798 issue #1506: LyaerTest 2012-03-22 13:59:47 +08:00
minggo 8f9cc4eafc Merge pull request #800 from minggo/test_sync 
LabelTest
 2012-03-21 20:51:29 -07:00
minggo 85de198511 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into test_sync 2012-03-22 11:49:04 +08:00
minggo 3d10006d6f issue #1506: implement CCLabelTest 2012-03-22 11:48:37 +08:00
James Chen e60dd23825 Merge pull request #799 from dumganhar/gles20 
issue #1056: Added kazmath license file. Used CCCallFuncN instead of CCCallBlock and updated ActionsTest.
 2012-03-21 20:28:09 -07:00
James Chen 925fee4820 issue #1056: Added kazmath license file. Used CCCallFuncN instead of CCCallBlock and updated ActionsTest. 2012-03-22 11:26:39 +08:00
James Chen eed85a6f0f Merge pull request #798 from dumganhar/gles20 
issue #1056: Update ActionsTest.
 2012-03-21 19:29:51 -07:00
James Chen 3a287db954 issue #1056: Update ActionsTest. 2012-03-22 10:27:28 +08:00
minggo fed0a5f52f Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into test_sync 2012-03-22 09:51:25 +08:00
James Chen 26a29a439b Merge pull request #796 from dumganhar/gles20 
issue #1056: Added CCLabelBMFont alignment support.
 2012-03-21 18:49:41 -07:00
James Chen fc2fd4d353 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-03-22 09:46:23 +08:00
James Chen 59393c2fef issue #1056: Update CCLabelBMFont. 2012-03-22 09:46:07 +08:00
minggo b1607b2106 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into test_sync 2012-03-22 09:41:03 +08:00
minggo e8b7bc7c7e issue #1056: LabelTest 2012-03-22 09:40:32 +08:00
James Chen aa72a4b8f0 Merge pull request #795 from dumganhar/gles20 
issue #1056: Update Android.mk. Make tests project being compiled successfully.
 2012-03-21 07:53:33 -07:00
James Chen 2e8bae8ebf issue #1056: Update Android.mk. Make tests project being compiled successfully. 2012-03-21 22:49:58 +08:00
James Chen 7d073c4807 Merge pull request #794 from dumganhar/gles20 
issue #1056: Fixed a bug about double free memory and glDrawElements caused crash.
 2012-03-21 07:00:57 -07:00
James Chen 35d93328b9 issue #1056: 1.Fixed a bug of double delete TouchDispatcher. 
2. Modified the last parameter of glDrawElements. It will cause crash on some devices if the last parameter which means Indices's pointer is zero.
 2012-03-21 21:53:03 +08:00
James Chen ad96cd86e0 Merge pull request #792 from dumganhar/gles20 
issue #1056: Moved some singletons to CCDirector. It is more easily managed by CCDirector.
 2012-03-21 02:40:04 -07:00
James Chen 6f4a01f454 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-03-21 17:35:39 +08:00
James Chen f529bcd659 issue #1056: Move some singletons to CCDirector. It is easily managed by CCDirector. 2012-03-21 17:35:20 +08:00