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

3797 Commits

Author SHA1 Message Date
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
minggo 3a544810c5 Merge pull request #791 from minggo/ShaderTest 
implement ShaderTest
 2012-03-21 02:30:15 -07:00
minggo e75e35b23f issue #1506: add ShaderTest source code 2012-03-21 17:27:13 +08:00
minggo 6242656049 issue #1506: fix a confict 2012-03-21 17:23:33 +08:00
minggo 92c30a328e issue #1506: implement ShaderTest 2012-03-21 17:02:52 +08:00
James Chen 4f0ad1eb80 Merge pull request #789 from dumganhar/gles20 
issue #1056: Added Box2D and Chipmunk support.
1.Removed ChipmunkTest, added ChipmunkAccelTouchTest.
2.Added Box2DTest and Box2DTestBed.
3.Update Box2dTest and ChipmunkAccelTouchTest.
4.Update Chipmunk to 6.0.3 version.
 2012-03-21 01:17:33 -07:00
James Chen 159b677dc0 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-03-21 16:09:26 +08:00
James Chen 8ad598241f issue #1056: Update Tests project for ios platform. 2012-03-21 16:05:24 +08:00
James Chen 9b4a42c494 issue #1056: Update Box2dTest and ChipmunkAccelTouchTest. 2012-03-21 15:54:48 +08:00
James Chen 2ac2da9c97 issue #1056: 1. Removed ChipmunkTest, added ChipmunkAccelTouchTest. 
2. Added Box2DTest and Box2DTestBed.
Tested on win32.
 2012-03-21 15:43:35 +08:00
James Chen 0c91539c95 issue #1056: Update Chipmunk to 6.0.3 version. 2012-03-21 14:53:57 +08:00
minggo e8861f80bf Merge pull request #788 from minggo/NodeTest 
rename CocosNodeTest to NodeTest and SC
 2012-03-20 22:53:43 -07:00
minggo bb908f5a5e Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into ActionsEaseTest 2012-03-21 13:36:51 +08:00
minggo f6c113993a issue #1506: rename CocosNodeTest to NodeTest and SC 2012-03-21 13:36:24 +08:00
James Chen 980fe4dca6 Merge pull request #787 from dumganhar/gles20 
issue #1056: Added gles2.0 support for ios platform.
 2012-03-20 20:12:55 -07:00
James Chen 8ef5e4ae3b issue #1056: Update the configuration of ios project.Sort the the project folder. 2012-03-21 11:07:31 +08:00
James Chen 00a81f5bd0 Merge branch 'gles20' of https://github.com/dumganhar/cocos2d-x into gles20 2012-03-21 10:43:54 +08:00
James Chen 02ae04c1d6 issue #1056: Modified the configuration of ios project. 2012-03-21 10:41:21 +08:00
James Chen bb4d7c2f88 issue #1056: Updated some files for ios platform. Added some 'TODO'. 2012-03-21 10:36:20 +08:00
James Chen 321771a7ea issue #1056: Added gles2.0 support for ios platform. 2012-03-21 10:05:23 +08:00
James Chen 7c0af610ff issue #1056: Added CCArray::copyWithZone implementation. CCDictElement bound check. 2012-03-20 23:30:18 +08:00
James Chen 7f6f18322e Merge pull request #784 from dumganhar/iss1056_fix_crash 
issue #1056: Fixed some bugs as follows:
1.Fixed a bug in CCTouchDispatcher which will cause crash when app exit.
2.Fixed some memory leaks.
3.Removed old files(CCMutableArray, CCMutableDictionary) reference in vc2008 project.
4.Updated implementation of CCDICT_FOREACH.
 2012-03-20 06:14:03 -07:00
James Chen 15e03f8b14 issue #1056: Remove old files(CCMutableArray, CCMutableDictionary) reference in vc2008 project. 
Update CCDICT_FOREACH implementation.
 2012-03-20 21:08:52 +08:00
James Chen b5fca2f5f3 issue #1056: Fixed a bug in CCTouchDispatcher which will cause crash when app exit. Fixed some memory leaks. 2012-03-20 21:04:29 +08:00
minggo 6a39dd21ab Merge pull request #783 from minggo/ActionsEaseTest 
rename EaseTatinosTest to ActionsEaseTest and SC
 2012-03-20 03:10:38 -07:00
minggo a3441a39e7 issue #1056: rename EaseTatinosTest to ActionsEaseTest and SC 2012-03-20 18:07:42 +08:00
minggo 272fa58b81 Merge pull request #781 from minggo/android_gles20 
set up gles2.0 environment on Android
 2012-03-20 02:31:22 -07:00
minggo 382e4e7eb8 issue #1056: modify code according new code after pull 2012-03-20 17:27:06 +08:00
minggo 7ccb38556e Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into android_gles20 2012-03-20 16:10:53 +08:00
minggo 74aaf4c6ca issue #1056:gles20 runs ok on android 2012-03-20 16:10:12 +08:00
James Chen ae2b3307fa Merge pull request #779 from dumganhar/iss1056_CCDict 
issue #1056: Removed CCMutableArray and CCMutableDictionary template, offered CCDictionary to improve the performance of dictionary by 60%, it means that CCDictionary can save about 2/3 time cost.
 2012-03-20 00:07:58 -07:00
James Chen 6ce06bd906 issue #1056: Remove CCMutableArray and CCMutableDictionary template, offer CCDictionary to improve the performance of dictionary by 60%, it means that CCDictionary can save about 2/3 time cost. 2012-03-20 15:04:53 +08:00
minggo 910a937732 Merge pull request #778 from minggo/gles20 
implement ActionsProgressTest and run ok on win32
 2012-03-19 03:56:11 -07:00
minggo 39738e4270 issue #1056: implement ActionsProgressTest and run ok on win32 2012-03-19 18:20:32 +08:00
James Chen 9203b60fb0 add CCDictionary based on UTHASH, improve the performance. 2012-03-19 14:53:44 +08:00
minggo 68809fd5ed Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-03-19 13:54:34 +08:00